diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java index b28c06021f..f0dc06d1f7 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java @@ -118,7 +118,7 @@ public abstract class AbstractDatabase implements Database { @Override public final SQLDialect getDialect() { if (dialect == null) { - dialect = create().getDialect(); + dialect = create().configuration().getDialect(); } return dialect; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java index 9b75e8d975..00e19ce883 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java @@ -125,7 +125,7 @@ public class CUBRIDDatabase extends AbstractDatabase { @Override protected void loadForeignKeys(DefaultRelations relations) throws SQLException { - ConnectionProvider provider = create().getConnectionProvider(); + ConnectionProvider provider = create().configuration().getConnectionProvider(); Connection connection = null; try { diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java index 8bd4a7fb21..a79ff93111 100644 --- a/jOOQ-test/src/org/jooq/test/BaseTest.java +++ b/jOOQ-test/src/org/jooq/test/BaseTest.java @@ -707,7 +707,7 @@ public abstract class BaseTest< protected Executor create(Settings settings) { Executor create = delegate.create(settings); - create.getExecuteListeners().add(new TestStatisticsListener()); + create.configuration().getExecuteListeners().add(new TestStatisticsListener()); return create; } diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java index 92d63cb036..186ebe65e3 100644 --- a/jOOQ-test/src/org/jooq/test/OracleTest.java +++ b/jOOQ-test/src/org/jooq/test/OracleTest.java @@ -744,7 +744,7 @@ public class OracleTest extends jOOQAbstractTest< return Routines.fGetOneCursor((UNumberArrayRecord) null); } else { - return Routines.fGetOneCursor(new UNumberArrayRecord(create(), array)); + return Routines.fGetOneCursor(new UNumberArrayRecord(create().configuration(), array)); } } @@ -859,7 +859,7 @@ public class OracleTest extends jOOQAbstractTest< public void testOraclePipelinedFunctions() throws Exception { // TODO [#1113] [#1119] Standalone calls to pipelined functions should // be possible too - System.out.println(Routines.fPipelinedArray1(create())); + System.out.println(Routines.fPipelinedArray1(create().configuration())); } @Test @@ -870,91 +870,91 @@ public class OracleTest extends jOOQAbstractTest< // Unnesting arrays assertEquals(emptyList(), - create().select().from(table(new UNumberArrayRecord(create(), (Integer[]) null))).fetch(0)); + create().select().from(table(new UNumberArrayRecord(create().configuration(), (Integer[]) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(new UNumberArrayRecord(create()))).fetch(0)); + create().select().from(table(new UNumberArrayRecord(create().configuration()))).fetch(0)); assertEquals(asList(1), - create().select().from(table(new UNumberArrayRecord(create(), 1))).fetch(0)); + create().select().from(table(new UNumberArrayRecord(create().configuration(), 1))).fetch(0)); assertEquals(asList(1, 2), - create().select().from(table(new UNumberArrayRecord(create(), 1, 2))).fetch(0)); + create().select().from(table(new UNumberArrayRecord(create().configuration(), 1, 2))).fetch(0)); // Unnesting tables assertEquals(emptyList(), - create().select().from(table(new UNumberTableRecord(create(), (Integer[]) null))).fetch(0)); + create().select().from(table(new UNumberTableRecord(create().configuration(), (Integer[]) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(new UNumberTableRecord(create()))).fetch(0)); + create().select().from(table(new UNumberTableRecord(create().configuration()))).fetch(0)); assertEquals(asList(1), - create().select().from(table(new UNumberTableRecord(create(), 1))).fetch(0)); + create().select().from(table(new UNumberTableRecord(create().configuration(), 1))).fetch(0)); assertEquals(asList(1, 2), - create().select().from(table(new UNumberTableRecord(create(), 1, 2))).fetch(0)); + create().select().from(table(new UNumberTableRecord(create().configuration(), 1, 2))).fetch(0)); // Unnesting arrays from functions assertEquals(emptyList(), create().select().from(table(fArrays1((UNumberArrayRecord) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fArrays1(new UNumberArrayRecord(create(), (Integer[]) null)))).fetch(0)); + create().select().from(table(fArrays1(new UNumberArrayRecord(create().configuration(), (Integer[]) null)))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fArrays1(new UNumberArrayRecord(create())))).fetch(0)); + create().select().from(table(fArrays1(new UNumberArrayRecord(create().configuration())))).fetch(0)); assertEquals(asList(1), - create().select().from(table(fArrays1(fArrays1(new UNumberArrayRecord(create(), 1))))).fetch(0)); + create().select().from(table(fArrays1(fArrays1(new UNumberArrayRecord(create().configuration(), 1))))).fetch(0)); assertEquals(asList(1, 2), - create().select().from(table(fArrays1(fArrays1(new UNumberArrayRecord(create(), 1, 2))))).fetch(0)); + create().select().from(table(fArrays1(fArrays1(new UNumberArrayRecord(create().configuration(), 1, 2))))).fetch(0)); // Unnesting tables from functions assertEquals(emptyList(), create().select().from(table(fTables1((UNumberTableRecord) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fTables1(new UNumberTableRecord(create(), (Integer[]) null)))).fetch(0)); + create().select().from(table(fTables1(new UNumberTableRecord(create().configuration(), (Integer[]) null)))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fTables1(new UNumberTableRecord(create())))).fetch(0)); + create().select().from(table(fTables1(new UNumberTableRecord(create().configuration())))).fetch(0)); assertEquals(asList(1), - create().select().from(table(fTables1(fTables1(new UNumberTableRecord(create(), 1))))).fetch(0)); + create().select().from(table(fTables1(fTables1(new UNumberTableRecord(create().configuration(), 1))))).fetch(0)); assertEquals(asList(1, 2), - create().select().from(table(fTables1(fTables1(new UNumberTableRecord(create(), 1, 2))))).fetch(0)); + create().select().from(table(fTables1(fTables1(new UNumberTableRecord(create().configuration(), 1, 2))))).fetch(0)); // Retrieving arrays from functions - assertNull(fArrays1(create(), null)); + assertNull(fArrays1(create().configuration(), null)); assertEquals(emptyList(), - fArrays1(create(), new UNumberArrayRecord(create(), (Integer[]) null)).getList()); + fArrays1(create().configuration(), new UNumberArrayRecord(create().configuration(), (Integer[]) null)).getList()); assertEquals(emptyList(), - fArrays1(create(), new UNumberArrayRecord(create())).getList()); + fArrays1(create().configuration(), new UNumberArrayRecord(create().configuration())).getList()); assertEquals(asList(1), - fArrays1(create(), fArrays1(create(), new UNumberArrayRecord(create(), 1))).getList()); + fArrays1(create().configuration(), fArrays1(create().configuration(), new UNumberArrayRecord(create().configuration(), 1))).getList()); assertEquals(asList(1, 2), - fArrays1(create(), fArrays1(create(), new UNumberArrayRecord(create(), 1, 2))).getList()); + fArrays1(create().configuration(), fArrays1(create().configuration(), new UNumberArrayRecord(create().configuration(), 1, 2))).getList()); // Retrieving tables from functions - assertNull(fTables1(create(), null)); + assertNull(fTables1(create().configuration(), null)); assertEquals(emptyList(), - fTables1(create(), new UNumberTableRecord(create(), (Integer[]) null)).getList()); + fTables1(create().configuration(), new UNumberTableRecord(create().configuration(), (Integer[]) null)).getList()); assertEquals(emptyList(), - fTables1(create(), new UNumberTableRecord(create())).getList()); + fTables1(create().configuration(), new UNumberTableRecord(create().configuration())).getList()); assertEquals(asList(1), - fTables1(create(), fTables1(create(), new UNumberTableRecord(create(), 1))).getList()); + fTables1(create().configuration(), fTables1(create().configuration(), new UNumberTableRecord(create().configuration(), 1))).getList()); assertEquals(asList(1, 2), - fTables1(create(), fTables1(create(), new UNumberTableRecord(create(), 1, 2))).getList()); + fTables1(create().configuration(), fTables1(create().configuration(), new UNumberTableRecord(create().configuration(), 1, 2))).getList()); // Retrieving arrays from procedures - assertNull(pArrays1(create(), null)); + assertNull(pArrays1(create().configuration(), null)); assertEquals(emptyList(), - pArrays1(create(), new UNumberArrayRecord(create(), (Integer[]) null)).getList()); + pArrays1(create().configuration(), new UNumberArrayRecord(create().configuration(), (Integer[]) null)).getList()); assertEquals(emptyList(), - pArrays1(create(), new UNumberArrayRecord(create())).getList()); + pArrays1(create().configuration(), new UNumberArrayRecord(create().configuration())).getList()); assertEquals(asList(1), - pArrays1(create(), pArrays1(create(), new UNumberArrayRecord(create(), 1))).getList()); + pArrays1(create().configuration(), pArrays1(create().configuration(), new UNumberArrayRecord(create().configuration(), 1))).getList()); assertEquals(asList(1, 2), - pArrays1(create(), pArrays1(create(), new UNumberArrayRecord(create(), 1, 2))).getList()); + pArrays1(create().configuration(), pArrays1(create().configuration(), new UNumberArrayRecord(create().configuration(), 1, 2))).getList()); // Retrieving tables from procedures - assertNull(pTables1(create(), null)); + assertNull(pTables1(create().configuration(), null)); assertEquals(emptyList(), - pTables1(create(), new UNumberTableRecord(create(), (Integer[]) null)).getList()); + pTables1(create().configuration(), new UNumberTableRecord(create().configuration(), (Integer[]) null)).getList()); assertEquals(emptyList(), - pTables1(create(), new UNumberTableRecord(create())).getList()); + pTables1(create().configuration(), new UNumberTableRecord(create().configuration())).getList()); assertEquals(asList(1), - pTables1(create(), pTables1(create(), new UNumberTableRecord(create(), 1))).getList()); + pTables1(create().configuration(), pTables1(create().configuration(), new UNumberTableRecord(create().configuration(), 1))).getList()); assertEquals(asList(1, 2), - pTables1(create(), pTables1(create(), new UNumberTableRecord(create(), 1, 2))).getList()); + pTables1(create().configuration(), pTables1(create().configuration(), new UNumberTableRecord(create().configuration(), 1, 2))).getList()); // THEN, check unnesting of VARRAY/TABLE of OBJECT // ----------------------------------------------- @@ -969,85 +969,85 @@ public class OracleTest extends jOOQAbstractTest< // Unnesting arrays assertEquals(emptyList(), - create().select().from(table(new UBookArrayRecord(create(), (UBookTypeRecord[]) null))).fetch(0)); + create().select().from(table(new UBookArrayRecord(create().configuration(), (UBookTypeRecord[]) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(new UBookArrayRecord(create()))).fetch(0)); + create().select().from(table(new UBookArrayRecord(create().configuration()))).fetch(0)); assertEquals(asList(1), - create().select().from(table(new UBookArrayRecord(create(), r1))).fetch(0)); + create().select().from(table(new UBookArrayRecord(create().configuration(), r1))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 1), - create().select().from(table(new UBookArrayRecord(create(), r1))).fetch(1)); + create().select().from(table(new UBookArrayRecord(create().configuration(), r1))).fetch(1)); assertEquals(asList(1, 2), - create().select().from(table(new UBookArrayRecord(create(), r1, r2))).fetch(0)); + create().select().from(table(new UBookArrayRecord(create().configuration(), r1, r2))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 2), - create().select().from(table(new UBookArrayRecord(create(), r1, r2))).fetch(1)); + create().select().from(table(new UBookArrayRecord(create().configuration(), r1, r2))).fetch(1)); // Unnesting tables assertEquals(emptyList(), - create().select().from(table(new UBookTableRecord(create(), (UBookTypeRecord[]) null))).fetch(0)); + create().select().from(table(new UBookTableRecord(create().configuration(), (UBookTypeRecord[]) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(new UBookTableRecord(create()))).fetch(0)); + create().select().from(table(new UBookTableRecord(create().configuration()))).fetch(0)); assertEquals(asList(1), - create().select().from(table(new UBookTableRecord(create(), r1))).fetch(0)); + create().select().from(table(new UBookTableRecord(create().configuration(), r1))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 1), - create().select().from(table(new UBookTableRecord(create(), r1))).fetch(1)); + create().select().from(table(new UBookTableRecord(create().configuration(), r1))).fetch(1)); assertEquals(asList(1, 2), - create().select().from(table(new UBookTableRecord(create(), r1, r2))).fetch(0)); + create().select().from(table(new UBookTableRecord(create().configuration(), r1, r2))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 2), - create().select().from(table(new UBookTableRecord(create(), r1, r2))).fetch(1)); + create().select().from(table(new UBookTableRecord(create().configuration(), r1, r2))).fetch(1)); // Unnesting arrays from functions assertEquals(emptyList(), create().select().from(table(fArrays4((UBookArrayRecord) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fArrays4(new UBookArrayRecord(create(), (UBookTypeRecord[]) null)))).fetch(0)); + create().select().from(table(fArrays4(new UBookArrayRecord(create().configuration(), (UBookTypeRecord[]) null)))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fArrays4(new UBookArrayRecord(create())))).fetch(0)); + create().select().from(table(fArrays4(new UBookArrayRecord(create().configuration())))).fetch(0)); assertEquals(asList(1), - create().select().from(table(fArrays4(new UBookArrayRecord(create(), r1)))).fetch(0)); + create().select().from(table(fArrays4(new UBookArrayRecord(create().configuration(), r1)))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 1), - create().select().from(table(fArrays4(new UBookArrayRecord(create(), r1)))).fetch(1)); + create().select().from(table(fArrays4(new UBookArrayRecord(create().configuration(), r1)))).fetch(1)); assertEquals(asList(1, 2), - create().select().from(table(fArrays4(fArrays4(new UBookArrayRecord(create(), r1, r2))))).fetch(0)); + create().select().from(table(fArrays4(fArrays4(new UBookArrayRecord(create().configuration(), r1, r2))))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 2), - create().select().from(table(fArrays4(fArrays4(new UBookArrayRecord(create(), r1, r2))))).fetch(1)); + create().select().from(table(fArrays4(fArrays4(new UBookArrayRecord(create().configuration(), r1, r2))))).fetch(1)); // Unnesting tables from functions assertEquals(emptyList(), create().select().from(table(fTables4((UBookTableRecord) null))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fTables4(new UBookTableRecord(create(), (UBookTypeRecord[]) null)))).fetch(0)); + create().select().from(table(fTables4(new UBookTableRecord(create().configuration(), (UBookTypeRecord[]) null)))).fetch(0)); assertEquals(emptyList(), - create().select().from(table(fTables4(new UBookTableRecord(create())))).fetch(0)); + create().select().from(table(fTables4(new UBookTableRecord(create().configuration())))).fetch(0)); assertEquals(asList(1), - create().select().from(table(fTables4(new UBookTableRecord(create(), r1)))).fetch(0)); + create().select().from(table(fTables4(new UBookTableRecord(create().configuration(), r1)))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 1), - create().select().from(table(fTables4(new UBookTableRecord(create(), r1)))).fetch(1)); + create().select().from(table(fTables4(new UBookTableRecord(create().configuration(), r1)))).fetch(1)); assertEquals(asList(1, 2), - create().select().from(table(fTables4(fTables4(new UBookTableRecord(create(), r1, r2))))).fetch(0)); + create().select().from(table(fTables4(fTables4(new UBookTableRecord(create().configuration(), r1, r2))))).fetch(0)); assertEquals(BOOK_TITLES.subList(0, 2), - create().select().from(table(fTables4(fTables4(new UBookTableRecord(create(), r1, r2))))).fetch(1)); + create().select().from(table(fTables4(fTables4(new UBookTableRecord(create().configuration(), r1, r2))))).fetch(1)); // Retrieving arrays from functions - assertNull(fArrays4(create(), null)); + assertNull(fArrays4(create().configuration(), null)); assertEquals(emptyList(), - fArrays4(create(), new UBookArrayRecord(create(), (UBookTypeRecord[]) null)).getList()); + fArrays4(create().configuration(), new UBookArrayRecord(create().configuration(), (UBookTypeRecord[]) null)).getList()); assertEquals(emptyList(), - fArrays4(create(), new UBookArrayRecord(create())).getList()); + fArrays4(create().configuration(), new UBookArrayRecord(create().configuration())).getList()); assertEquals(asList(r1), - fArrays4(create(), fArrays4(create(), new UBookArrayRecord(create(), r1))).getList()); + fArrays4(create().configuration(), fArrays4(create().configuration(), new UBookArrayRecord(create().configuration(), r1))).getList()); assertEquals(asList(r1, r2), - fArrays4(create(), fArrays4(create(), new UBookArrayRecord(create(), r1, r2))).getList()); + fArrays4(create().configuration(), fArrays4(create().configuration(), new UBookArrayRecord(create().configuration(), r1, r2))).getList()); // Retrieving tables from functions - assertNull(fTables4(create(), null)); + assertNull(fTables4(create().configuration(), null)); assertEquals(emptyList(), - fTables4(create(), new UBookTableRecord(create(), (UBookTypeRecord[]) null)).getList()); + fTables4(create().configuration(), new UBookTableRecord(create().configuration(), (UBookTypeRecord[]) null)).getList()); assertEquals(emptyList(), - fTables4(create(), new UBookTableRecord(create())).getList()); + fTables4(create().configuration(), new UBookTableRecord(create().configuration())).getList()); assertEquals(asList(r1), - fTables4(create(), fTables4(create(), new UBookTableRecord(create(), r1))).getList()); + fTables4(create().configuration(), fTables4(create().configuration(), new UBookTableRecord(create().configuration(), r1))).getList()); assertEquals(asList(r1, r2), - fTables4(create(), fTables4(create(), new UBookTableRecord(create(), r1, r2))).getList()); + fTables4(create().configuration(), fTables4(create().configuration(), new UBookTableRecord(create().configuration(), r1, r2))).getList()); } @@ -1062,7 +1062,7 @@ public class OracleTest extends jOOQAbstractTest< // Unattached: author1 = new UAuthorTypeRecord(); author1.setId(1); - author2 = load(create(), author1); + author2 = load(create().configuration(), author1); assertEquals(1, (int) author1.getId()); assertEquals(1, (int) author2.getId()); assertNull(author1.getFirstName()); @@ -1113,12 +1113,12 @@ public class OracleTest extends jOOQAbstractTest< assertEquals("Orwell", author1.getLastName()); // [#1584] Test STATIC MEMBER procedure calls - UAuthorTypeRecord author3 = UAuthorType.newAuthor(create(), 3, "first", "last"); + UAuthorTypeRecord author3 = UAuthorType.newAuthor(create().configuration(), 3, "first", "last"); assertEquals(3, (int) author3.getId()); assertEquals("first", author3.getFirstName()); assertEquals("last", author3.getLastName()); - UAuthorTypeRecord author4 = UAuthorType.getAuthor(create(), 3); + UAuthorTypeRecord author4 = UAuthorType.getAuthor(create().configuration(), 3); assertEquals(author3, author4); assertEquals(3, (int) author4.getId()); assertEquals("first", author4.getFirstName()); @@ -1169,7 +1169,7 @@ public class OracleTest extends jOOQAbstractTest< // -------------------- DateAsTimestampT_976ObjectTypeRecord o = create().newRecord(DATE_AS_TIMESTAMP_T_976_OBJECT_TYPE); o.setD(now); - DateAsTimestampT_976VarrayTypeRecord t = new DateAsTimestampT_976VarrayTypeRecord(create()); + DateAsTimestampT_976VarrayTypeRecord t = new DateAsTimestampT_976VarrayTypeRecord(create().configuration()); t.set(now, now); record = create().newRecord(DATE_AS_TIMESTAMP_T_976); @@ -1191,12 +1191,12 @@ public class OracleTest extends jOOQAbstractTest< // Procedures and packages // ----------------------- - assertEquals(now, org.jooq.test.oracle2.generatedclasses.Routines.p_976(create(), now)); - assertEquals(now, org.jooq.test.oracle2.generatedclasses.Routines.f_976(create(), now)); + assertEquals(now, org.jooq.test.oracle2.generatedclasses.Routines.p_976(create().configuration(), now)); + assertEquals(now, org.jooq.test.oracle2.generatedclasses.Routines.f_976(create().configuration(), now)); assertEquals(now, create().select(org.jooq.test.oracle2.generatedclasses.Routines.f_976(now)).fetchOne(0)); - assertEquals(now, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.p_976(create(), now)); - assertEquals(now, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.f_976(create(), now)); + assertEquals(now, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.p_976(create().configuration(), now)); + assertEquals(now, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.f_976(create().configuration(), now)); assertEquals(now, create().select(org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.f_976(now)).fetchOne(0)); } @@ -1337,6 +1337,6 @@ public class OracleTest extends jOOQAbstractTest< UAddressTypeRecord address = new UAddressTypeRecord(); address.setStreet(new UStreetTypeRecord()); address.getStreet().setNo("15"); - assertEquals("15", Routines.pEnhanceAddress1(create, address)); + assertEquals("15", Routines.pEnhanceAddress1(create.configuration(), address)); } } diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java index d1057e59e9..368f5e5bb6 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java @@ -129,8 +129,8 @@ extends BaseTestemptyList()); + create.configuration().getSettings().setExecuteLogging(false); + create.configuration().setExecuteListeners(Collections.emptyList()); // Dry-run to avoid side-effects testBenchmarkFullExecution(create, 1); diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java index 2d992235bd..9ef10f01fd 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java @@ -101,7 +101,7 @@ extends BaseTest result = create.select(TBook_ID(), val("Hello")) @@ -249,7 +249,7 @@ extends BaseTest> result = create .select(TBook_ID(), IDx2) @@ -596,7 +596,7 @@ extends BaseTestget().intValue()); assertEquals("0", executedWithDefaults.call("getPOutVarchar").get()); assertEquals(Date.valueOf("1981-07-10"), executedWithDefaults.call("getPOutDate").get()); @@ -259,7 +259,7 @@ extends BaseTestget().intValue()); assertEquals("abc", executedWithoutDefault.call("getPOutVarchar").get()); assertEquals(Date.valueOf("2012-01-01"), executedWithoutDefault.call("getPOutDate").get()); @@ -277,18 +277,18 @@ extends BaseTest insert = create().insertQuery(TArrays()); insert.addValue(TArrays_ID(), 5); insert.addValue((Field) TArrays_NUMBER_R(), - on(TArrays_NUMBER_R().getType()).create(create(), new Integer[] { 1, 2, 3 }).get()); + on(TArrays_NUMBER_R().getType()).create(create().configuration(), new Integer[] { 1, 2, 3 }).get()); insert.addValue((Field) TArrays_STRING_R(), - on(TArrays_STRING_R().getType()).create(create(), new String[] { "a", "b", "c", "d\"\\d" }).get()); + on(TArrays_STRING_R().getType()).create(create().configuration(), new String[] { "a", "b", "c", "d\"\\d" }).get()); insert.addValue((Field) TArrays_DATE_R(), - on(TArrays_DATE_R().getType()).create(create(), new Date[] { new Date(0), new Date(84600 * 1000), new Date(84600 * 2000) }).get()); + on(TArrays_DATE_R().getType()).create(create().configuration(), new Date[] { new Date(0), new Date(84600 * 1000), new Date(84600 * 2000) }).get()); insert.execute(); Record array = create().select( @@ -440,11 +440,11 @@ extends BaseTest update = create().updateQuery(TArrays()); update.addValue((Field) TArrays_NUMBER_R(), - on(TArrays_NUMBER_R().getType()).create(create(), new Integer[] { 3, 2, 1 }).get()); + on(TArrays_NUMBER_R().getType()).create(create().configuration(), new Integer[] { 3, 2, 1 }).get()); update.addValue((Field) TArrays_STRING_R(), - on(TArrays_STRING_R().getType()).create(create(), new String[] { "d\"\\d", "c", "b", "a" }).get()); + on(TArrays_STRING_R().getType()).create(create().configuration(), new String[] { "d\"\\d", "c", "b", "a" }).get()); update.addValue((Field) TArrays_DATE_R(), - on(TArrays_DATE_R().getType()).create(create(), new Date[] { new Date(84600 * 2000), new Date(84600 * 1000), new Date(0) }).get()); + on(TArrays_DATE_R().getType()).create(create().configuration(), new Date[] { new Date(84600 * 2000), new Date(84600 * 1000), new Date(0) }).get()); update.addConditions(TArrays_ID().equal(5)); update.execute(); @@ -660,12 +660,12 @@ extends BaseTest l; ArrayRecord s; - assertEquals(null, invoke(cRoutines(), "pArrays1", create(), null)); - assertEquals(null, invoke(cRoutines(), "pArrays2", create(), null)); - assertEquals(null, invoke(cRoutines(), "pArrays3", create(), null)); - assertEquals(null, invoke(cRoutines(), "fArrays1", create(), null)); - assertEquals(null, invoke(cRoutines(), "fArrays2", create(), null)); - assertEquals(null, invoke(cRoutines(), "fArrays3", create(), null)); + assertEquals(null, invoke(cRoutines(), "pArrays1", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "pArrays2", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "pArrays3", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "fArrays1", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "fArrays2", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "fArrays3", create().configuration(), null)); i = newNUMBER_R(); l = newNUMBER_LONG_R(); @@ -673,22 +673,22 @@ extends BaseTest) invoke(cRoutines(), "pArrays1", create(), i)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays1", create().configuration(), i)).get())); assertEquals( Arrays.asList(new Long[0]), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays2", create(), l)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays2", create().configuration(), l)).get())); assertEquals( Arrays.asList(new String[0]), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays3", create(), s)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays3", create().configuration(), s)).get())); assertEquals( Arrays.asList(new Integer[0]), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays1", create(), i)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays1", create().configuration(), i)).get())); assertEquals( Arrays.asList(new Long[0]), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays2", create(), l)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays2", create().configuration(), l)).get())); assertEquals( Arrays.asList(new String[0]), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays3", create(), s)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays3", create().configuration(), s)).get())); i = newNUMBER_R(); l = newNUMBER_LONG_R(); @@ -700,22 +700,22 @@ extends BaseTest) invoke(cRoutines(), "pArrays1", create(), i)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays1", create().configuration(), i)).get())); assertEquals( Arrays.asList((Long) null), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays2", create(), l)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays2", create().configuration(), l)).get())); assertEquals( Arrays.asList((String) null), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays3", create(), s)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays3", create().configuration(), s)).get())); assertEquals( Arrays.asList((Integer) null), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays1", create(), i)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays1", create().configuration(), i)).get())); assertEquals( Arrays.asList((Long) null), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays2", create(), l)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays2", create().configuration(), l)).get())); assertEquals( Arrays.asList((String) null), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays3", create(), s)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays3", create().configuration(), s)).get())); i = newNUMBER_R(); l = newNUMBER_LONG_R(); @@ -727,115 +727,115 @@ extends BaseTest) invoke(cRoutines(), "pArrays1", create(), i)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays1", create().configuration(), i)).get())); assertEquals( Arrays.asList(1L, 2L), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays2", create(), l)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays2", create().configuration(), l)).get())); assertEquals( Arrays.asList("1", "2"), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays3", create(), s)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "pArrays3", create().configuration(), s)).get())); assertEquals( Arrays.asList(1, 2), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays1", create(), i)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays1", create().configuration(), i)).get())); assertEquals( Arrays.asList(1L, 2L), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays2", create(), l)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays2", create().configuration(), l)).get())); assertEquals( Arrays.asList("1", "2"), - Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays3", create(), s)).get())); + Arrays.asList(((ArrayRecord) invoke(cRoutines(), "fArrays3", create().configuration(), s)).get())); } if (TArrays_STRING() != null) { if (supportsOUTParameters()) { - assertEquals(null, invoke(cRoutines(), "pArrays1", create(), null)); - assertEquals(null, invoke(cRoutines(), "pArrays2", create(), null)); - assertEquals(null, invoke(cRoutines(), "pArrays3", create(), null)); + assertEquals(null, invoke(cRoutines(), "pArrays1", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "pArrays2", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "pArrays3", create().configuration(), null)); } - assertEquals(null, invoke(cRoutines(), "fArrays1", create(), null)); - assertEquals(null, invoke(cRoutines(), "fArrays2", create(), null)); - assertEquals(null, invoke(cRoutines(), "fArrays3", create(), null)); + assertEquals(null, invoke(cRoutines(), "fArrays1", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "fArrays2", create().configuration(), null)); + assertEquals(null, invoke(cRoutines(), "fArrays3", create().configuration(), null)); if (supportsOUTParameters()) { assertEquals( Arrays.asList(new Integer[0]), - Arrays.asList((Integer[]) invoke(cRoutines(), "pArrays1", create(), new Integer[0]))); + Arrays.asList((Integer[]) invoke(cRoutines(), "pArrays1", create().configuration(), new Integer[0]))); assertEquals( Arrays.asList(new Long[0]), - Arrays.asList((Long[]) invoke(cRoutines(), "pArrays2", create(), new Long[0]))); + Arrays.asList((Long[]) invoke(cRoutines(), "pArrays2", create().configuration(), new Long[0]))); assertEquals( Arrays.asList(new String[0]), - Arrays.asList((String[]) invoke(cRoutines(), "pArrays3", create(), new String[0]))); + Arrays.asList((String[]) invoke(cRoutines(), "pArrays3", create().configuration(), new String[0]))); } assertEquals( Arrays.asList(new Integer[0]), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays1", create(), new Integer[0]))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays1", create().configuration(), new Integer[0]))); assertEquals( Arrays.asList(new Long[0]), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays2", create(), new Long[0]))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays2", create().configuration(), new Long[0]))); assertEquals( Arrays.asList(new String[0]), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays3", create(), new String[0]))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays3", create().configuration(), new String[0]))); if (supportsOUTParameters()) { assertEquals( Arrays.asList((Integer) null), - Arrays.asList((Integer[]) invoke(cRoutines(), "pArrays1", create(), new Integer[] { null }))); + Arrays.asList((Integer[]) invoke(cRoutines(), "pArrays1", create().configuration(), new Integer[] { null }))); assertEquals( Arrays.asList((Long) null), - Arrays.asList((Long[]) invoke(cRoutines(), "pArrays2", create(), new Long[] { null }))); + Arrays.asList((Long[]) invoke(cRoutines(), "pArrays2", create().configuration(), new Long[] { null }))); assertEquals( Arrays.asList((String) null), - Arrays.asList((String[]) invoke(cRoutines(), "pArrays3", create(), new String[] { null }))); + Arrays.asList((String[]) invoke(cRoutines(), "pArrays3", create().configuration(), new String[] { null }))); } assertEquals( Arrays.asList((Integer) null), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays1", create(), new Integer[] { null }))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays1", create().configuration(), new Integer[] { null }))); assertEquals( Arrays.asList((Long) null), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays2", create(), new Long[] { null }))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays2", create().configuration(), new Long[] { null }))); assertEquals( Arrays.asList((String) null), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays3", create(), new String[] { null }))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays3", create().configuration(), new String[] { null }))); if (supportsOUTParameters()) { assertEquals( Arrays.asList(1, 2), - Arrays.asList((Integer[]) invoke(cRoutines(), "pArrays1", create(), new Integer[] {1, 2}))); + Arrays.asList((Integer[]) invoke(cRoutines(), "pArrays1", create().configuration(), new Integer[] {1, 2}))); assertEquals( Arrays.asList(1L, 2L), - Arrays.asList((Long[]) invoke(cRoutines(), "pArrays2", create(), new Long[] {1L, 2L}))); + Arrays.asList((Long[]) invoke(cRoutines(), "pArrays2", create().configuration(), new Long[] {1L, 2L}))); assertEquals( Arrays.asList("1", "2"), - Arrays.asList((String[]) invoke(cRoutines(), "pArrays3", create(), new String[] {"1", "2"}))); + Arrays.asList((String[]) invoke(cRoutines(), "pArrays3", create().configuration(), new String[] {"1", "2"}))); } assertEquals( Arrays.asList(1, 2), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays1", create(), new Integer[] {1, 2}))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays1", create().configuration(), new Integer[] {1, 2}))); assertEquals( Arrays.asList(1L, 2L), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays2", create(), new Long[] {1L, 2L}))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays2", create().configuration(), new Long[] {1L, 2L}))); assertEquals( Arrays.asList("1", "2"), - Arrays.asList((Object[]) invoke(cRoutines(), "fArrays3", create(), new String[] {"1", "2"}))); + Arrays.asList((Object[]) invoke(cRoutines(), "fArrays3", create().configuration(), new String[] {"1", "2"}))); } } private ArrayRecord newNUMBER_R() throws Exception { - ArrayRecord result = TArrays_NUMBER_R().getType().getConstructor(Configuration.class).newInstance(create()); + ArrayRecord result = TArrays_NUMBER_R().getType().getConstructor(Configuration.class).newInstance(create().configuration()); return result; } private ArrayRecord newNUMBER_LONG_R() throws Exception { - ArrayRecord result = TArrays_NUMBER_LONG_R().getType().getConstructor(Configuration.class).newInstance(create()); + ArrayRecord result = TArrays_NUMBER_LONG_R().getType().getConstructor(Configuration.class).newInstance(create().configuration()); return result; } private ArrayRecord newSTRING_R() throws Exception { - ArrayRecord result = TArrays_STRING_R().getType().getConstructor(Configuration.class).newInstance(create()); + ArrayRecord result = TArrays_STRING_R().getType().getConstructor(Configuration.class).newInstance(create().configuration()); return result; } @@ -912,11 +912,11 @@ extends BaseTest) invoke(cRoutines(), "pEnhanceAddress3", create(), address); + address = (UDTRecord) invoke(cRoutines(), "pEnhanceAddress3", create().configuration(), address); street = (UDTRecord) invoke(address, "getStreet"); assertEquals("Zwinglistrasse", invoke(street, "getStreet")); assertEquals("17", invoke(street, "getNo")); @@ -1215,7 +1215,7 @@ extends BaseTest bFromCursor = invoke(cRoutines(), "fGetOneCursor", create(), integerArray); + Result bFromCursor = invoke(cRoutines(), "fGetOneCursor", create().configuration(), integerArray); assertNotNull(bFromCursor); assertTrue(bFromCursor.isEmpty()); @@ -1232,7 +1232,7 @@ extends BaseTest bFromTable = create() .selectFrom(TBook()) @@ -1309,7 +1309,7 @@ extends BaseTest execOrder = new Vector(); @@ -417,8 +417,8 @@ extends BaseTest +

Configuration

+

+ Executor, ExecuteContext, RenderContext, BindContext no longer extend Configuration for "convenience". From jOOQ 3.0 onwards, composition is chosen over inheritance as these objects are not really configurations. Most importantly +

+
    +
  • Executor is only a DSL entry point for constructing "attached" QueryParts
    • +
  • ExecuteContext has a well-defined lifecycle, tied to that of a single query execution
    • +
  • RenderContext has a well-defined lifecycle, tied to that of a single rendering operation
    • +
  • BindContext has a well-defined lifecycle, tied to that of a single variable binding operation
    • +
+

+ In order to resolve confusion that used to arise because of different lifecycle durations, these types are now no longer formally connected through inheritance. +

+

ConnectionProvider

In order to allow for simpler connection / data source management, jOOQ externalised connection handling in a new ConnectionProvider type. The previous two connection modes are maintained backwards-compatibly (JDBC standalone connection mode, pooled DataSource mode). Other connection modes can be injected using: diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java index b80cae9ffe..9dd5aa90a5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java +++ b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java @@ -63,11 +63,13 @@ class BatchCRUD implements Batch { private static final long serialVersionUID = -2935544935267715011L; private final Executor create; + private final Configuration configuration; private final UpdatableRecord[] records; private final Action action; - BatchCRUD(Executor create, Action action, UpdatableRecord[] records) { - this.create = create; + BatchCRUD(Configuration configuration, Action action, UpdatableRecord[] records) { + this.create = new Executor(configuration); + this.configuration = configuration; this.action = action; this.records = records; } @@ -82,7 +84,7 @@ class BatchCRUD implements Batch { // [#1180] Run batch queries with BatchMultiple, if no bind variables // should be used... - if (executeStaticStatements(create.getSettings())) { + if (executeStaticStatements(configuration.getSettings())) { return executeStatic(); } else { @@ -93,24 +95,24 @@ class BatchCRUD implements Batch { private final int[] executePrepared() { Map> queries = new LinkedHashMap>(); - Boolean executeLogging = create.getSettings().isExecuteLogging(); + Boolean executeLogging = configuration.getSettings().isExecuteLogging(); QueryCollector collector = new QueryCollector(); try { // [#1537] Communicate with UpdatableRecordImpl - create.setData(Utils.DATA_OMIT_RETURNING_CLAUSE, true); + configuration.setData(Utils.DATA_OMIT_RETURNING_CLAUSE, true); // Add the QueryCollector to intercept query execution after rendering - create.getExecuteListeners().add(collector); + configuration.getExecuteListeners().add(collector); // [#1529] Avoid DEBUG logging of single INSERT / UPDATE statements - create.getSettings().setExecuteLogging(false); + configuration.getSettings().setExecuteLogging(false); for (int i = 0; i < records.length; i++) { Configuration previous = ((AttachableInternal) records[i]).getConfiguration(); try { - records[i].attach(create); + records[i].attach(configuration); executeAction(i); } catch (QueryCollectorException e) { @@ -137,10 +139,10 @@ class BatchCRUD implements Batch { // Restore the original factory finally { - create.getData().remove(Utils.DATA_OMIT_RETURNING_CLAUSE); + configuration.getData().remove(Utils.DATA_OMIT_RETURNING_CLAUSE); - create.getExecuteListeners().remove(collector); - create.getSettings().setExecuteLogging(executeLogging); + configuration.getExecuteListeners().remove(collector); + configuration.getSettings().setExecuteLogging(executeLogging); } // Execute one batch statement for each identical SQL statement. Every @@ -174,13 +176,13 @@ class BatchCRUD implements Batch { QueryCollector collector = new QueryCollector(); try { - create.getExecuteListeners().add(collector); + configuration.getExecuteListeners().add(collector); for (int i = 0; i < records.length; i++) { Configuration previous = ((AttachableInternal) records[i]).getConfiguration(); try { - records[i].attach(create); + records[i].attach(configuration); executeAction(i); } catch (QueryCollectorException e) { @@ -198,7 +200,7 @@ class BatchCRUD implements Batch { // Restore the original factory finally { - create.getExecuteListeners().remove(collector); + configuration.getExecuteListeners().remove(collector); } // Resulting statements can be batch executed in their requested order diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java b/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java index f90912a2df..77728b23a5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java +++ b/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java @@ -39,6 +39,7 @@ import java.sql.Connection; import java.sql.SQLException; import org.jooq.Batch; +import org.jooq.Configuration; import org.jooq.ExecuteContext; import org.jooq.ExecuteListener; import org.jooq.Query; @@ -51,13 +52,13 @@ class BatchMultiple implements Batch { /** * Generated UID */ - private static final long serialVersionUID = -7337667281292354043L; + private static final long serialVersionUID = -7337667281292354043L; - private final Executor create; - private final Query[] queries; + private final Configuration configuration; + private final Query[] queries; - public BatchMultiple(Executor create, Query... queries) { - this.create = create; + public BatchMultiple(Configuration configuration, Query... queries) { + this.configuration = configuration; this.queries = queries; } @@ -68,7 +69,7 @@ class BatchMultiple implements Batch { @Override public final int[] execute() { - ExecuteContext ctx = new DefaultExecuteContext(create, queries); + ExecuteContext ctx = new DefaultExecuteContext(configuration, queries); ExecuteListener listener = new ExecuteListeners(ctx); Connection connection = ctx.connection(); @@ -78,7 +79,7 @@ class BatchMultiple implements Batch { String[] batchSQL = ctx.batchSQL(); for (int i = 0; i < queries.length; i++) { listener.renderStart(ctx); - batchSQL[i] = create.renderInlined(queries[i]); + batchSQL[i] = new Executor(configuration).renderInlined(queries[i]); listener.renderEnd(ctx); } diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java index db789d0e83..dce7e48686 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java +++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java @@ -43,6 +43,7 @@ import java.util.ArrayList; import java.util.List; import org.jooq.BatchBindStep; +import org.jooq.Configuration; import org.jooq.ExecuteContext; import org.jooq.ExecuteListener; import org.jooq.Param; @@ -59,11 +60,13 @@ class BatchSingle implements BatchBindStep { private static final long serialVersionUID = 3793967258181493207L; private final Executor create; + private final Configuration configuration; private final Query query; private final List allBindValues; - public BatchSingle(Executor create, Query query) { - this.create = create; + public BatchSingle(Configuration configuration, Query query) { + this.create = new Executor(configuration); + this.configuration = configuration; this.query = query; this.allBindValues = new ArrayList(); } @@ -102,7 +105,7 @@ class BatchSingle implements BatchBindStep { } private final int[] executePrepared() { - ExecuteContext ctx = new DefaultExecuteContext(create, new Query[] { query }); + ExecuteContext ctx = new DefaultExecuteContext(configuration, new Query[] { query }); ExecuteListener listener = new ExecuteListeners(ctx); Connection connection = ctx.connection(); @@ -132,7 +135,7 @@ class BatchSingle implements BatchBindStep { for (int i = 0; i < params.size(); i++) { params.get(i).setConverted(bindValues[i]); } - new DefaultBindContext(create, ctx.statement()).bind(params); + new DefaultBindContext(configuration, ctx.statement()).bind(params); listener.bindEnd(ctx); ctx.statement().addBatch(); diff --git a/jOOQ/src/main/java/org/jooq/impl/Executor.java b/jOOQ/src/main/java/org/jooq/impl/Executor.java index 63a80de681..41ac21f404 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Executor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Executor.java @@ -57,6 +57,7 @@ import static org.jooq.impl.Factory.trueCondition; import static org.jooq.impl.Utils.list; import java.io.IOException; +import java.io.Serializable; import java.io.StringReader; import java.math.BigInteger; import java.sql.Connection; @@ -228,7 +229,7 @@ import org.jooq.tools.csv.CSVReader; * @author Lukas Eder */ @SuppressWarnings({ "rawtypes", "unchecked" }) -public class Executor implements Configuration { +public class Executor implements Serializable { /** * Generated UID @@ -392,50 +393,8 @@ public class Executor implements Configuration { // XXX Configuration API // ------------------------------------------------------------------------- - @Override - public final SQLDialect getDialect() { - return configuration.getDialect(); - } - - @Override - @Deprecated - public final org.jooq.SchemaMapping getSchemaMapping() { - return configuration.getSchemaMapping(); - } - - @Override - public final Settings getSettings() { - return configuration.getSettings(); - } - - @Override - public final Map getData() { - return configuration.getData(); - } - - @Override - public final Object getData(Object key) { - return configuration.getData(key); - } - - @Override - public final Object setData(Object key, Object value) { - return configuration.setData(key, value); - } - - @Override - public final ConnectionProvider getConnectionProvider() { - return configuration.getConnectionProvider(); - } - - @Override - public final List getExecuteListeners() { - return configuration.getExecuteListeners(); - } - - @Override - public final void setExecuteListeners(List listeners) { - configuration.setExecuteListeners(listeners); + public final Configuration configuration() { + return configuration; } /** @@ -449,7 +408,7 @@ public class Executor implements Configuration { * @return The mapped schema */ public final Schema map(Schema schema) { - return Utils.getMappedSchema(this, schema); + return Utils.getMappedSchema(configuration, schema); } /** @@ -463,7 +422,7 @@ public class Executor implements Configuration { * @return The mapped table */ public final Table map(Table table) { - return Utils.getMappedTable(this, table); + return Utils.getMappedTable(configuration, table); } // ------------------------------------------------------------------------- @@ -477,7 +436,7 @@ public class Executor implements Configuration { * connection's database meta data. */ public final Meta meta() { - return new MetaImpl(this); + return new MetaImpl(configuration); } // ------------------------------------------------------------------------- @@ -502,7 +461,7 @@ public class Executor implements Configuration { * */ public final RenderContext renderContext() { - return new DefaultRenderContext(this); + return new DefaultRenderContext(configuration); } /** @@ -576,7 +535,7 @@ public class Executor implements Configuration { * @see Factory#param(String, Object) */ public final Map> extractParams(QueryPart part) { - ParamCollector collector = new ParamCollector(this); + ParamCollector collector = new ParamCollector(configuration); collector.bind(part); return Collections.unmodifiableMap(collector.result); } @@ -606,7 +565,7 @@ public class Executor implements Configuration { * RenderContext for JOOQ INTERNAL USE only. Avoid referencing it directly */ public final BindContext bindContext(PreparedStatement stmt) { - return new DefaultBindContext(this, stmt); + return new DefaultBindContext(configuration, stmt); } /** @@ -640,7 +599,7 @@ public class Executor implements Configuration { */ public final void attach(Collection attachables) { for (Attachable attachable : attachables) { - attachable.attach(this); + attachable.attach(configuration); } } @@ -654,7 +613,7 @@ public class Executor implements Configuration { */ @Support public final > LoaderOptionsStep loadInto(Table table) { - return new LoaderImpl(this, table); + return new LoaderImpl(configuration, table); } /** @@ -699,7 +658,7 @@ public class Executor implements Configuration { */ @Support public final Query query(String sql, Object... bindings) { - return new SQLQuery(this, sql, bindings); + return new SQLQuery(configuration, sql, bindings); } /** @@ -730,7 +689,7 @@ public class Executor implements Configuration { */ @Support public final Query query(String sql, QueryPart... parts) { - return new SQLQuery(this, sql, parts); + return new SQLQuery(configuration, sql, parts); } /** @@ -1287,7 +1246,7 @@ public class Executor implements Configuration { */ @Support public final ResultQuery resultQuery(String sql, Object... bindings) { - return new SQLResultQuery(this, sql, bindings); + return new SQLResultQuery(configuration, sql, bindings); } /** @@ -1318,7 +1277,7 @@ public class Executor implements Configuration { */ @Support public final ResultQuery resultQuery(String sql, QueryPart... parts) { - return new SQLResultQuery(this, sql, parts); + return new SQLResultQuery(configuration, sql, parts); } // ------------------------------------------------------------------------- @@ -1509,7 +1468,7 @@ public class Executor implements Configuration { @Support public final Cursor fetchLazy(ResultSet rs) throws DataAccessException { try { - return fetchLazy(rs, new MetaDataFieldProvider(this, rs.getMetaData()).getFields()); + return fetchLazy(rs, new MetaDataFieldProvider(configuration, rs.getMetaData()).getFields()); } catch (SQLException e) { throw new DataAccessException("Error while accessing ResultSet meta data", e); @@ -1532,7 +1491,7 @@ public class Executor implements Configuration { */ @Support public final Cursor fetchLazy(ResultSet rs, Field... fields) throws DataAccessException { - ExecuteContext ctx = new DefaultExecuteContext(this); + ExecuteContext ctx = new DefaultExecuteContext(configuration); ExecuteListener listener = new ExecuteListeners(ctx); ctx.resultSet(rs); @@ -1784,7 +1743,7 @@ public class Executor implements Configuration { */ public final Result fetchFromStringData(List data) { if (data.size() == 0) { - return new ResultImpl(this); + return new ResultImpl(configuration); } else { List> fields = new ArrayList>(); @@ -1793,7 +1752,7 @@ public class Executor implements Configuration { fields.add(fieldByName(String.class, name)); } - Result result = new ResultImpl(this, fields); + Result result = new ResultImpl(configuration, fields); if (data.size() > 1) { for (String[] values : data.subList(1, data.size())) { @@ -1825,7 +1784,7 @@ public class Executor implements Configuration { @Support public final SelectWhereStep selectFrom(Table table) { SelectWhereStep result = Factory.selectFrom(table); - result.attach(this); + result.attach(configuration); return result; } @@ -1853,7 +1812,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep select(Collection> fields) { SelectSelectStep result = Factory.select(fields); - result.attach(this); + result.attach(configuration); return result; } @@ -1882,7 +1841,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep select(Field... fields) { SelectSelectStep result = Factory.select(fields); - result.attach(this); + result.attach(configuration); return result; } @@ -2640,7 +2599,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep selectDistinct(Collection> fields) { SelectSelectStep result = Factory.selectDistinct(fields); - result.attach(this); + result.attach(configuration); return result; } @@ -2668,7 +2627,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep selectDistinct(Field... fields) { SelectSelectStep result = Factory.selectDistinct(fields); - result.attach(this); + result.attach(configuration); return result; } @@ -3427,7 +3386,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep> selectZero() { SelectSelectStep> result = Factory.selectZero(); - result.attach(this); + result.attach(configuration); return result; } @@ -3456,7 +3415,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep> selectOne() { SelectSelectStep> result = Factory.selectOne(); - result.attach(this); + result.attach(configuration); return result; } @@ -3484,7 +3443,7 @@ public class Executor implements Configuration { @Support public final SelectSelectStep> selectCount() { SelectSelectStep> result = Factory.selectCount(); - result.attach(this); + result.attach(configuration); return result; } @@ -3493,7 +3452,7 @@ public class Executor implements Configuration { */ @Support public final SelectQuery selectQuery() { - return new SelectQueryImpl(this); + return new SelectQueryImpl(configuration); } /** @@ -3504,7 +3463,7 @@ public class Executor implements Configuration { */ @Support public final SelectQuery selectQuery(TableLike table) { - return new SelectQueryImpl(this, table); + return new SelectQueryImpl(configuration, table); } /** @@ -3515,7 +3474,7 @@ public class Executor implements Configuration { */ @Support public final InsertQuery insertQuery(Table into) { - return new InsertQueryImpl(this, into); + return new InsertQueryImpl(configuration, into); } /** @@ -3540,7 +3499,7 @@ public class Executor implements Configuration { */ @Support public final InsertSetStep insertInto(Table into) { - return new InsertImpl(this, into, Collections.>emptyList()); + return new InsertImpl(configuration, into, Collections.>emptyList()); } // [jooq-tools] START [insert] @@ -3563,7 +3522,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep1 insertInto(Table into, Field field1) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1 })); } /** @@ -3584,7 +3543,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep2 insertInto(Table into, Field field1, Field field2) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2 })); } /** @@ -3605,7 +3564,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep3 insertInto(Table into, Field field1, Field field2, Field field3) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3 })); } /** @@ -3626,7 +3585,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep4 insertInto(Table into, Field field1, Field field2, Field field3, Field field4) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4 })); } /** @@ -3647,7 +3606,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep5 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5 })); } /** @@ -3668,7 +3627,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep6 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6 })); } /** @@ -3689,7 +3648,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep7 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7 })); } /** @@ -3710,7 +3669,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep8 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8 })); } /** @@ -3731,7 +3690,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep9 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9 })); } /** @@ -3752,7 +3711,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep10 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10 })); } /** @@ -3773,7 +3732,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep11 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11 })); } /** @@ -3794,7 +3753,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep12 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12 })); } /** @@ -3815,7 +3774,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep13 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13 })); } /** @@ -3836,7 +3795,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep14 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14 })); } /** @@ -3857,7 +3816,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep15 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15 })); } /** @@ -3878,7 +3837,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep16 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16 })); } /** @@ -3899,7 +3858,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep17 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17 })); } /** @@ -3920,7 +3879,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep18 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18 })); } /** @@ -3941,7 +3900,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep19 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19 })); } /** @@ -3962,7 +3921,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep20 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20 })); } /** @@ -3983,7 +3942,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep21 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21 })); } /** @@ -4004,7 +3963,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support public final InsertValuesStep22 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22) { - return new InsertImpl(this, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 })); + return new InsertImpl(configuration, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 })); } // [jooq-tools] END [insert] @@ -4026,7 +3985,7 @@ public class Executor implements Configuration { */ @Support public final InsertValuesStepN insertInto(Table into, Field... fields) { - return new InsertImpl(this, into, Arrays.asList(fields)); + return new InsertImpl(configuration, into, Arrays.asList(fields)); } /** @@ -4046,7 +4005,7 @@ public class Executor implements Configuration { */ @Support public final InsertValuesStepN insertInto(Table into, Collection> fields) { - return new InsertImpl(this, into, fields); + return new InsertImpl(configuration, into, fields); } /** @@ -4057,7 +4016,7 @@ public class Executor implements Configuration { */ @Support public final UpdateQuery updateQuery(Table table) { - return new UpdateQueryImpl(this, table); + return new UpdateQueryImpl(configuration, table); } /** @@ -4085,7 +4044,7 @@ public class Executor implements Configuration { */ @Support public final UpdateSetFirstStep update(Table table) { - return new UpdateImpl(this, table); + return new UpdateImpl(configuration, table); } /** @@ -4164,7 +4123,7 @@ public class Executor implements Configuration { */ @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeUsingStep mergeInto(Table table) { - return new MergeImpl(this, table); + return new MergeImpl(configuration, table); } // [jooq-tools] START [merge] @@ -4192,7 +4151,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep1 mergeInto(Table table, Field field1) { - return new MergeImpl(this, table, Arrays.asList(field1)); + return new MergeImpl(configuration, table, Arrays.asList(field1)); } /** @@ -4218,7 +4177,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep2 mergeInto(Table table, Field field1, Field field2) { - return new MergeImpl(this, table, Arrays.asList(field1, field2)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2)); } /** @@ -4244,7 +4203,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3)); } /** @@ -4270,7 +4229,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4)); } /** @@ -4296,7 +4255,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5)); } /** @@ -4322,7 +4281,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6)); } /** @@ -4348,7 +4307,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7)); } /** @@ -4374,7 +4333,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8)); } /** @@ -4400,7 +4359,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9)); } /** @@ -4426,7 +4385,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10)); } /** @@ -4452,7 +4411,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11)); } /** @@ -4478,7 +4437,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12)); } /** @@ -4504,7 +4463,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13)); } /** @@ -4530,7 +4489,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14)); } /** @@ -4556,7 +4515,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15)); } /** @@ -4582,7 +4541,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16)); } /** @@ -4608,7 +4567,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17)); } /** @@ -4634,7 +4593,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18)); } /** @@ -4660,7 +4619,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19)); } /** @@ -4686,7 +4645,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20)); } /** @@ -4712,7 +4671,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21)); } /** @@ -4738,7 +4697,7 @@ public class Executor implements Configuration { @Generated("This method was generated using jOOQ-tools") @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22) { - return new MergeImpl(this, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); + return new MergeImpl(configuration, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); } // [jooq-tools] END [merge] @@ -4775,7 +4734,7 @@ public class Executor implements Configuration { */ @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE }) public final MergeKeyStepN mergeInto(Table table, Collection> fields) { - return new MergeImpl(this, table, fields); + return new MergeImpl(configuration, table, fields); } /** @@ -4786,7 +4745,7 @@ public class Executor implements Configuration { */ @Support public final DeleteQuery deleteQuery(Table table) { - return new DeleteQueryImpl(this, table); + return new DeleteQueryImpl(configuration, table); } /** @@ -4802,7 +4761,7 @@ public class Executor implements Configuration { */ @Support public final DeleteWhereStep delete(Table table) { - return new DeleteImpl(this, table); + return new DeleteImpl(configuration, table); } // ------------------------------------------------------------------------- @@ -4826,7 +4785,7 @@ public class Executor implements Configuration { */ @Support public final Batch batch(Query... queries) { - return new BatchMultiple(this, queries); + return new BatchMultiple(configuration, queries); } /** @@ -4881,7 +4840,7 @@ public class Executor implements Configuration { */ @Support public final BatchBindStep batch(Query query) { - return new BatchSingle(this, query); + return new BatchSingle(configuration, query); } /** @@ -4927,7 +4886,7 @@ public class Executor implements Configuration { */ @Support public final Batch batchStore(UpdatableRecord... records) { - return new BatchCRUD(this, Action.STORE, records); + return new BatchCRUD(configuration, Action.STORE, records); } /** @@ -4951,7 +4910,7 @@ public class Executor implements Configuration { */ @Support public final Batch batchInsert(UpdatableRecord... records) { - return new BatchCRUD(this, Action.INSERT, records); + return new BatchCRUD(configuration, Action.INSERT, records); } /** @@ -4975,7 +4934,7 @@ public class Executor implements Configuration { */ @Support public final Batch batchUpdate(UpdatableRecord... records) { - return new BatchCRUD(this, Action.UPDATE, records); + return new BatchCRUD(configuration, Action.UPDATE, records); } /** @@ -5033,7 +4992,7 @@ public class Executor implements Configuration { */ @Support public final Batch batchDelete(UpdatableRecord... records) { - return new BatchCRUD(this, Action.DELETE, records); + return new BatchCRUD(configuration, Action.DELETE, records); } /** @@ -5075,7 +5034,7 @@ public class Executor implements Configuration { */ @Support public final Truncate truncate(Table table) { - return new TruncateImpl(this, table); + return new TruncateImpl(configuration, table); } // ------------------------------------------------------------------------- @@ -5261,7 +5220,7 @@ public class Executor implements Configuration { } finally { getRenderMapping(getSettings()).setDefaultSchema(schema.getName()); - getSchemaMapping().use(schema); + configuration.getSchemaMapping().use(schema); } return result; @@ -5294,7 +5253,7 @@ public class Executor implements Configuration { * @return The new record */ public final > R newRecord(UDT type) { - return Utils.newRecord(type, this); + return Utils.newRecord(type, configuration); } /** @@ -5310,7 +5269,7 @@ public class Executor implements Configuration { * @return The new record */ public final R newRecord(Table table) { - return Utils.newRecord(table, this); + return Utils.newRecord(table, configuration); } /** @@ -5355,7 +5314,7 @@ public class Executor implements Configuration { * @return The new result */ public final Result newResult(Table table) { - return new ResultImpl(this, table.fields()); + return new ResultImpl(configuration, table.fields()); } // ------------------------------------------------------------------------- @@ -5375,7 +5334,7 @@ public class Executor implements Configuration { final Configuration previous = Utils.getConfiguration(query); try { - query.attach(this); + query.attach(configuration); return query.fetch(); } finally { @@ -5396,7 +5355,7 @@ public class Executor implements Configuration { final Configuration previous = Utils.getConfiguration(query); try { - query.attach(this); + query.attach(configuration); return query.fetchLazy(); } finally { @@ -5417,7 +5376,7 @@ public class Executor implements Configuration { final Configuration previous = Utils.getConfiguration(query); try { - query.attach(this); + query.attach(configuration); return query.fetchMany(); } finally { @@ -5439,7 +5398,7 @@ public class Executor implements Configuration { final Configuration previous = Utils.getConfiguration(query); try { - query.attach(this); + query.attach(configuration); return query.fetchOne(); } finally { @@ -5485,7 +5444,7 @@ public class Executor implements Configuration { final Configuration previous = Utils.getConfiguration(query); try { - query.attach(this); + query.attach(configuration); return query.execute(); } finally { diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java index 0f3ed5bb20..ff04b47829 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java @@ -50,6 +50,7 @@ import java.util.Collection; import java.util.List; import org.jooq.Condition; +import org.jooq.Configuration; import org.jooq.Field; import org.jooq.InsertQuery; import org.jooq.Loader; @@ -123,8 +124,8 @@ class LoaderImpl> implements private int stored; private final List errors; - LoaderImpl(Executor create, Table table) { - this.create = create; + LoaderImpl(Configuration configuration, Table table) { + this.create = new Executor(configuration); this.table = table; this.errors = new ArrayList(); } diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index 7338d2f7b7..2c896bb8eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Map; import org.jooq.Catalog; +import org.jooq.Configuration; import org.jooq.ConnectionProvider; import org.jooq.DataType; import org.jooq.Meta; @@ -72,16 +73,18 @@ class MetaImpl implements Meta, Serializable { */ private static final long serialVersionUID = 3582980783173033809L; - private final Executor executor; + private final Executor create; + private final Configuration configuration; private transient volatile DatabaseMetaData meta; - MetaImpl(Executor executor) { - this.executor = executor; + MetaImpl(Configuration configuration) { + this.create = new Executor(configuration); + this.configuration = configuration; } private final DatabaseMetaData meta() { if (meta == null) { - ConnectionProvider provider = executor.getConnectionProvider(); + ConnectionProvider provider = configuration.getConnectionProvider(); Connection connection = null; try { @@ -103,7 +106,7 @@ class MetaImpl implements Meta, Serializable { public final List getCatalogs() { try { List result = new ArrayList(); - Result catalogs = executor.fetch(meta().getCatalogs()); + Result catalogs = create.fetch(meta().getCatalogs()); for (String name : catalogs.getValues(0, String.class)) { result.add(new MetaCatalog(name)); @@ -158,7 +161,7 @@ class MetaImpl implements Meta, Serializable { public final List getSchemas() { try { List result = new ArrayList(); - Result schemas = executor.fetch(meta().getSchemas()); + Result schemas = create.fetch(meta().getSchemas()); for (String name : schemas.getValues(0, String.class)) { result.add(new MetaSchema(name)); @@ -199,7 +202,7 @@ class MetaImpl implements Meta, Serializable { try { List> result = new ArrayList>(); - Result tables = executor.fetch(meta().getTables(null, getName(), "%", null)); + Result tables = create.fetch(meta().getTables(null, getName(), "%", null)); for (Record table : tables) { // String catalog = table.getValue(0, String.class); @@ -226,7 +229,7 @@ class MetaImpl implements Meta, Serializable { // SQLite JDBC's DatabaseMetaData.getColumns() can only return a single // table's columns - if (columnCache == null && executor.getDialect() != SQLITE) { + if (columnCache == null && configuration.getDialect() != SQLITE) { columnCache = getColumns0("%").intoGroups(fieldByName(String.class, "TABLE_NAME")); } @@ -239,7 +242,7 @@ class MetaImpl implements Meta, Serializable { } private final Result getColumns0(String tableName) throws SQLException { - return executor.fetch( + return create.fetch( meta().getColumns(null, null, tableName, "%"), // Work around a bug in the SQL Server JDBC driver by @@ -286,7 +289,7 @@ class MetaImpl implements Meta, Serializable { // TODO: Exception handling should be moved inside SQLDataType DataType type = null; try { - type = DefaultDataType.getDataType(executor.getDialect(), typeName, precision, scale); + type = DefaultDataType.getDataType(configuration.getDialect(), typeName, precision, scale); if (type.hasPrecision()) { type = type.precision(precision); diff --git a/jOOQ/src/test/java/org/jooq/test/SettingsTest.java b/jOOQ/src/test/java/org/jooq/test/SettingsTest.java index 1d715054f6..27bcd3424f 100644 --- a/jOOQ/src/test/java/org/jooq/test/SettingsTest.java +++ b/jOOQ/src/test/java/org/jooq/test/SettingsTest.java @@ -94,7 +94,7 @@ public class SettingsTest { assertEquals("\"T\"", create1.render(table)); Executor create2 = new Executor(SQLDialect.ORACLE); - create2.getSettings().setRenderSchema(false); + create2.configuration().getSettings().setRenderSchema(false); assertEquals("\"T\"", create2.render(table)); } @@ -104,7 +104,7 @@ public class SettingsTest { assertEquals("\"TABLEX\"", create1.render(TABLE1)); Executor create2 = new Executor(SQLDialect.ORACLE); - create2.getSettings().setRenderMapping(mapping()); + create2.configuration().getSettings().setRenderMapping(mapping()); assertEquals("\"TABLEX\"", create2.render(TABLE1)); }