diff --git a/jOOQ/src/main/java/org/jooq/Allow.java b/jOOQ/src/main/java/org/jooq/Allow.java index d6c8bab528..ad340ef8cf 100644 --- a/jOOQ/src/main/java/org/jooq/Allow.java +++ b/jOOQ/src/main/java/org/jooq/Allow.java @@ -45,6 +45,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DEFAULT; @@ -61,6 +62,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... import static org.jooq.SQLDialect.SQL99; +// ... import static org.jooq.SQLDialect.SQLITE; // ... // ... @@ -164,6 +166,8 @@ public @interface Allow { + + CUBRID, DEFAULT, SQL99, diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java index 82f7ea4755..f301d68918 100644 --- a/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexStep.java index 8660bf245b..9ec31b3b77 100644 --- a/jOOQ/src/main/java/org/jooq/AlterIndexStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterIndexStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java b/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java index 43ca68d9d6..c07a8c0af1 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java index 51b6f5cdb6..275e45e957 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java index feb27dd9d0..afce407141 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java index 3a93184df6..a87b301b64 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java b/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java index e51697ee2d..a8ea4866a6 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java index 18bb527d68..0191945b5a 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/AlterViewStep.java b/jOOQ/src/main/java/org/jooq/AlterViewStep.java index 069f799152..16b3d15580 100644 --- a/jOOQ/src/main/java/org/jooq/AlterViewStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterViewStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/ArrayAggOrderByStep.java b/jOOQ/src/main/java/org/jooq/ArrayAggOrderByStep.java index 7c770166ac..3dda7f8a51 100644 --- a/jOOQ/src/main/java/org/jooq/ArrayAggOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/ArrayAggOrderByStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java b/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java index c3d633cbb1..a85d874e38 100644 --- a/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java +++ b/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java index e6147acaa7..4b2d99e40b 100644 --- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java +++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java b/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java index eafd5394c3..4f219d3a40 100644 --- a/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java +++ b/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java index 8d6cd475c4..309163d3ea 100644 --- a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java index 1bb0b2d96a..d6b8bf2f21 100644 --- a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.POSTGRES; // ... diff --git a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java index f073966ae9..d1b1bac7ef 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java index d2670993cc..808ac1e094 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; diff --git a/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java b/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java index 366cf17f69..53fd319ecb 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java b/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java index ec21d46fd4..c12e501d12 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java b/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java index 95f1287983..f2c020988d 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 90b62de347..1ee1175fd9 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/DatePart.java b/jOOQ/src/main/java/org/jooq/DatePart.java index 36d9631309..a007af300a 100644 --- a/jOOQ/src/main/java/org/jooq/DatePart.java +++ b/jOOQ/src/main/java/org/jooq/DatePart.java @@ -38,6 +38,7 @@ package org.jooq; +// ... import static org.jooq.SQLDialect.POSTGRES; // ... diff --git a/jOOQ/src/main/java/org/jooq/DeleteQuery.java b/jOOQ/src/main/java/org/jooq/DeleteQuery.java index 52e747cde9..fb83f00a96 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteQuery.java +++ b/jOOQ/src/main/java/org/jooq/DeleteQuery.java @@ -38,6 +38,7 @@ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; // ... diff --git a/jOOQ/src/main/java/org/jooq/DeleteResultStep.java b/jOOQ/src/main/java/org/jooq/DeleteResultStep.java index bf79f5169f..174f3b3f4d 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteResultStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteResultStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; // ... diff --git a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java index 12c6cc856f..596adea9ad 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; // ... diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList.java index 51f68079a1..87043f643e 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java index 84bd82bf1b..95bef16a5e 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java index 4d344123a4..79918f3164 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java index 5997a3ecba..9307cfd4a3 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java index e7e4a81120..54f1a31dac 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java index e6f21a1f03..173a361dc1 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java index e816f311b7..0174e8a1d6 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java index 1f54790e6a..2c941bab59 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java index f4ba59d35c..770c87ba5d 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java index 49fce634a8..3cbf501dd9 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java index e70f673967..2e53a58ae2 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java index f5c68093b9..23ff5945de 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java index da32a4277b..38f617be73 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java index 9961545eee..9381837b46 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java index d998e21c7d..e1dd685ca2 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java index 8465442fa3..d046457f22 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java index a8e3a333a0..fee2e2962b 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java index 0dc4e54414..d7c1b79f16 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java index 84906b0cd3..5006fec550 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java index c90dc67e96..4939aff197 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java index e4fa185f0e..304072ff9c 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java index 20c362c6d2..d36fbd7bd9 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java index 3c3826f2d4..1435f3059a 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java b/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java index ba3e2cdbad..ef558ab945 100644 --- a/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java +++ b/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/DropSchemaStep.java b/jOOQ/src/main/java/org/jooq/DropSchemaStep.java index 14928bc3fb..e402e9976b 100644 --- a/jOOQ/src/main/java/org/jooq/DropSchemaStep.java +++ b/jOOQ/src/main/java/org/jooq/DropSchemaStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index 33b6ecb72e..0b005fc5cd 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -41,6 +41,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/GrantOnStep.java b/jOOQ/src/main/java/org/jooq/GrantOnStep.java index 23e29c9192..d40442912f 100644 --- a/jOOQ/src/main/java/org/jooq/GrantOnStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantOnStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/GrantToStep.java b/jOOQ/src/main/java/org/jooq/GrantToStep.java index 032885463e..229a328542 100644 --- a/jOOQ/src/main/java/org/jooq/GrantToStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantToStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java b/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java index 0133a0bcdb..b633ef763b 100644 --- a/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java index 0f7fb526f9..fdb64b7ff7 100644 --- a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java index 631e086f81..49f3835fee 100644 --- a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java +++ b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/InsertOnConflictConditionStep.java b/jOOQ/src/main/java/org/jooq/InsertOnConflictConditionStep.java index 7f2177649b..abbf540089 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnConflictConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnConflictConditionStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.POSTGRES_9_5; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/InsertOnConflictDoUpdateStep.java b/jOOQ/src/main/java/org/jooq/InsertOnConflictDoUpdateStep.java index f4132136be..0341174cd5 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnConflictDoUpdateStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnConflictDoUpdateStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java b/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java index 96578a2ca0..63d8059167 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.POSTGRES_9_5; diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java index 481270e24e..51dfdbc22d 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java index 667e559eac..ced1564da9 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/InsertQuery.java b/jOOQ/src/main/java/org/jooq/InsertQuery.java index d12ee0a4f9..dc9ef27a9f 100644 --- a/jOOQ/src/main/java/org/jooq/InsertQuery.java +++ b/jOOQ/src/main/java/org/jooq/InsertQuery.java @@ -38,6 +38,7 @@ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/InsertSetStep.java b/jOOQ/src/main/java/org/jooq/InsertSetStep.java index 506d2327e5..a5d8096238 100644 --- a/jOOQ/src/main/java/org/jooq/InsertSetStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertSetStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java b/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java index ed61f6f5a8..5923632110 100644 --- a/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java +++ b/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java b/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java index f76a4bc4f2..2146a85fe6 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java index 1498c0a1ec..7d4ef1c44e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java index cdf796c41f..05db275692 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java index ffe25d45bc..d8cf9623f3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java index 213766c459..d445ac1bfc 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java index 6cdfa34614..0d34c2fd87 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java index 3bdc0e097a..dfcd38f691 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java index 310fc416fc..1eaf425f4d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java index e170d72f19..2ca1ed7380 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java index c479653909..dd7ec2948f 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java index 29fcd449a2..da6d08a625 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java index 05dca05886..2b5693f983 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java index 4ce6ab0470..0c9663ecc3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java index 208b7a51e2..0506d3b7ab 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java index c4f7e899bb..a23274ade3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java index 066a9c4673..cd4b702a14 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java index 7ec43a412b..e1bbd086b5 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java index 7c92dab7ba..8d7f54d177 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java index 5a89996bcb..02d2d045b1 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java index a37d2eb875..3948d9a2f1 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java index 220f134840..5bb69f8fce 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java index dd3f9ba711..c326f77c8c 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java index 25adeba2d4..fcf3391ce8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java index 2e3eaac6ed..3bfc8d00ac 100644 --- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java index af344687f2..a6575ba3a8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java index 558d6c95a5..5636dcae7c 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java index 510fc5445b..ba33efabae 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java index 027418466b..93cf9898a8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java index 36beb8778b..a308929787 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java index e2096ccdf0..daa12deeb8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java index e9474b9a0f..cb4aefb3b7 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java index 100dc1d486..16d5426888 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java index df26c1621b..9ed4084f90 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java index f81820af35..8024ca4129 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java index bbc403891a..4dab7ed7ad 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java index 789506c909..33079792aa 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java index 9a1b2bfefc..ecf312f154 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java index 3284a921d3..6e93a51fa3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java index 5742e6f9a3..cf713ac15f 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java index fa468ae04b..6ea3f4722d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java index 78bea54b30..828961257b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java index 118fb293f9..6179a05925 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java index 62a9603efd..8d7c4414ac 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java index 198437c167..7034add06a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java index d5056a37dd..1854e42ea8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java index 5ac12095d7..6b24ee2663 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/Meta.java b/jOOQ/src/main/java/org/jooq/Meta.java index 8a381b4f6b..745a08beeb 100644 --- a/jOOQ/src/main/java/org/jooq/Meta.java +++ b/jOOQ/src/main/java/org/jooq/Meta.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java index 8fda32b387..915e596963 100644 --- a/jOOQ/src/main/java/org/jooq/Name.java +++ b/jOOQ/src/main/java/org/jooq/Name.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java index 3d10b63765..4915735feb 100644 --- a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunctionOfDeferredType.java b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunctionOfDeferredType.java index bef214a6d9..4703078580 100644 --- a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunctionOfDeferredType.java +++ b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunctionOfDeferredType.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.POSTGRES_9_4; /** diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index e18058a5c5..9cebeed96d 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -51,9 +51,7 @@ import java.util.Spliterator; import java.util.concurrent.CompletionStage; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; -import java.util.function.BiConsumer; import java.util.function.Consumer; -import java.util.function.Supplier; import java.util.stream.Collector; import java.util.stream.Stream; diff --git a/jOOQ/src/main/java/org/jooq/RevokeFromStep.java b/jOOQ/src/main/java/org/jooq/RevokeFromStep.java index 2419947d45..0b014480e0 100644 --- a/jOOQ/src/main/java/org/jooq/RevokeFromStep.java +++ b/jOOQ/src/main/java/org/jooq/RevokeFromStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/RevokeOnStep.java b/jOOQ/src/main/java/org/jooq/RevokeOnStep.java index 2ea91d6417..a59da3e38f 100644 --- a/jOOQ/src/main/java/org/jooq/RevokeOnStep.java +++ b/jOOQ/src/main/java/org/jooq/RevokeOnStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/Row1.java b/jOOQ/src/main/java/org/jooq/Row1.java index d7729c9457..16f8023656 100644 --- a/jOOQ/src/main/java/org/jooq/Row1.java +++ b/jOOQ/src/main/java/org/jooq/Row1.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 1. *

diff --git a/jOOQ/src/main/java/org/jooq/Row10.java b/jOOQ/src/main/java/org/jooq/Row10.java index 61f477c936..c3080448c4 100644 --- a/jOOQ/src/main/java/org/jooq/Row10.java +++ b/jOOQ/src/main/java/org/jooq/Row10.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 10. *

diff --git a/jOOQ/src/main/java/org/jooq/Row11.java b/jOOQ/src/main/java/org/jooq/Row11.java index 56096f1cd0..7627c46198 100644 --- a/jOOQ/src/main/java/org/jooq/Row11.java +++ b/jOOQ/src/main/java/org/jooq/Row11.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 11. *

diff --git a/jOOQ/src/main/java/org/jooq/Row12.java b/jOOQ/src/main/java/org/jooq/Row12.java index 35eafcbb31..35990d3f31 100644 --- a/jOOQ/src/main/java/org/jooq/Row12.java +++ b/jOOQ/src/main/java/org/jooq/Row12.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 12. *

diff --git a/jOOQ/src/main/java/org/jooq/Row13.java b/jOOQ/src/main/java/org/jooq/Row13.java index b3f7e688e2..40adb0a7ee 100644 --- a/jOOQ/src/main/java/org/jooq/Row13.java +++ b/jOOQ/src/main/java/org/jooq/Row13.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 13. *

diff --git a/jOOQ/src/main/java/org/jooq/Row14.java b/jOOQ/src/main/java/org/jooq/Row14.java index 9e191902d9..6117f78338 100644 --- a/jOOQ/src/main/java/org/jooq/Row14.java +++ b/jOOQ/src/main/java/org/jooq/Row14.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 14. *

diff --git a/jOOQ/src/main/java/org/jooq/Row15.java b/jOOQ/src/main/java/org/jooq/Row15.java index 41f90c4a9a..44a773f457 100644 --- a/jOOQ/src/main/java/org/jooq/Row15.java +++ b/jOOQ/src/main/java/org/jooq/Row15.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 15. *

diff --git a/jOOQ/src/main/java/org/jooq/Row16.java b/jOOQ/src/main/java/org/jooq/Row16.java index ca266f8d26..ffe9647e0c 100644 --- a/jOOQ/src/main/java/org/jooq/Row16.java +++ b/jOOQ/src/main/java/org/jooq/Row16.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 16. *

diff --git a/jOOQ/src/main/java/org/jooq/Row17.java b/jOOQ/src/main/java/org/jooq/Row17.java index e5d2b581e6..7dfd047471 100644 --- a/jOOQ/src/main/java/org/jooq/Row17.java +++ b/jOOQ/src/main/java/org/jooq/Row17.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 17. *

diff --git a/jOOQ/src/main/java/org/jooq/Row18.java b/jOOQ/src/main/java/org/jooq/Row18.java index e442b14f28..db3a83d20a 100644 --- a/jOOQ/src/main/java/org/jooq/Row18.java +++ b/jOOQ/src/main/java/org/jooq/Row18.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 18. *

diff --git a/jOOQ/src/main/java/org/jooq/Row19.java b/jOOQ/src/main/java/org/jooq/Row19.java index fd25e4d78c..5c2a8933d4 100644 --- a/jOOQ/src/main/java/org/jooq/Row19.java +++ b/jOOQ/src/main/java/org/jooq/Row19.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 19. *

diff --git a/jOOQ/src/main/java/org/jooq/Row2.java b/jOOQ/src/main/java/org/jooq/Row2.java index 0f5e7089c9..d121f3417f 100644 --- a/jOOQ/src/main/java/org/jooq/Row2.java +++ b/jOOQ/src/main/java/org/jooq/Row2.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 2. *

diff --git a/jOOQ/src/main/java/org/jooq/Row20.java b/jOOQ/src/main/java/org/jooq/Row20.java index 1d7f369ea6..0aa3d63944 100644 --- a/jOOQ/src/main/java/org/jooq/Row20.java +++ b/jOOQ/src/main/java/org/jooq/Row20.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 20. *

diff --git a/jOOQ/src/main/java/org/jooq/Row21.java b/jOOQ/src/main/java/org/jooq/Row21.java index 33ddeb25b8..db48702cd4 100644 --- a/jOOQ/src/main/java/org/jooq/Row21.java +++ b/jOOQ/src/main/java/org/jooq/Row21.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 21. *

diff --git a/jOOQ/src/main/java/org/jooq/Row22.java b/jOOQ/src/main/java/org/jooq/Row22.java index b9bdf9b53f..588351df3c 100644 --- a/jOOQ/src/main/java/org/jooq/Row22.java +++ b/jOOQ/src/main/java/org/jooq/Row22.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 22. *

diff --git a/jOOQ/src/main/java/org/jooq/Row3.java b/jOOQ/src/main/java/org/jooq/Row3.java index e3107ba0f7..2c3e2d341d 100644 --- a/jOOQ/src/main/java/org/jooq/Row3.java +++ b/jOOQ/src/main/java/org/jooq/Row3.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 3. *

diff --git a/jOOQ/src/main/java/org/jooq/Row4.java b/jOOQ/src/main/java/org/jooq/Row4.java index bc8cd1d942..2cec3d7171 100644 --- a/jOOQ/src/main/java/org/jooq/Row4.java +++ b/jOOQ/src/main/java/org/jooq/Row4.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 4. *

diff --git a/jOOQ/src/main/java/org/jooq/Row5.java b/jOOQ/src/main/java/org/jooq/Row5.java index 16f4d87604..7c96fc0d16 100644 --- a/jOOQ/src/main/java/org/jooq/Row5.java +++ b/jOOQ/src/main/java/org/jooq/Row5.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 5. *

diff --git a/jOOQ/src/main/java/org/jooq/Row6.java b/jOOQ/src/main/java/org/jooq/Row6.java index fb13aab380..888ec6652c 100644 --- a/jOOQ/src/main/java/org/jooq/Row6.java +++ b/jOOQ/src/main/java/org/jooq/Row6.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 6. *

diff --git a/jOOQ/src/main/java/org/jooq/Row7.java b/jOOQ/src/main/java/org/jooq/Row7.java index f9c186b217..0d9bf8a853 100644 --- a/jOOQ/src/main/java/org/jooq/Row7.java +++ b/jOOQ/src/main/java/org/jooq/Row7.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 7. *

diff --git a/jOOQ/src/main/java/org/jooq/Row8.java b/jOOQ/src/main/java/org/jooq/Row8.java index d526489ae0..697d993d6e 100644 --- a/jOOQ/src/main/java/org/jooq/Row8.java +++ b/jOOQ/src/main/java/org/jooq/Row8.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 8. *

diff --git a/jOOQ/src/main/java/org/jooq/Row9.java b/jOOQ/src/main/java/org/jooq/Row9.java index 038753b95e..1c4023870f 100644 --- a/jOOQ/src/main/java/org/jooq/Row9.java +++ b/jOOQ/src/main/java/org/jooq/Row9.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree 9. *

diff --git a/jOOQ/src/main/java/org/jooq/RowN.java b/jOOQ/src/main/java/org/jooq/RowN.java index de1fb8b859..03a564be2e 100644 --- a/jOOQ/src/main/java/org/jooq/RowN.java +++ b/jOOQ/src/main/java/org/jooq/RowN.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; @@ -55,14 +56,13 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... -import org.jooq.Comparator; -import org.jooq.conf.Settings; -import org.jooq.impl.DSL; - import java.util.Collection; import javax.annotation.Generated; +import org.jooq.conf.Settings; +import org.jooq.impl.DSL; + /** * A model type for a row value expression with degree N > 22. *

diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index 8496a156e7..02e13e4baf 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -387,6 +387,13 @@ public enum SQLDialect { + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java index 784572cfa3..9304df7cf8 100644 --- a/jOOQ/src/main/java/org/jooq/Select.java +++ b/jOOQ/src/main/java/org/jooq/Select.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/SelectDistinctOnStep.java b/jOOQ/src/main/java/org/jooq/SelectDistinctOnStep.java index 376ea7d1de..56ad7fa2a5 100644 --- a/jOOQ/src/main/java/org/jooq/SelectDistinctOnStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectDistinctOnStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.POSTGRES; import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java index 56e5f0d61f..6830ab1ee3 100644 --- a/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java index f5751e4e87..45d314ec8e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java index 6034743849..c7910e6d40 100644 --- a/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.MYSQL_8_0; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectIntoStep.java b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java index 28df797a2f..4a839e34b6 100644 --- a/jOOQ/src/main/java/org/jooq/SelectIntoStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java index 58620a7422..c3b99df546 100644 --- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java index 91e51afc74..c056aee80c 100644 --- a/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java index 2549800e87..22ddd74aaf 100644 --- a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java index 8586972982..28ea3d149f 100644 --- a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java index ec3ed62263..0e46db7d8e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectQuery.java +++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java index d373925eb8..6b4cf3d8b5 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java index a0cdbc1aee..08053d4afb 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java index 48faf80be9..89d329c78c 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java index b8c3665811..4815ba4fa3 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java index 7111f6e286..f04c865e74 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java index 79f0a0fae7..2b47a919bc 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java index d6f92102b9..2c10d635a2 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java index 263d2c7c2a..db5b535861 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java index c60301c313..496b64c4be 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java index 14a5445a44..f3f2514c27 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java index beacdfd3e0..3bf172228c 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java index 7930d1b75a..add25c55d6 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java index 982c9c2ed6..a06d33e403 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java index 4a45fdbc57..b2b4eab4e8 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java index b362b2cb11..2deb253f9f 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java index 7938e4a182..818c494b1e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java index 1680a1c9a3..c54d3667c4 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java index 63f1059eaa..e4352a9cd4 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java index 3ebcbb89ee..dc3ef7edab 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java index 4dae9b5f82..ccca5a6c10 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java index 72f081d991..b4edfb0460 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java index 10618fba36..3117919cab 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java index 25f4494d8e..6061ccb7eb 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java @@ -39,8 +39,6 @@ package org.jooq; import javax.annotation.Generated; -import org.jooq.Record; - /** * This type is used for the {@link Select}'s DSL API when selecting generic * {@link Record} types. diff --git a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java index 1910eea843..4307cf276f 100644 --- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java index 8cd4b48fff..82dd427e9c 100644 --- a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java index 2d1fdcb81f..69eaa1c905 100644 --- a/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java b/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java index 33c3fe2592..dd59df4e98 100644 --- a/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/Sequence.java b/jOOQ/src/main/java/org/jooq/Sequence.java index ce29aa0805..1c73f74084 100644 --- a/jOOQ/src/main/java/org/jooq/Sequence.java +++ b/jOOQ/src/main/java/org/jooq/Sequence.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index 430e9a5a48..1bf2c5728c 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -41,6 +41,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java b/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java index 7844240551..be8cb3d21f 100644 --- a/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java @@ -40,6 +40,7 @@ package org.jooq; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java b/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java index f9f53dc571..11f5d590b1 100644 --- a/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java +++ b/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java b/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java index 5ad56aefe2..bafa36ad9e 100644 --- a/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java +++ b/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/UpdateFromStep.java b/jOOQ/src/main/java/org/jooq/UpdateFromStep.java index b121cd82fa..d92514593b 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateFromStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateFromStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java index 69b0d96573..8879b6a530 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java +++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java @@ -38,6 +38,7 @@ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/UpdateResultStep.java b/jOOQ/src/main/java/org/jooq/UpdateResultStep.java index 99e91e9442..334692d584 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateResultStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateResultStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; // ... diff --git a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java index cdb4de33cd..bb28420b77 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; // ... diff --git a/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java b/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java index 2773ac818a..c1a3c76ca3 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.H2; // ... diff --git a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java index 4fda1933ad..2a524cc8d2 100644 --- a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/WindowOverStep.java b/jOOQ/src/main/java/org/jooq/WindowOverStep.java index acee92f629..2ec99c9711 100644 --- a/jOOQ/src/main/java/org/jooq/WindowOverStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowOverStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java index d630124911..146d981e79 100644 --- a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java index faab5d5276..9c8d637b52 100644 --- a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java index a70b945b45..e138a07ff9 100644 --- a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java index ad3269eaae..93f33d4f66 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java index a58c179ca6..7b265dc5c6 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD_3_0; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java index d3623c3e4f..77285c187a 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java index f3258edbf0..523dce94e7 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... // ... import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep.java b/jOOQ/src/main/java/org/jooq/WithAsStep.java index dff4098d9e..0b9888b8bd 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep1.java b/jOOQ/src/main/java/org/jooq/WithAsStep1.java index 4787e092cd..c9f89dc645 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep1.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep1.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep10.java b/jOOQ/src/main/java/org/jooq/WithAsStep10.java index babfc3bf2e..123d1100d3 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep10.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep10.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep11.java b/jOOQ/src/main/java/org/jooq/WithAsStep11.java index 824a604eab..9b7891bebe 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep11.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep11.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep12.java b/jOOQ/src/main/java/org/jooq/WithAsStep12.java index 62690a5dc7..4434dd7bea 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep12.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep12.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep13.java b/jOOQ/src/main/java/org/jooq/WithAsStep13.java index 8da5e1a8ab..0ad90f1754 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep13.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep13.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep14.java b/jOOQ/src/main/java/org/jooq/WithAsStep14.java index 6ebdc85ae5..4f508d07fb 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep14.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep14.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep15.java b/jOOQ/src/main/java/org/jooq/WithAsStep15.java index f21929bb25..2e4bae130f 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep15.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep15.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep16.java b/jOOQ/src/main/java/org/jooq/WithAsStep16.java index 86ddd204b4..27ab13b049 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep16.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep16.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep17.java b/jOOQ/src/main/java/org/jooq/WithAsStep17.java index 8a7912808e..c52718eeb7 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep17.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep17.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep18.java b/jOOQ/src/main/java/org/jooq/WithAsStep18.java index 8c528325e4..e060842763 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep18.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep18.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep19.java b/jOOQ/src/main/java/org/jooq/WithAsStep19.java index d22b1c01b2..1d3f1d3e46 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep19.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep19.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep2.java b/jOOQ/src/main/java/org/jooq/WithAsStep2.java index 1e95cc7c34..470c3e5788 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep2.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep2.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep20.java b/jOOQ/src/main/java/org/jooq/WithAsStep20.java index a8a68228a7..16117100b1 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep20.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep20.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep21.java b/jOOQ/src/main/java/org/jooq/WithAsStep21.java index 9fd9aae0db..f7f4256f28 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep21.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep21.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep22.java b/jOOQ/src/main/java/org/jooq/WithAsStep22.java index e8a8b9eda5..c02cbcd20b 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep22.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep22.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep3.java b/jOOQ/src/main/java/org/jooq/WithAsStep3.java index a819393fcf..ebb2387c76 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep3.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep3.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep4.java b/jOOQ/src/main/java/org/jooq/WithAsStep4.java index 7d999b7a03..731a78855d 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep4.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep4.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep5.java b/jOOQ/src/main/java/org/jooq/WithAsStep5.java index 3db2ef15bd..91a2098588 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep5.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep5.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep6.java b/jOOQ/src/main/java/org/jooq/WithAsStep6.java index febbbd1002..5b0fd82250 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep6.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep6.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep7.java b/jOOQ/src/main/java/org/jooq/WithAsStep7.java index 963a17af4e..56f17eea30 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep7.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep7.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep8.java b/jOOQ/src/main/java/org/jooq/WithAsStep8.java index f9dfca774f..fc5efe517d 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep8.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep8.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep9.java b/jOOQ/src/main/java/org/jooq/WithAsStep9.java index 9014f53e6a..103e563a36 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep9.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep9.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java index fdc42844bd..1d07a6fa6d 100644 --- a/jOOQ/src/main/java/org/jooq/WithStep.java +++ b/jOOQ/src/main/java/org/jooq/WithStep.java @@ -37,6 +37,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java index 88291a010f..ac1723d802 100644 --- a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java +++ b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.regex.Pattern; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java index 87db239c30..6d71a31b8f 100644 --- a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java +++ b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java @@ -10,6 +10,7 @@ package org.jooq.conf; import java.io.Serializable; import java.util.regex.Pattern; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java b/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java index bff8b17e11..d025340b4a 100644 --- a/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java +++ b/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java @@ -9,6 +9,7 @@ package org.jooq.conf; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java index 424ce83440..3992d36f64 100644 --- a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java +++ b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java @@ -12,6 +12,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/jOOQ/src/main/java/org/jooq/conf/Settings.java b/jOOQ/src/main/java/org/jooq/conf/Settings.java index 202c1a8c86..ba256bb1f7 100644 --- a/jOOQ/src/main/java/org/jooq/conf/Settings.java +++ b/jOOQ/src/main/java/org/jooq/conf/Settings.java @@ -9,6 +9,7 @@ package org.jooq.conf; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index 68483dd55d..f50c439e0a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -468,6 +468,9 @@ abstract class AbstractDMLQuery extends AbstractQuery { final void toSQLReturning(Context ctx) { if (!returning.isEmpty()) { switch (ctx.family()) { + + + case FIREBIRD: case POSTGRES: { boolean previous = ctx.declareFields(); @@ -529,6 +532,7 @@ abstract class AbstractDMLQuery extends AbstractQuery { + // Postgres uses the RETURNING clause in SQL case FIREBIRD: case POSTGRES: @@ -697,6 +701,7 @@ abstract class AbstractDMLQuery extends AbstractQuery { + // Firebird and Postgres can execute the INSERT .. RETURNING // clause like a select clause. JDBC support is not implemented // in the Postgres JDBC driver diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index e7f6fd12b4..ca79592dd3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -39,7 +39,9 @@ package org.jooq.impl; import static java.sql.ResultSet.CONCUR_UPDATABLE; import static java.sql.ResultSet.TYPE_SCROLL_SENSITIVE; +import static java.util.Arrays.asList; import static java.util.concurrent.Executors.newSingleThreadExecutor; +// ... import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.POSTGRES; // ... @@ -260,7 +262,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple // [#4511] [#4753] PostgreSQL doesn't like fetchSize with autoCommit == true int f = SettingsTools.getFetchSize(fetchSize, ctx.settings()); - if (ctx.family() == POSTGRES && f != 0 && ctx.connection().getAutoCommit()) + if (asList(POSTGRES).contains(ctx.family()) && f != 0 && ctx.connection().getAutoCommit()) log.info("Fetch Size", "A fetch size of " + f + " was set on a auto-commit PostgreSQL connection, which is not recommended. See http://jdbc.postgresql.org/documentation/head/query.html#query-with-cursor"); SQLException e = executeStatementAndGetFirstResultSet(ctx, rendered.skipUpdateCounts); diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index ed5fb3593a..83727a7d42 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -40,6 +40,7 @@ package org.jooq.impl; import static java.lang.Boolean.TRUE; import static org.jooq.Clause.FIELD; import static org.jooq.Clause.FIELD_FUNCTION; +// ... import static org.jooq.SQLDialect.FIREBIRD; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -334,7 +335,7 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin // [#4254] In PostgreSQL, there are only functions, no procedures. Some // functions cannot be called using a CallableStatement, e.g. those with // DEFAULT parameters - if (family == POSTGRES) { + if ( family == POSTGRES) { return executeSelectFromPOSTGRES(); } @@ -1613,6 +1614,7 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin Field[] fields = new Field[getInParameters().size()]; Iterator> it = getInParameters().iterator(); + SQLDialect family = ctx.family(); for (int i = 0; it.hasNext(); i++) { Parameter parameter = it.next(); // [#1183] [#3533] Skip defaulted parameters @@ -1620,7 +1622,7 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin continue; // Disambiguate overloaded function signatures - if (ctx.family() == POSTGRES) + if ( family == POSTGRES) // [#4920] In case there are any unnamed parameters, we mustn't if (hasUnnamedParameters()) diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java index d1080c50a9..263f8becd1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Alias.java +++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java @@ -47,6 +47,7 @@ import static org.jooq.Clause.TABLE_ALIAS; import static org.jooq.Clause.TABLE_REFERENCE; // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; @@ -226,6 +227,9 @@ final class Alias extends AbstractQueryPart { // TODO: Is this still needed? switch (family) { + + + case HSQLDB: case POSTGRES: { // The javac compiler doesn't like casting of generics diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java index 47ac942aab..fa62b6686f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java @@ -55,6 +55,7 @@ import static org.jooq.Nullability.NULL; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; @@ -751,6 +752,7 @@ final class AlterTableImpl extends AbstractQuery implements + case POSTGRES: alterColumnTypeAndNullabilityInBlock(ctx); return; @@ -760,6 +762,10 @@ final class AlterTableImpl extends AbstractQuery implements // [#5319] Compound statements to drop multiple columns in a single statement. if (dropColumns != null && dropColumns.size() > 1) { switch (family) { + + + + case POSTGRES: dropColumnsInBlock(ctx); return; @@ -1227,6 +1233,8 @@ final class AlterTableImpl extends AbstractQuery implements + + case H2: case MARIADB: case POSTGRES: @@ -1370,6 +1378,8 @@ final class AlterTableImpl extends AbstractQuery implements + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Array.java b/jOOQ/src/main/java/org/jooq/impl/Array.java index 9b5e35bae7..49a68ab18e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Array.java +++ b/jOOQ/src/main/java/org/jooq/impl/Array.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +// ... import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.impl.Keywords.K_ARRAY; import static org.jooq.impl.Keywords.K_INT; @@ -81,6 +82,10 @@ final class Array extends AbstractField { ctx.sql('(').visit(fields).sql(')'); break; + + + + case HSQLDB: case POSTGRES: default: @@ -89,7 +94,7 @@ final class Array extends AbstractField { .visit(fields) .sql(']'); - if (fields.fields.length == 0 && ctx.family() == POSTGRES) + if (fields.fields.length == 0 && ( ctx.family() == POSTGRES)) ctx.sql("::").visit(K_INT).sql("[]"); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java b/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java index a6ec95a8de..9ae2984598 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java @@ -76,6 +76,10 @@ final class ArrayDataType extends DefaultDataType { switch (configuration.family()) { case HSQLDB: return dataType + " array"; + + + + case POSTGRES: return dataType + "[]"; case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java index f9ed1a2ee1..df7406a59c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java @@ -184,6 +184,9 @@ final class ArrayTable extends AbstractTable { // [#756] These dialects need special care when aliasing unnested // arrays + + + case HSQLDB: case POSTGRES: return new PostgresHSQLDBTable().as(alias, fieldAliases); diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java index 9b381d75ff..5caed715e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +// ... // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.MARIADB; @@ -119,6 +120,9 @@ final class BlockImpl extends AbstractQuery implements Block { // decrement(ctx.data(), DATA_BLOCK_NESTING); // break; // } + + + case POSTGRES: { if (increment(ctx.data(), DATA_BLOCK_NESTING)) { ctx.paramType(INLINED) diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java index 58cb2094d0..db5fc9f59b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java +++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java @@ -67,6 +67,10 @@ final class BoolAnd extends Function { @Override public final void accept(Context ctx) { switch (ctx.family()) { + + + + case POSTGRES: super.accept(ctx); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java index dc40c25b9f..8655e36136 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java +++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java @@ -67,6 +67,10 @@ final class BoolOr extends Function { @Override public final void accept(Context ctx) { switch (ctx.family()) { + + + + case POSTGRES: super.accept(ctx); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index 0c92dcb6b9..40f0fe9129 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +// ... import static org.jooq.SQLDialect.POSTGRES; // ... import static org.jooq.impl.DSL.comment; diff --git a/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java b/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java index d4bbea7508..3583a5ee50 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java @@ -46,6 +46,7 @@ import static org.jooq.Comparator.NOT_LIKE; import static org.jooq.Comparator.NOT_LIKE_IGNORE_CASE; // ... // ... +// ... import static org.jooq.SQLDialect.DERBY; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -114,6 +115,9 @@ final class CompareCondition extends AbstractCondition implements LikeEscapeStep // [#1423] Only Postgres knows a true ILIKE operator. Other dialects // need to emulate this as LOWER(lhs) LIKE LOWER(rhs) else if ((op == LIKE_IGNORE_CASE || op == NOT_LIKE_IGNORE_CASE) + + + && POSTGRES != family) { lhs = lhs.lower(); diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java index 98695fda9a..d27fd0c488 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java @@ -98,6 +98,7 @@ final class ConditionAsField extends AbstractFunction { + // The default, for new dialects default: return DSL.sql("({0})", condition); diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstantSortField.java b/jOOQ/src/main/java/org/jooq/impl/ConstantSortField.java index dbfcd8d1c3..67bda8dda7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConstantSortField.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConstantSortField.java @@ -69,6 +69,8 @@ final class ConstantSortField extends CustomField { + + case POSTGRES: case HSQLDB: ctx.sql('(').visit(select(one())).sql(')'); diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java index 36a2489d28..7049f81b8f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java @@ -78,6 +78,7 @@ final class Cosh extends AbstractFunction { + case CUBRID: case HSQLDB: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/CountTable.java b/jOOQ/src/main/java/org/jooq/impl/CountTable.java index 82a814c14a..a84a99982e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CountTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/CountTable.java @@ -64,6 +64,10 @@ final class CountTable extends Function { @Override public final void accept(Context ctx) { switch (ctx.family()) { + + + + case POSTGRES: { super.accept(ctx); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index 8154788597..a8d5e24b48 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -42,6 +42,7 @@ import static org.jooq.Clause.CREATE_INDEX; // ... // ... // ... +// ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java index 272e6920c7..ec7d45cede 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java @@ -47,6 +47,7 @@ import static org.jooq.Clause.CREATE_TABLE_NAME; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index 09f5048eb0..49e851ae5f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -43,6 +43,7 @@ import static org.jooq.Clause.CREATE_VIEW_NAME; // ... // ... // ... +// ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java index 7236579085..fc1f941332 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java @@ -83,6 +83,7 @@ final class CurrentDate extends AbstractFunction { + case DERBY: diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java index 0377afbf0e..754386c8c5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java @@ -97,6 +97,9 @@ final class CurrentSchema extends AbstractFunction { case MYSQL: return DSL.field("{database}()", VARCHAR); + + + case HSQLDB: case POSTGRES: return DSL.field("{current_schema}", VARCHAR); diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java index 4d9d2e2924..3bb5bd863c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java @@ -74,6 +74,7 @@ final class CurrentTime extends AbstractFunction { + case DERBY: case FIREBIRD: case HSQLDB: diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java index 01b138cc84..e837252dba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java @@ -83,6 +83,7 @@ final class CurrentTimestamp extends AbstractFunction { + case DERBY: diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java index 117c04a525..3ad7a6ef0f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java @@ -77,6 +77,7 @@ final class CurrentUser extends AbstractFunction { + case DERBY: case FIREBIRD: case HSQLDB: diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 917f7c9b35..46d8c0c31e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -43,6 +43,7 @@ import static org.jooq.Operator.OR; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java index c34bcb5e9c..05ff1e1d70 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java @@ -145,6 +145,7 @@ final class DateAdd extends AbstractFunction { + case POSTGRES: { switch (datePart) { case YEAR: keyword = " year"; break; diff --git a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java index c572145937..350f31e498 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java @@ -91,6 +91,7 @@ final class DateDiff extends AbstractFunction { + case CUBRID: case POSTGRES: diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index 2c17f6e689..ff7d6d1c02 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -42,6 +42,7 @@ import static java.lang.Boolean.TRUE; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; @@ -561,6 +562,7 @@ public class DefaultBinding implements Binding { + case POSTGRES: { return true; } @@ -576,6 +578,7 @@ public class DefaultBinding implements Binding { + case POSTGRES: return true; } @@ -631,7 +634,7 @@ public class DefaultBinding implements Binding { // [#4338] ... specifically when using JSR-310 types // [#1130] TODO type can be null for ARRAY types, etc. // [#7351] UUID data types need to be cast too - else if (POSTGRES == family && (sqlDataType == null || (!sqlDataType.isTemporal() && sqlDataType != SQLDataType.UUID))) + else if (( POSTGRES == family) && (sqlDataType == null || (!sqlDataType.isTemporal() && sqlDataType != SQLDataType.UUID))) sql(ctx, converted); // [#1727] VARCHAR types should be cast to their actual lengths in some @@ -646,7 +649,7 @@ public class DefaultBinding implements Binding { // [#7379] Most databases cannot cast a bind variable to an enum type - else if (POSTGRES != family && EnumType.class.isAssignableFrom(type)) + else if ( POSTGRES != family && EnumType.class.isAssignableFrom(type)) sqlCast(ctx, converted, Tools.emulateEnumType((DataType) dataType), dataType.length(), dataType.precision(), dataType.scale()); // In all other cases, the bind variable can be cast normally @@ -933,11 +936,11 @@ public class DefaultBinding implements Binding { ctx.render().sql(')'); } - else if (ctx.family() == POSTGRES) { + else if ( ctx.family() == POSTGRES) { ctx.render().visit(cast(inline(PostgresUtils.toPGArrayString(value)), type)); } - // By default, render HSQLDB / POSTGRES syntax + // By default, render HSQLDB syntax else { ctx.render().visit(K_ARRAY); ctx.render().sql('['); @@ -951,7 +954,7 @@ public class DefaultBinding implements Binding { ctx.render().sql(']'); // [#3214] Some PostgreSQL array type literals need explicit casting - if (ctx.family() == POSTGRES && EnumType.class.isAssignableFrom(type.getComponentType())) + if (( ctx.family() == POSTGRES) && EnumType.class.isAssignableFrom(type.getComponentType())) DefaultEnumTypeBinding.pgRenderEnumCast(ctx.render(), type); } } @@ -961,16 +964,20 @@ public class DefaultBinding implements Binding { super.sqlBind0(ctx, value); // In Postgres, some additional casting must be done in some cases... - if (ctx.family() == SQLDialect.POSTGRES) { + switch (ctx.family()) { - // Postgres needs explicit casting for enum (array) types - if (EnumType.class.isAssignableFrom(type.getComponentType())) - DefaultEnumTypeBinding.pgRenderEnumCast(ctx.render(), type); - // ... and also for other array types - else - ctx.render().sql("::") - .sql(DefaultDataType.getDataType(ctx.family(), type).getCastTypeName(ctx.render().configuration())); + + case POSTGRES: + + // Postgres needs explicit casting for enum (array) types + if (EnumType.class.isAssignableFrom(type.getComponentType())) + DefaultEnumTypeBinding.pgRenderEnumCast(ctx.render(), type); + + // ... and also for other array types + else + ctx.render().sql("::") + .sql(DefaultDataType.getDataType(ctx.family(), type).getCastTypeName(ctx.render().configuration())); } } @@ -978,6 +985,9 @@ public class DefaultBinding implements Binding { @Override final void set0(BindingSetStatementContext ctx, Object[] value) throws SQLException { switch (ctx.family()) { + + + case POSTGRES: { ctx.statement().setString(ctx.index(), toPGArrayString(value)); break; @@ -1014,6 +1024,9 @@ public class DefaultBinding implements Binding { @Override final Object[] get0(BindingGetResultSetContext ctx) throws SQLException { switch (ctx.family()) { + + + case POSTGRES: return pgGetArray(ctx, ctx.resultSet(), type, ctx.index()); @@ -1473,6 +1486,7 @@ public class DefaultBinding implements Binding { + return Types.BINARY; default: @@ -1674,7 +1688,7 @@ public class DefaultBinding implements Binding { - else if (ctx.family() == POSTGRES) + else if ( ctx.family() == POSTGRES) ctx.render() .sql("E'") .sql(PostgresUtils.toPGString(value)) @@ -1767,6 +1781,7 @@ public class DefaultBinding implements Binding { + return Types.BINARY; default: @@ -2001,7 +2016,7 @@ public class DefaultBinding implements Binding { final void set0(BindingSetStatementContext ctx, DayToSecond value) throws SQLException { // [#566] Interval data types are best bound as Strings - if (ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) ctx.statement().setObject(ctx.index(), toPGInterval(value)); else ctx.statement().setString(ctx.index(), value.toString()); @@ -2014,7 +2029,7 @@ public class DefaultBinding implements Binding { @Override final DayToSecond get0(BindingGetResultSetContext ctx) throws SQLException { - if (ctx.family() == POSTGRES) { + if ( ctx.family() == POSTGRES) { Object object = ctx.resultSet().getObject(ctx.index()); return object == null ? null : PostgresUtils.toDayToSecond(object); } @@ -2026,7 +2041,7 @@ public class DefaultBinding implements Binding { @Override final DayToSecond get0(BindingGetStatementContext ctx) throws SQLException { - if (ctx.family() == POSTGRES) { + if ( ctx.family() == POSTGRES) { Object object = ctx.statement().getObject(ctx.index()); return object == null ? null : PostgresUtils.toDayToSecond(object); } @@ -2064,7 +2079,7 @@ public class DefaultBinding implements Binding { // [#5249] [#6912] Special inlining of special floating point values if (value.isNaN()) - if (ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) ctx.render().visit(inline("NaN")).sql("::float8"); else ctx.render().visit(K_CAST).sql('(').visit(inline("NaN")).sql(' ').visit(K_AS).sql(' ').visit(keyword(DOUBLE.getCastTypeName(ctx.configuration()))).sql(')'); @@ -2129,7 +2144,7 @@ public class DefaultBinding implements Binding { super.sqlBind0(ctx, value); // Postgres needs explicit casting for enum (array) types - if (ctx.family() == SQLDialect.POSTGRES) + if ( ctx.family() == POSTGRES) pgRenderEnumCast(ctx.render(), type); } @@ -2225,7 +2240,7 @@ public class DefaultBinding implements Binding { // [#5249] [#6912] Special inlining of special floating point values if (value.isNaN()) - if (ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) ctx.render().visit(inline("NaN")).sql("::float4"); else ctx.render().visit(K_CAST).sql('(').visit(inline("NaN")).sql(' ').visit(K_AS).sql(' ').visit(keyword(DOUBLE.getCastTypeName(ctx.configuration()))).sql(')'); @@ -2754,13 +2769,13 @@ public class DefaultBinding implements Binding { void sqlBind0(BindingSQLContext ctx, Record value) throws SQLException { super.sqlBind0(ctx, value); - if (ctx.family() == POSTGRES && value != null) + if (( ctx.family() == POSTGRES) && value != null) pgRenderRecordCast(ctx.render(), value); } @Override final void sqlInline0(BindingSQLContext ctx, Record value) throws SQLException { - if (ctx.family() == POSTGRES) { + if ( ctx.family() == POSTGRES) { ctx.render().visit(inline(PostgresUtils.toPGString(value))); pgRenderRecordCast(ctx.render(), value); } @@ -2783,7 +2798,7 @@ public class DefaultBinding implements Binding { @Override final void set0(BindingSetStatementContext ctx, Record value) throws SQLException { - if (ctx.family() == POSTGRES && value != null) + if (( ctx.family() == POSTGRES) && value != null) ctx.statement().setString(ctx.index(), PostgresUtils.toPGString(value)); else ctx.statement().setObject(ctx.index(), value); @@ -2814,6 +2829,9 @@ public class DefaultBinding implements Binding { @Override final Record get0(BindingGetResultSetContext ctx) throws SQLException { switch (ctx.family()) { + + + case POSTGRES: return pgNewRecord(type, null, ctx.resultSet().getObject(ctx.index())); @@ -2825,6 +2843,9 @@ public class DefaultBinding implements Binding { @Override final Record get0(BindingGetStatementContext ctx) throws SQLException { switch (ctx.family()) { + + + case POSTGRES: return pgNewRecord(type, null, ctx.statement().getObject(ctx.index())); diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 8ed3458308..da5957b7bc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -3744,6 +3744,10 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return select(field).fetchOne(field); } + + + + case POSTGRES: { Field field = field("lastval()", BigInteger.class); return select(field).fetchOne(field); diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index e96f8363bf..b294fc1def 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -39,6 +39,9 @@ package org.jooq.impl; import static java.util.Collections.unmodifiableCollection; import static org.jooq.Nullability.NOT_NULL; +// ... +import static org.jooq.SQLDialect.HSQLDB; +import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.impl.DefaultBinding.binding; import static org.jooq.impl.SQLDataType.BLOB; import static org.jooq.impl.SQLDataType.CLOB; @@ -646,6 +649,10 @@ public class DefaultDataType implements DataType { case H2: return -10; // OracleTypes.CURSOR; + + + + case POSTGRES: default: return Types.OTHER; @@ -798,11 +805,11 @@ public class DefaultDataType implements DataType { result = TYPES_BY_NAME[SQLDialect.DEFAULT.ordinal()].get(normalised); // [#4065] PostgreSQL reports array types as _typename, e.g. _varchar - if (result == null && family == SQLDialect.POSTGRES && normalised.charAt(0) == '_') + if (result == null && ( family == POSTGRES) && normalised.charAt(0) == '_') result = getDataType(dialect, normalised.substring(1)).getArrayDataType(); // [#6466] HSQLDB reports array types as XYZARRAY - if (result == null && family == SQLDialect.HSQLDB && upper.endsWith(" ARRAY")) + if (result == null && family == HSQLDB && upper.endsWith(" ARRAY")) result = getDataType(dialect, typeName.substring(0, typeName.length() - 6)).getArrayDataType(); // [#366] Don't log a warning here. The warning is logged when diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java index e0d3205aee..95ba7bbd2b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java @@ -544,6 +544,7 @@ class DefaultRenderContext extends AbstractContext implements Ren + // [#5701] Tests were conducted with PostgreSQL 9.5 and pgjdbc 9.4.1209 diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java index 58db13a4b9..9c57279b4a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java @@ -44,7 +44,7 @@ import static org.jooq.Clause.DELETE_RETURNING; import static org.jooq.Clause.DELETE_WHERE; // ... import static org.jooq.SQLDialect.MARIADB; -import static org.jooq.SQLDialect.*; +import static org.jooq.SQLDialect.MYSQL; import static org.jooq.conf.SettingsTools.getExecuteDeleteWithoutWhere; import static org.jooq.impl.Keywords.K_DELETE; import static org.jooq.impl.Keywords.K_FROM; diff --git a/jOOQ/src/main/java/org/jooq/impl/Dual.java b/jOOQ/src/main/java/org/jooq/impl/Dual.java index 60de90c5c9..bff440a99c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Dual.java +++ b/jOOQ/src/main/java/org/jooq/impl/Dual.java @@ -126,6 +126,7 @@ final class Dual extends AbstractTable { + case H2: case POSTGRES: case SQLITE: diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java index d92ec0500e..dfa09fc7ea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Euler.java +++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java @@ -79,6 +79,7 @@ final class Euler extends AbstractFunction { + case CUBRID: case DERBY: case FIREBIRD: diff --git a/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java b/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java index a81b88487e..4f8f384767 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java @@ -98,6 +98,7 @@ final class ExplainQuery { + case MARIADB: case MYSQL: case POSTGRES: @@ -143,6 +144,9 @@ final class ExplainQuery { rows = result.get(0).get("rows", double.class); break; } + + + case POSTGRES: { Matcher matcher = Pattern .compile(".*\\bcost=\\d+\\.\\d+\\.\\.(\\d+\\.\\d+)\\s+rows=(\\d+).*") diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java index 5811e1befe..6c862eb24a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Expression.java +++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java @@ -40,6 +40,7 @@ package org.jooq.impl; import static org.jooq.DatePart.MONTH; import static org.jooq.DatePart.SECOND; // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.FIREBIRD; @@ -486,6 +487,7 @@ final class Expression extends AbstractFunction { + case POSTGRES: @@ -591,6 +593,7 @@ final class Expression extends AbstractFunction { + case POSTGRES: { // This seems to be the most reliable way to avoid issues diff --git a/jOOQ/src/main/java/org/jooq/impl/Extract.java b/jOOQ/src/main/java/org/jooq/impl/Extract.java index eef9863782..13063e4408 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Extract.java +++ b/jOOQ/src/main/java/org/jooq/impl/Extract.java @@ -184,6 +184,7 @@ final class Extract extends AbstractFunction { + case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java index 5900af84a9..a29c7929ef 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java @@ -97,6 +97,7 @@ final class FieldCondition extends AbstractCondition { + // Native support case DERBY: case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java index 02e1e4cd4c..4ad6ad3f19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +// ... import static org.jooq.SQLDialect.POSTGRES; // ... import static org.jooq.SQLDialect.SQLITE; diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index f3f9fa436c..6ac0f58cc1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -41,12 +41,13 @@ package org.jooq.impl; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; -import static org.jooq.SQLDialect.*; +import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.POSTGRES_9_4; import static org.jooq.SQLDialect.SQLITE; @@ -221,7 +222,7 @@ class Function extends AbstractField implements - else if (term == MEDIAN && ctx.family() == POSTGRES) { + else if (term == MEDIAN && ( ctx.family() == POSTGRES)) { Field[] fields = new Field[arguments.size()]; for (int i = 0; i < fields.length; i++) fields[i] = DSL.field("{0}", arguments.get(i)); @@ -330,7 +331,12 @@ class Function extends AbstractField implements } final void toSQLFilterClause(Context ctx) { - if (filter != null && (HSQLDB == ctx.family() || POSTGRES_9_4.precedes(ctx.dialect()))) { + if (filter != null && ( + HSQLDB == ctx.family() || + + + + POSTGRES_9_4.precedes(ctx.dialect()))) { ctx.sql(' ') .visit(K_FILTER) .sql(" (") @@ -366,7 +372,7 @@ class Function extends AbstractField implements // [#3727] Referenced WindowDefinitions that contain a frame clause // shouldn't be referenced from within parentheses (in PostgreSQL) if (windowDefinition != null) - if (POSTGRES == ctx.family()) + if ( POSTGRES == ctx.family()) return windowDefinition; else return DSL.sql("({0})", windowDefinition); @@ -444,14 +450,19 @@ class Function extends AbstractField implements ctx.visit(K_DISTINCT); // [#2883] PostgreSQL can use the DISTINCT keyword with formal row value expressions. - if (ctx.family() == POSTGRES && args.size() > 1) + if (( ctx.family() == POSTGRES) && args.size() > 1) ctx.sql('('); else ctx.sql(' '); } if (!args.isEmpty()) { - if (filter == null || HSQLDB == ctx.family() || POSTGRES_9_4.precedes(ctx.dialect())) { + if (filter == null || + HSQLDB == ctx.family() || + + + + POSTGRES_9_4.precedes(ctx.dialect())) { ctx.visit(args); } else { @@ -465,7 +476,7 @@ class Function extends AbstractField implements } if (distinct) - if (ctx.family() == POSTGRES && args.size() > 1) + if (( ctx.family() == POSTGRES) && args.size() > 1) ctx.sql(')'); diff --git a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java index dcf35ccb34..7532eaa42f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java @@ -90,6 +90,9 @@ final class FunctionTable extends AbstractTable { // [#4254] This is required to enable using PostgreSQL functions // with defaulted parameters. + + + case POSTGRES: { ctx.visit(function); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java index 2633923ed0..e65becbbf0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java +++ b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java @@ -110,6 +110,9 @@ final class GenerateSeries extends AbstractTable> { step, to.add(step).sub(from)); + + + case POSTGRES: default: if (step == null) diff --git a/jOOQ/src/main/java/org/jooq/impl/Identifiers.java b/jOOQ/src/main/java/org/jooq/impl/Identifiers.java index 4774bed0e6..48b4045e3d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Identifiers.java +++ b/jOOQ/src/main/java/org/jooq/impl/Identifiers.java @@ -107,6 +107,7 @@ final class Identifiers { + case CUBRID: case DERBY: case FIREBIRD: diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java index d1c63313aa..a39eb98527 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java @@ -312,6 +312,9 @@ final class InsertQueryImpl extends AbstractStoreQuery impl break; } + + + case POSTGRES: { toSQLInsert(ctx); ctx.formatSeparator() @@ -410,6 +413,9 @@ final class InsertQueryImpl extends AbstractStoreQuery impl break; } + + + case POSTGRES_9_5: case POSTGRES_10: case POSTGRES: { diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java index 509396d1c6..ec7ad5e19a 100755 --- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java @@ -69,6 +69,7 @@ import static org.jooq.JoinType.OUTER_APPLY; import static org.jooq.JoinType.RIGHT_OUTER_JOIN; // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java index 1a2edd4984..62b5aef9d2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Left.java +++ b/jOOQ/src/main/java/org/jooq/impl/Left.java @@ -81,6 +81,7 @@ final class Left extends AbstractFunction { + case CUBRID: case FIREBIRD: case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java index b8678d4023..179eaeb816 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Limit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java @@ -312,6 +312,9 @@ final class Limit extends AbstractQueryPart { } // [#4785] OFFSET can be without LIMIT + + + case HSQLDB: case POSTGRES: case POSTGRES_9_3: diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index 004ba9de84..3e8ac4a7aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -1315,6 +1315,9 @@ implements toSQLMySQLOnDuplicateKeyUpdate(ctx); break; + + + case POSTGRES: toPostgresInsertOnConflict(ctx); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index 391874aa60..776fd008ae 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -78,7 +78,7 @@ package org.jooq.impl; // ... import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.MARIADB; -import static org.jooq.SQLDialect.*; +import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.SQLITE; import static org.jooq.impl.DSL.condition; import static org.jooq.impl.DSL.name; @@ -332,6 +332,9 @@ final class MetaImpl extends AbstractMeta { switch (configuration.family()) { // [#3977] PostgreSQL returns other object types, too + + + case POSTGRES: types = new String[] { "TABLE", "VIEW", "SYSTEM_TABLE", "SYSTEM_VIEW", "MATERIALIZED VIEW" }; break; diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java index 78389e7a83..2fb2eac57c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotField.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java @@ -84,6 +84,7 @@ final class NotField extends AbstractField { + // Native support case DERBY: case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java index 65d0be5ce1..9ff8adc8c0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java @@ -76,6 +76,9 @@ final class Nvl extends AbstractFunction { case HSQLDB: return DSL.field("{nvl}({0}, {1})", getDataType(), arg1, arg2); + + + case DERBY: case POSTGRES: return DSL.field("{coalesce}({0}, {1})", getDataType(), arg1, arg2); diff --git a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java index 4bf0e2b8a1..821c3de252 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java @@ -115,6 +115,9 @@ final class QuantifiedSelectImpl extends AbstractQueryPart imp switch (ctx.family()) { // [#869] Postgres supports this syntax natively + + + case POSTGRES: { return (QueryPartInternal) array; } diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java index a7b8610c0d..cfa034b13f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rand.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java @@ -77,6 +77,7 @@ final class Rand extends AbstractFunction { + case DERBY: case POSTGRES: case SQLITE: diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java index 2b66472d80..6140191254 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java @@ -44,14 +44,6 @@ import javax.annotation.Generated; import org.jooq.Field; import org.jooq.Record; import org.jooq.Record1; -import org.jooq.Record2; -import org.jooq.Record3; -import org.jooq.Record4; -import org.jooq.Record5; -import org.jooq.Record6; -import org.jooq.Record7; -import org.jooq.Record8; -import org.jooq.Record9; import org.jooq.Record10; import org.jooq.Record11; import org.jooq.Record12; @@ -62,9 +54,17 @@ import org.jooq.Record16; import org.jooq.Record17; import org.jooq.Record18; import org.jooq.Record19; +import org.jooq.Record2; import org.jooq.Record20; import org.jooq.Record21; import org.jooq.Record22; +import org.jooq.Record3; +import org.jooq.Record4; +import org.jooq.Record5; +import org.jooq.Record6; +import org.jooq.Record7; +import org.jooq.Record8; +import org.jooq.Record9; /** * A general purpose record, typically used for ad-hoc types. diff --git a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java index 60da0771e2..c40583f3cd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java @@ -100,6 +100,7 @@ final class RegexpLike extends AbstractCondition { + case POSTGRES: { // [#1570] TODO: Replace this by SQL.condition(String, QueryPart...) diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java index f78d4bbec3..18f2c7d690 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Replace.java +++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java @@ -86,6 +86,7 @@ final class Replace extends AbstractFunction { + case FIREBIRD: diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java index 9fd6037385..9ba04d118b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java +++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java @@ -72,6 +72,7 @@ final class Reverse extends AbstractFunction { + case CUBRID: case HSQLDB: case POSTGRES: diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java index fa7a2ed6e9..8fe22ab2a6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Right.java +++ b/jOOQ/src/main/java/org/jooq/impl/Right.java @@ -83,6 +83,7 @@ final class Right extends AbstractFunction { + case CUBRID: case FIREBIRD: case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java index 7807befa44..39fb44ce44 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Round.java +++ b/jOOQ/src/main/java/org/jooq/impl/Round.java @@ -104,6 +104,7 @@ final class Round extends AbstractFunction { + // There's no function round(double precision, integer) in Postgres case POSTGRES: { if (decimals == 0) diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java index 50b3e94581..8f777505cd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java @@ -47,16 +47,7 @@ import java.util.stream.Stream; import javax.annotation.Generated; -import org.jooq.BetweenAndStepN; import org.jooq.BetweenAndStep1; -import org.jooq.BetweenAndStep2; -import org.jooq.BetweenAndStep3; -import org.jooq.BetweenAndStep4; -import org.jooq.BetweenAndStep5; -import org.jooq.BetweenAndStep6; -import org.jooq.BetweenAndStep7; -import org.jooq.BetweenAndStep8; -import org.jooq.BetweenAndStep9; import org.jooq.BetweenAndStep10; import org.jooq.BetweenAndStep11; import org.jooq.BetweenAndStep12; @@ -67,9 +58,18 @@ import org.jooq.BetweenAndStep16; import org.jooq.BetweenAndStep17; import org.jooq.BetweenAndStep18; import org.jooq.BetweenAndStep19; +import org.jooq.BetweenAndStep2; import org.jooq.BetweenAndStep20; import org.jooq.BetweenAndStep21; import org.jooq.BetweenAndStep22; +import org.jooq.BetweenAndStep3; +import org.jooq.BetweenAndStep4; +import org.jooq.BetweenAndStep5; +import org.jooq.BetweenAndStep6; +import org.jooq.BetweenAndStep7; +import org.jooq.BetweenAndStep8; +import org.jooq.BetweenAndStep9; +import org.jooq.BetweenAndStepN; import org.jooq.Clause; import org.jooq.Comparator; import org.jooq.Condition; @@ -80,14 +80,6 @@ import org.jooq.Name; import org.jooq.QuantifiedSelect; import org.jooq.Record; import org.jooq.Record1; -import org.jooq.Record2; -import org.jooq.Record3; -import org.jooq.Record4; -import org.jooq.Record5; -import org.jooq.Record6; -import org.jooq.Record7; -import org.jooq.Record8; -import org.jooq.Record9; import org.jooq.Record10; import org.jooq.Record11; import org.jooq.Record12; @@ -98,20 +90,20 @@ import org.jooq.Record16; import org.jooq.Record17; import org.jooq.Record18; import org.jooq.Record19; +import org.jooq.Record2; import org.jooq.Record20; import org.jooq.Record21; import org.jooq.Record22; +import org.jooq.Record3; +import org.jooq.Record4; +import org.jooq.Record5; +import org.jooq.Record6; +import org.jooq.Record7; +import org.jooq.Record8; +import org.jooq.Record9; +import org.jooq.Result; import org.jooq.Row; -import org.jooq.RowN; import org.jooq.Row1; -import org.jooq.Row2; -import org.jooq.Row3; -import org.jooq.Row4; -import org.jooq.Row5; -import org.jooq.Row6; -import org.jooq.Row7; -import org.jooq.Row8; -import org.jooq.Row9; import org.jooq.Row10; import org.jooq.Row11; import org.jooq.Row12; @@ -122,10 +114,18 @@ import org.jooq.Row16; import org.jooq.Row17; import org.jooq.Row18; import org.jooq.Row19; +import org.jooq.Row2; import org.jooq.Row20; import org.jooq.Row21; import org.jooq.Row22; -import org.jooq.Result; +import org.jooq.Row3; +import org.jooq.Row4; +import org.jooq.Row5; +import org.jooq.Row6; +import org.jooq.Row7; +import org.jooq.Row8; +import org.jooq.Row9; +import org.jooq.RowN; import org.jooq.Select; /** diff --git a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java index df48a85091..86d1d618c3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java @@ -44,6 +44,7 @@ import static org.jooq.Comparator.IN; import static org.jooq.Comparator.NOT_EQUALS; import static org.jooq.Comparator.NOT_IN; // ... +// ... import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java index b3aaad479c..bbefa554b8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java @@ -65,6 +65,7 @@ import org.jooq.types.YearToMonth; // ... // ... // ... +// ... import org.jooq.util.cubrid.CUBRIDDataType; // ... import org.jooq.util.derby.DerbyDataType; @@ -602,6 +603,7 @@ public final class SQLDataType { + Class.forName(CUBRIDDataType.class.getName()); Class.forName(DerbyDataType.class.getName()); Class.forName(FirebirdDataType.class.getName()); diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 4cef85b846..5c0154744e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -60,6 +60,7 @@ import static org.jooq.Operator.OR; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; // ... // ... @@ -620,6 +621,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp + case CUBRID: diff --git a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java index 32dd4fc5fd..a41baa72d8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java @@ -145,6 +145,7 @@ public class SequenceImpl extends AbstractNamed implements Seq + case POSTGRES: { String field = method + "('" + getQualifiedName(configuration) + "')"; return DSL.field(field, getDataType()); diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java index 49d97080fc..8841df484d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java @@ -80,6 +80,9 @@ final class SetSchema extends AbstractQuery { ctx.visit(K_USE).sql(' ').visit(schema); break; + + + case POSTGRES: ctx.visit(K_SET).sql(' ').visit(K_SEARCH_PATH).sql(" = ").visit(schema); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java index 7f4a1a47b7..3c045e3e7c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java @@ -37,7 +37,6 @@ */ package org.jooq.impl; -// ... import static org.jooq.impl.DSL.function; import static org.jooq.impl.DSL.one; import static org.jooq.impl.DSL.two; @@ -79,6 +78,7 @@ final class Sinh extends AbstractFunction { + case CUBRID: case HSQLDB: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java index 326b74b39a..717df253aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Space.java +++ b/jOOQ/src/main/java/org/jooq/impl/Space.java @@ -37,8 +37,6 @@ */ package org.jooq.impl; -// ... - import org.jooq.Configuration; import org.jooq.Field; import org.jooq.QueryPart; @@ -70,6 +68,7 @@ final class Space extends AbstractFunction { + case DERBY: case FIREBIRD: case HSQLDB: diff --git a/jOOQ/src/main/java/org/jooq/impl/TableComparison.java b/jOOQ/src/main/java/org/jooq/impl/TableComparison.java index d98aafd8e3..0203e396af 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableComparison.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableComparison.java @@ -67,6 +67,9 @@ final class TableComparison extends AbstractCondition { @Override public final void accept(Context ctx) { switch (ctx.family()) { + + + case POSTGRES: { ctx.visit(DSL.condition("{0} {1} {2}", lhs, sql(comparator.toSQL()), rhs)); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 547528ffb1..c0dd9f68c8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -41,6 +41,7 @@ package org.jooq.impl; import static org.jooq.Clause.TABLE; import static org.jooq.Clause.TABLE_ALIAS; import static org.jooq.Clause.TABLE_REFERENCE; +// ... import static org.jooq.SQLDialect.FIREBIRD; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java index 94c5e433c2..7b4c1f9ddb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java @@ -37,7 +37,6 @@ */ package org.jooq.impl; -// ... import static org.jooq.impl.DSL.function; import static org.jooq.impl.DSL.one; import static org.jooq.impl.DSL.two; @@ -79,6 +78,7 @@ final class Tanh extends AbstractFunction { + case CUBRID: case HSQLDB: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/Term.java b/jOOQ/src/main/java/org/jooq/impl/Term.java index b288f3e47e..b1dfc163d6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Term.java +++ b/jOOQ/src/main/java/org/jooq/impl/Term.java @@ -158,6 +158,9 @@ enum Term { case SQLITE: return "group_concat"; + + + case POSTGRES: return "string_agg"; } diff --git a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java index c6aef75623..80be994394 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java +++ b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java @@ -37,7 +37,6 @@ */ package org.jooq.impl; -// ... import static org.jooq.impl.DSL.function; import static org.jooq.impl.SQLDataType.INTEGER; @@ -99,6 +98,7 @@ final class TimestampDiff extends AbstractFunction { + case POSTGRES: diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 3d1ed700b4..515b642491 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -43,6 +43,7 @@ import static java.lang.Character.isJavaIdentifierPart; // ... // ... // ... +// ... import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; @@ -1951,7 +1952,7 @@ final class Tools { // [#6704] PostgreSQL supports additional quoted string literals, which we must skip: E'...' else if ((sqlChars[i] == 'e' || sqlChars[i] == 'E') - && ctx.family() == POSTGRES + && ( ctx.family() == POSTGRES) && i + 1 < sqlChars.length && sqlChars[i + 1] == '\'') { @@ -3741,6 +3742,9 @@ final class Tools { break; } + + + case POSTGRES: { if (increment(ctx.data(), DATA_BLOCK_NESTING)) ctx.visit(K_DO).sql(" $$").formatSeparator(); @@ -3771,6 +3775,9 @@ final class Tools { .visit(K_END); break; } + + + case POSTGRES: { ctx.formatIndentEnd().formatSeparator() .visit(K_END); @@ -3926,6 +3933,9 @@ final class Tools { break; } + + + case POSTGRES: { begin(ctx); break; @@ -4097,6 +4107,9 @@ final class Tools { break; } + + + case POSTGRES: { ctx.sql(';').formatIndentEnd().formatSeparator() .visit(K_EXCEPTION).formatIndentStart().formatSeparator() @@ -4194,6 +4207,7 @@ final class Tools { + case POSTGRES: ctx.visit(type.getType() == Long.class ? K_SERIAL8 : K_SERIAL); return; } } diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java index b5693fa8de..ffd9c9b693 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java @@ -38,7 +38,6 @@ package org.jooq.impl; import static java.math.BigDecimal.TEN; -// ... import static org.jooq.impl.DSL.inline; import static org.jooq.impl.DSL.keyword; import static org.jooq.impl.DSL.one; @@ -108,6 +107,9 @@ final class Trunc extends AbstractFunction { // Postgres TRUNC() only takes NUMERIC arguments, no // DOUBLE PRECISION ones + + + case POSTGRES: return DSL.field("{trunc}({0}, {1})", SQLDataType.NUMERIC, field.cast(BigDecimal.class), decimals).cast(field.getDataType()); diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncDate.java b/jOOQ/src/main/java/org/jooq/impl/TruncDate.java index 47838c4586..c84c94b616 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TruncDate.java +++ b/jOOQ/src/main/java/org/jooq/impl/TruncDate.java @@ -123,6 +123,7 @@ final class TruncDate extends AbstractFunction { + case POSTGRES: { switch (part) { case YEAR: keyword = "year"; break; diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java index 5d076d0b9f..fb2ebd54e3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java @@ -102,6 +102,7 @@ final class UDTConstant> extends AbstractParam { + // Due to lack of UDT support in the Postgres JDBC drivers, all UDT's @@ -123,6 +124,9 @@ final class UDTConstant> extends AbstractParam { ctx.paramType(ParamType.INLINED); switch (ctx.family()) { + + + case POSTGRES: ctx.visit(K_ROW); break; @@ -155,6 +159,9 @@ final class UDTConstant> extends AbstractParam { @Deprecated private final String getInlineConstructor(RenderContext context) { switch (context.family()) { + + + case POSTGRES: return "ROW"; @@ -183,6 +190,7 @@ final class UDTConstant> extends AbstractParam { + // Postgres cannot bind a complete structured type. The type is // inlined instead: ROW(.., .., ..) case POSTGRES: { diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java index 189a6bdd95..e26d7ee7a7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java @@ -46,6 +46,7 @@ import static org.jooq.Clause.UPDATE_SET_ASSIGNMENT; import static org.jooq.Clause.UPDATE_UPDATE; import static org.jooq.Clause.UPDATE_WHERE; // ... +// ... import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java index 6c076849a0..c53a39188d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Values.java +++ b/jOOQ/src/main/java/org/jooq/impl/Values.java @@ -146,6 +146,7 @@ final class Values extends AbstractTable { + default: { ctx.start(TABLE_VALUES) .visit(K_VALUES); diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java index 751f13e11c..296d14b9b0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java +++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java @@ -77,6 +77,7 @@ final class WidthBucket extends AbstractField { + case POSTGRES: ctx.visit(DSL.field("{width_bucket}({0}, {1}, {2}, {3})", getType(), field, low, high, buckets)); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java index 1bca8f476a..a9aa94b3bf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +// ... import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.impl.Keywords.K_AS; @@ -86,7 +87,7 @@ final class WindowDefinitionImpl extends AbstractQueryPart implements WindowDefi // Outside the WINDOW clause, only few dialects actually support // referencing WINDOW definitions - else if (ctx.family() == POSTGRES) + else if ( ctx.family() == POSTGRES) ctx.visit(name); // When emulating, just repeat the window specification diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java index 01fe3a6063..ad3ceb5048 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java @@ -40,7 +40,7 @@ package org.jooq.impl; // ... import static org.jooq.SQLDialect.CUBRID; // ... -import static org.jooq.SQLDialect.*; +import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.impl.DSL.one; import static org.jooq.impl.Keywords.K_AND; diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/Mock.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/Mock.java index f169a6120a..5d0ab4584e 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/Mock.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/Mock.java @@ -39,7 +39,6 @@ package org.jooq.tools.jdbc; import static org.jooq.impl.DSL.using; -import org.jooq.Configuration; import org.jooq.Record; import org.jooq.Result; diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java index f919ade49e..d25ecbe181 100644 --- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java @@ -37,7 +37,7 @@ */ package org.jooq.util.mysql; -import static org.jooq.SQLDialect.*; +import static org.jooq.SQLDialect.MYSQL; import org.jooq.EnumType; import org.jooq.Field; diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java index 65b82bf041..cc73a9700d 100644 --- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java @@ -37,6 +37,7 @@ */ package org.jooq.util.postgres; +// ... import static org.jooq.SQLDialect.POSTGRES; import org.jooq.Condition; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java index a2dc282d7a..9af5c97045 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java index dc8f6b4f47..be02f9e020 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java index b0e2250dcc..783de3239f 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java index bffbecb3fe..c19ea10212 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java index 3873ba8c3b..8b0dc8849b 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java @@ -12,6 +12,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java index edc4af4cdc..5a8da74bc2 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java index 0750f20ca3..78b88f3e67 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java @@ -9,12 +9,14 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java index 5cd45b3693..4f1451fa0e 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java index 9837d3732b..8d77153400 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java @@ -9,12 +9,14 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java index 3d9d52f85f..475c58b38c 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java index 461aba8377..eff7f41793 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java index 3b2bd78af2..b188064cd7 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java @@ -9,11 +9,13 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java index 0f819a4b8b..7499f5d8dd 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java @@ -9,12 +9,14 @@ package org.jooq.util.xml.jaxb; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.jooq.util.jaxb.tools.StringAdapter;