From fc7afb40760246153da4a2334c2cd36cc900c26d Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 9 Oct 2013 19:28:25 +0200 Subject: [PATCH] Merged release fixes from pro distribution --- jOOQ-test/src/org/jooq/test/H2Test.java | 2 +- .../org/jooq/test/_/testcases/FetchTests.java | 4 +-- .../org/jooq/impl/DefaultRenderContext.java | 11 +++++-- .../main/java/org/jooq/impl/FetchCount.java | 4 +-- .../java/org/jooq/impl/GenerateSeries.java | 4 +-- .../test/java/org/jooq/test/AbstractTest.java | 23 +++++++++++++++ .../test/java/org/jooq/test/BasicTest.java | 1 - .../java/org/jooq/test/BindContextTest.java | 14 ++++----- .../src/test/java/org/jooq/test/CastTest.java | 1 - .../test/java/org/jooq/test/ConvertTest.java | 29 +++++++++---------- .../org/jooq/test/CustomQueryPartTest.java | 21 +++++++------- .../test/java/org/jooq/test/DataTypeTest.java | 1 - .../org/jooq/test/InitialisationTest.java | 10 +++---- .../src/test/java/org/jooq/test/MockTest.java | 1 - .../test/java/org/jooq/test/RecordTest.java | 21 +++++++------- .../java/org/jooq/test/RenderContextTest.java | 14 ++++----- .../test/java/org/jooq/test/RenderTest.java | 1 - .../java/org/jooq/test/VisitContextTest.java | 1 - .../test/resources/org/jooq/test/data/db.txt | 28 ++++++++++++++++++ 19 files changed, 118 insertions(+), 73 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/H2Test.java b/jOOQ-test/src/org/jooq/test/H2Test.java index 26d5d49947..881209a6a8 100644 --- a/jOOQ-test/src/org/jooq/test/H2Test.java +++ b/jOOQ-test/src/org/jooq/test/H2Test.java @@ -46,7 +46,6 @@ import static org.jooq.impl.DSL.count; import static org.jooq.impl.DSL.select; import static org.jooq.impl.DSL.table; import static org.jooq.test.h2.generatedclasses.Tables.T_2698; -import static org.jooq.test.h2.generatedclasses.Tables.T_785; import static org.jooq.test.h2.generatedclasses.Tables.T_AUTHOR; import static org.jooq.test.h2.generatedclasses.Tables.T_BOOK; import static org.jooq.test.h2.generatedclasses.Tables.T_BOOK_STORE; @@ -110,6 +109,7 @@ import org.jooq.test.h2.generatedclasses.tables.TTriggers; import org.jooq.test.h2.generatedclasses.tables.TUnsigned; import org.jooq.test.h2.generatedclasses.tables.T_639NumbersTable; import org.jooq.test.h2.generatedclasses.tables.T_725LobTest; +import org.jooq.test.h2.generatedclasses.tables.T_785; import org.jooq.test.h2.generatedclasses.tables.VLibrary; import org.jooq.test.h2.generatedclasses.tables.daos.TAuthorDao; import org.jooq.test.h2.generatedclasses.tables.daos.T_2698Dao; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java index 207177b6bb..866bbe2e2f 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java @@ -257,8 +257,8 @@ extends BaseTest Value Map // ---------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java index ae9b490bbe..f5eca706d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java @@ -41,6 +41,7 @@ package org.jooq.impl; import static java.util.Arrays.asList; +// ... import static org.jooq.conf.ParamType.INDEXED; import static org.jooq.conf.ParamType.INLINED; import static org.jooq.conf.ParamType.NAMED; @@ -353,8 +354,14 @@ class DefaultRenderContext extends AbstractContext implements Ren xx xxxxxxxxxxxxx xxx xx xxx xxxx xx xxxxxx xxx xxxxx xxxxxxx xxxxxxxx xx xxxxxxxxxx x xxxxxxx xxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx - xx xxxxx xxxxxxxxxx xxxxxxx - xxxxxxxxxxx xx xxx xxxxxxxx xxxx x xxxx xxxxx xxxxxxx xx xxxx x x xxxxxxxxxxxxxxxxxxxxxxxx + xx xxxxx xxxxxxxxxx xxxxxxx x + xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xx xxxxxxx x + xxxxxxxxxxx xx xxx xxxxxxxx xxxx x xxxx xxxxx xxxxxxx xx xxxx x x xxxxxxxxxxxxxxxxxxxxxx x x xxxxx + x + xxxx x + xxxxxxxxxxx xx xxx xxxxxxxx xxxx x xxxx xxxxx xxxxxxx xx xxxx x x xxxxxxxxxxxxxxxxxxxxxxxx + x + x xx xxxxxxxx xx xx [/pro] */ diff --git a/jOOQ/src/main/java/org/jooq/impl/FetchCount.java b/jOOQ/src/main/java/org/jooq/impl/FetchCount.java index c88df9d087..2263690807 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FetchCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/FetchCount.java @@ -108,10 +108,10 @@ class FetchCount extends AbstractResultQuery> { return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final Class> getRecordType() { - return (Class>) RecordImpl.class; + return (Class) RecordImpl.class; } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java index a8c938193f..e4f75030a2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java +++ b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java @@ -105,10 +105,10 @@ class GenerateSeries extends AbstractTable> { } } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final Class> getRecordType() { - return (Class>) RecordImpl.class; + return (Class) RecordImpl.class; } @Override diff --git a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java index c074e04987..03f7929e18 100644 --- a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java +++ b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java @@ -51,7 +51,10 @@ import java.sql.PreparedStatement; import java.sql.Time; import java.sql.Timestamp; +import junit.framework.Assert; + import org.jooq.BindContext; +import org.jooq.Constants; import org.jooq.DSLContext; import org.jooq.RenderContext; import org.jooq.Result; @@ -180,5 +183,25 @@ public abstract class AbstractTest { protected final String zeroTimestamp() { return new Timestamp(0).toString(); + } + + protected static void assertEquals(int expected, int actual) { + Assert.assertEquals(expected, actual); + } + + protected static void assertEquals(Object expected, Object actual) { + if (actual instanceof String) { + actual = ((String) actual).replace(" -- SQL rendered with a free trial version of jOOQ " + Constants.FULL_VERSION, ""); + } + + Assert.assertEquals(expected, actual); + } + + protected static void assertEquals(String message, Object expected, Object actual) { + if (actual instanceof String) { + actual = ((String) actual).replace(" -- SQL rendered with a free trial version of jOOQ " + Constants.FULL_VERSION, ""); + } + + Assert.assertEquals(message, expected, actual); } } diff --git a/jOOQ/src/test/java/org/jooq/test/BasicTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java index bb7b29f00c..6a1cfa7e25 100644 --- a/jOOQ/src/test/java/org/jooq/test/BasicTest.java +++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java @@ -41,7 +41,6 @@ package org.jooq.test; -import static junit.framework.Assert.assertEquals; import static org.jooq.JoinType.LEFT_OUTER_JOIN; import static org.jooq.conf.ParamType.INLINED; import static org.jooq.impl.DSL.any; diff --git a/jOOQ/src/test/java/org/jooq/test/BindContextTest.java b/jOOQ/src/test/java/org/jooq/test/BindContextTest.java index 7472b8e3d5..0d72a87cbf 100644 --- a/jOOQ/src/test/java/org/jooq/test/BindContextTest.java +++ b/jOOQ/src/test/java/org/jooq/test/BindContextTest.java @@ -40,14 +40,12 @@ */ package org.jooq.test; -import static org.junit.Assert.assertEquals; - -import org.jooq.BindContext; -import org.jooq.RenderContext; -import org.jooq.exception.DataAccessException; -import org.jooq.impl.CustomCondition; - -import org.junit.Test; +import org.jooq.BindContext; +import org.jooq.RenderContext; +import org.jooq.exception.DataAccessException; +import org.jooq.impl.CustomCondition; + +import org.junit.Test; /** * Some common tests related to {@link RenderContext} diff --git a/jOOQ/src/test/java/org/jooq/test/CastTest.java b/jOOQ/src/test/java/org/jooq/test/CastTest.java index 9ea9076098..35c7727a81 100644 --- a/jOOQ/src/test/java/org/jooq/test/CastTest.java +++ b/jOOQ/src/test/java/org/jooq/test/CastTest.java @@ -41,7 +41,6 @@ package org.jooq.test; import static org.jooq.test.data.Table1.FIELD_ID1; -import static org.junit.Assert.assertEquals; import org.jooq.impl.SQLDataType; diff --git a/jOOQ/src/test/java/org/jooq/test/ConvertTest.java b/jOOQ/src/test/java/org/jooq/test/ConvertTest.java index 0e14f34f35..14bd76ba4c 100644 --- a/jOOQ/src/test/java/org/jooq/test/ConvertTest.java +++ b/jOOQ/src/test/java/org/jooq/test/ConvertTest.java @@ -40,21 +40,20 @@ */ package org.jooq.test; -import static org.jooq.tools.reflect.Reflect.wrapper; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.lang.reflect.Array; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; - -import org.jooq.tools.Convert; - -import org.junit.Test; +import static org.jooq.tools.reflect.Reflect.wrapper; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.Array; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Date; +import java.sql.Time; +import java.sql.Timestamp; + +import org.jooq.tools.Convert; + +import org.junit.Test; /** * Unit tests for data type conversion diff --git a/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java b/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java index ae2a3c6605..b15af5491d 100644 --- a/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java +++ b/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java @@ -40,17 +40,16 @@ */ package org.jooq.test; -import static junit.framework.Assert.assertEquals; -import static org.jooq.impl.DSL.val; - -import org.jooq.BindContext; -import org.jooq.QueryPart; -import org.jooq.RenderContext; -import org.jooq.impl.CustomQueryPart; -import org.jooq.impl.DSL; - -import org.jmock.Expectations; -import org.junit.Test; +import static org.jooq.impl.DSL.val; + +import org.jooq.BindContext; +import org.jooq.QueryPart; +import org.jooq.RenderContext; +import org.jooq.impl.CustomQueryPart; +import org.jooq.impl.DSL; + +import org.jmock.Expectations; +import org.junit.Test; /** * Test cases for custom {@link QueryPart}s. diff --git a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java index 8f9d0e980d..3f65015ce5 100644 --- a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java +++ b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java @@ -41,7 +41,6 @@ package org.jooq.test; -import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import static org.jooq.impl.DSL.fieldByName; import static org.jooq.impl.DSL.val; diff --git a/jOOQ/src/test/java/org/jooq/test/InitialisationTest.java b/jOOQ/src/test/java/org/jooq/test/InitialisationTest.java index 49c05d4e33..0db0d08f32 100644 --- a/jOOQ/src/test/java/org/jooq/test/InitialisationTest.java +++ b/jOOQ/src/test/java/org/jooq/test/InitialisationTest.java @@ -40,11 +40,11 @@ */ package org.jooq.test; -import org.jooq.impl.DSL; -import org.jooq.test.init.SeparateClassloaderTestRunner; - -import org.junit.Test; -import org.junit.runner.RunWith; +import org.jooq.impl.DSL; +import org.jooq.test.init.SeparateClassloaderTestRunner; + +import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(SeparateClassloaderTestRunner.class) public class InitialisationTest { diff --git a/jOOQ/src/test/java/org/jooq/test/MockTest.java b/jOOQ/src/test/java/org/jooq/test/MockTest.java index 73b61c574e..289ae5f663 100644 --- a/jOOQ/src/test/java/org/jooq/test/MockTest.java +++ b/jOOQ/src/test/java/org/jooq/test/MockTest.java @@ -41,7 +41,6 @@ package org.jooq.test; import static java.util.Arrays.asList; -import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.fail; import static org.jooq.impl.DSL.val; diff --git a/jOOQ/src/test/java/org/jooq/test/RecordTest.java b/jOOQ/src/test/java/org/jooq/test/RecordTest.java index b20f54ba9e..8ddc280cc8 100644 --- a/jOOQ/src/test/java/org/jooq/test/RecordTest.java +++ b/jOOQ/src/test/java/org/jooq/test/RecordTest.java @@ -41,17 +41,16 @@ package org.jooq.test; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; - -import org.jooq.test.data.Table1; -import org.jooq.test.data.Table1Record; -import org.jooq.test.data.Table2; -import org.jooq.test.data.Table2Record; -import org.jooq.test.data.Table4; -import org.jooq.test.data.Table4Record; - -import org.junit.Test; +import static junit.framework.Assert.fail; + +import org.jooq.test.data.Table1; +import org.jooq.test.data.Table1Record; +import org.jooq.test.data.Table2; +import org.jooq.test.data.Table2Record; +import org.jooq.test.data.Table4; +import org.jooq.test.data.Table4Record; + +import org.junit.Test; /** diff --git a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java index 3ffd133fab..583fbe2de1 100644 --- a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java +++ b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java @@ -40,14 +40,12 @@ */ package org.jooq.test; -import static org.junit.Assert.assertEquals; - -import org.jooq.BindContext; -import org.jooq.RenderContext; -import org.jooq.exception.DataAccessException; -import org.jooq.impl.CustomCondition; - -import org.junit.Test; +import org.jooq.BindContext; +import org.jooq.RenderContext; +import org.jooq.exception.DataAccessException; +import org.jooq.impl.CustomCondition; + +import org.junit.Test; /** * Some common tests related to {@link RenderContext} diff --git a/jOOQ/src/test/java/org/jooq/test/RenderTest.java b/jOOQ/src/test/java/org/jooq/test/RenderTest.java index bf030f6244..d5819c1c84 100644 --- a/jOOQ/src/test/java/org/jooq/test/RenderTest.java +++ b/jOOQ/src/test/java/org/jooq/test/RenderTest.java @@ -48,7 +48,6 @@ import static org.jooq.conf.RenderKeywordStyle.LOWER; import static org.jooq.conf.RenderKeywordStyle.UPPER; import static org.jooq.conf.StatementType.STATIC_STATEMENT; import static org.jooq.impl.DSL.val; -import static org.junit.Assert.assertEquals; import org.jooq.DSLContext; import org.jooq.Field; diff --git a/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java b/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java index 589a86e141..1c35ee2e6d 100644 --- a/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java +++ b/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java @@ -41,7 +41,6 @@ package org.jooq.test; import static java.util.Arrays.asList; -import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.fail; import static org.jooq.Clause.CONDITION; import static org.jooq.Clause.CONDITION_AND; diff --git a/jOOQ/src/test/resources/org/jooq/test/data/db.txt b/jOOQ/src/test/resources/org/jooq/test/data/db.txt index 02018e50bc..6c8315883b 100644 --- a/jOOQ/src/test/resources/org/jooq/test/data/db.txt +++ b/jOOQ/src/test/resources/org/jooq/test/data/db.txt @@ -6,12 +6,24 @@ select 'A'; > A @ rows: 1 +select 'A' -- SQL rendered with a free trial version of jOOQ 3.2.0; +> A +> - +> A +@ rows: 1 + select 'A', 'B'; > A B > - - > A B @ rows: 1 +select 'A', 'B' -- SQL rendered with a free trial version of jOOQ 3.2.0; +> A B +> - - +> A B +@ rows: 1 + select "TABLE1"."ID1", "TABLE1"."NAME1" from "TABLE1"; > ID1 NAME1 > --- ----- @@ -19,6 +31,13 @@ select "TABLE1"."ID1", "TABLE1"."NAME1" from "TABLE1"; > 2 Y @ rows: 2 +select "TABLE1"."ID1", "TABLE1"."NAME1" from "TABLE1" -- SQL rendered with a free trial version of jOOQ 3.2.0; +> ID1 NAME1 +> --- ----- +> 1 X +> 2 Y +@ rows: 2 + select "TABLE2"."ID2", "TABLE2"."NAME2" from "TABLE2"; > +---+-----+ > |ID2|NAME2| @@ -28,6 +47,15 @@ select "TABLE2"."ID2", "TABLE2"."NAME2" from "TABLE2"; > +---+-----+ @ rows: 2 +select "TABLE2"."ID2", "TABLE2"."NAME2" from "TABLE2" -- SQL rendered with a free trial version of jOOQ 3.2.0; +> +---+-----+ +> |ID2|NAME2| +> +---+-----+ +> |1 |X | +> |2 |Y | +> +---+-----+ +@ rows: 2 + # [#2280] Check if "advanced" CSV content can be handled, too select complex_data; > F1 F2 F3 is a bit more complex