From 35fc136643dd594b2e0ebcf7258fe9fd26f78869 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 21 May 2019 14:38:06 +0200 Subject: [PATCH] [#2059] Add MemSQL support Implement support for new dialect SQLDialect#MEMSQL. Excluded from the support are stored procedures, MemSQL specific DDL keywords, MemSQL specific DML (like REPLACE), and for the time being also the PIVOT clause (see #8643). Approved-by: Lukas Eder --- .../codegen/DefaultGeneratorStrategy.java | 1 + .../java/org/jooq/codegen/JavaGenerator.java | 1 + .../main/java/org/jooq/meta/Databases.java | 2 + .../org/jooq/meta/memsql/MemSQLDatabase.java | 60 ++++++++ .../org/jooq/meta/mysql/MySQLDatabase.java | 12 +- jOOQ/src/main/java/org/jooq/Allow.java | 2 + .../main/java/org/jooq/AlterIndexOnStep.java | 1 + .../main/java/org/jooq/AlterIndexStep.java | 1 + .../java/org/jooq/AlterTableAlterStep.java | 1 + .../org/jooq/AlterTableRenameIndexToStep.java | 1 + .../main/java/org/jooq/AlterTableStep.java | 7 +- .../main/java/org/jooq/CommentOnIsStep.java | 1 + .../org/jooq/ConstraintForeignKeyOnStep.java | 1 + .../main/java/org/jooq/CreateIndexStep.java | 1 + .../main/java/org/jooq/CreateTableAsStep.java | 1 + .../java/org/jooq/CreateTableCommentStep.java | 1 + .../java/org/jooq/CreateTableIndexStep.java | 1 + .../org/jooq/CreateTableWithDataStep.java | 1 + jOOQ/src/main/java/org/jooq/DSLContext.java | 1 + jOOQ/src/main/java/org/jooq/DatePart.java | 1 + .../java/org/jooq/DerivedColumnList1.java | 1 + .../java/org/jooq/DerivedColumnList10.java | 1 + .../java/org/jooq/DerivedColumnList11.java | 1 + .../java/org/jooq/DerivedColumnList12.java | 1 + .../java/org/jooq/DerivedColumnList13.java | 1 + .../java/org/jooq/DerivedColumnList14.java | 1 + .../java/org/jooq/DerivedColumnList15.java | 1 + .../java/org/jooq/DerivedColumnList16.java | 1 + .../java/org/jooq/DerivedColumnList17.java | 1 + .../java/org/jooq/DerivedColumnList18.java | 1 + .../java/org/jooq/DerivedColumnList19.java | 1 + .../java/org/jooq/DerivedColumnList2.java | 1 + .../java/org/jooq/DerivedColumnList20.java | 1 + .../java/org/jooq/DerivedColumnList21.java | 1 + .../java/org/jooq/DerivedColumnList22.java | 1 + .../java/org/jooq/DerivedColumnList3.java | 1 + .../java/org/jooq/DerivedColumnList4.java | 1 + .../java/org/jooq/DerivedColumnList5.java | 1 + .../java/org/jooq/DerivedColumnList6.java | 1 + .../java/org/jooq/DerivedColumnList7.java | 1 + .../java/org/jooq/DerivedColumnList8.java | 1 + .../java/org/jooq/DerivedColumnList9.java | 1 + .../org/jooq/DivideByOnConditionStep.java | 73 ++++++--- .../main/java/org/jooq/DivideByOnStep.java | 41 ++++- .../java/org/jooq/DivideByReturningStep.java | 29 +++- .../main/java/org/jooq/DropIndexOnStep.java | 1 + jOOQ/src/main/java/org/jooq/Field.java | 1 + jOOQ/src/main/java/org/jooq/GrantOnStep.java | 1 + jOOQ/src/main/java/org/jooq/GrantToStep.java | 1 + .../org/jooq/GrantWithGrantOptionStep.java | 1 + .../org/jooq/GroupConcatSeparatorStep.java | 1 + .../org/jooq/InsertOnDuplicateSetStep.java | 1 + .../java/org/jooq/InsertOnDuplicateStep.java | 1 + jOOQ/src/main/java/org/jooq/InsertQuery.java | 1 + .../src/main/java/org/jooq/InsertSetStep.java | 1 + jOOQ/src/main/java/org/jooq/JoinType.java | 1 + .../main/java/org/jooq/LoaderOptionsStep.java | 1 + .../main/java/org/jooq/MergeUsingStep.java | 1 + .../main/java/org/jooq/MergeValuesStep1.java | 1 + .../main/java/org/jooq/MergeValuesStep10.java | 1 + .../main/java/org/jooq/MergeValuesStep11.java | 1 + .../main/java/org/jooq/MergeValuesStep12.java | 1 + .../main/java/org/jooq/MergeValuesStep13.java | 1 + .../main/java/org/jooq/MergeValuesStep14.java | 1 + .../main/java/org/jooq/MergeValuesStep15.java | 1 + .../main/java/org/jooq/MergeValuesStep16.java | 1 + .../main/java/org/jooq/MergeValuesStep17.java | 1 + .../main/java/org/jooq/MergeValuesStep18.java | 1 + .../main/java/org/jooq/MergeValuesStep19.java | 1 + .../main/java/org/jooq/MergeValuesStep2.java | 1 + .../main/java/org/jooq/MergeValuesStep20.java | 1 + .../main/java/org/jooq/MergeValuesStep21.java | 1 + .../main/java/org/jooq/MergeValuesStep22.java | 1 + .../main/java/org/jooq/MergeValuesStep3.java | 1 + .../main/java/org/jooq/MergeValuesStep4.java | 1 + .../main/java/org/jooq/MergeValuesStep5.java | 1 + .../main/java/org/jooq/MergeValuesStep6.java | 1 + .../main/java/org/jooq/MergeValuesStep7.java | 1 + .../main/java/org/jooq/MergeValuesStep8.java | 1 + .../main/java/org/jooq/MergeValuesStep9.java | 1 + .../main/java/org/jooq/MergeValuesStepN.java | 1 + jOOQ/src/main/java/org/jooq/Name.java | 1 + .../main/java/org/jooq/RevokeFromStep.java | 1 + jOOQ/src/main/java/org/jooq/RevokeOnStep.java | 1 + jOOQ/src/main/java/org/jooq/Row1.java | 1 + jOOQ/src/main/java/org/jooq/Row10.java | 1 + jOOQ/src/main/java/org/jooq/Row11.java | 1 + jOOQ/src/main/java/org/jooq/Row12.java | 1 + jOOQ/src/main/java/org/jooq/Row13.java | 1 + jOOQ/src/main/java/org/jooq/Row14.java | 1 + jOOQ/src/main/java/org/jooq/Row15.java | 1 + jOOQ/src/main/java/org/jooq/Row16.java | 1 + jOOQ/src/main/java/org/jooq/Row17.java | 1 + jOOQ/src/main/java/org/jooq/Row18.java | 1 + jOOQ/src/main/java/org/jooq/Row19.java | 1 + jOOQ/src/main/java/org/jooq/Row2.java | 1 + jOOQ/src/main/java/org/jooq/Row20.java | 1 + jOOQ/src/main/java/org/jooq/Row21.java | 1 + jOOQ/src/main/java/org/jooq/Row22.java | 1 + jOOQ/src/main/java/org/jooq/Row3.java | 1 + jOOQ/src/main/java/org/jooq/Row4.java | 1 + jOOQ/src/main/java/org/jooq/Row5.java | 1 + jOOQ/src/main/java/org/jooq/Row6.java | 1 + jOOQ/src/main/java/org/jooq/Row7.java | 1 + jOOQ/src/main/java/org/jooq/Row8.java | 1 + jOOQ/src/main/java/org/jooq/Row9.java | 1 + jOOQ/src/main/java/org/jooq/RowN.java | 1 + jOOQ/src/main/java/org/jooq/SQLDialect.java | 13 ++ jOOQ/src/main/java/org/jooq/Select.java | 1 + .../java/org/jooq/SelectForUpdateStep.java | 1 + .../main/java/org/jooq/SelectIntoStep.java | 1 + .../main/java/org/jooq/SelectJoinStep.java | 1 + .../org/jooq/SelectLimitAfterOffsetStep.java | 1 + .../main/java/org/jooq/SelectLimitStep.java | 1 + .../main/java/org/jooq/SelectOffsetStep.java | 1 + jOOQ/src/main/java/org/jooq/SelectQuery.java | 1 + .../java/org/jooq/SelectSeekLimitStep.java | 1 + .../main/java/org/jooq/SelectUnionStep.java | 1 + .../main/java/org/jooq/SelectWindowStep.java | 1 + jOOQ/src/main/java/org/jooq/Table.java | 4 +- .../java/org/jooq/TableOuterJoinStep.java | 1 + .../main/java/org/jooq/WindowOrderByStep.java | 1 + .../main/java/org/jooq/WindowOverStep.java | 1 + .../java/org/jooq/WindowPartitionByStep.java | 1 + .../main/java/org/jooq/WindowRowsAndStep.java | 1 + .../main/java/org/jooq/WindowRowsStep.java | 1 + .../jooq/WindowSpecificationOrderByStep.java | 1 + .../WindowSpecificationPartitionByStep.java | 1 + .../jooq/WindowSpecificationRowsAndStep.java | 1 + .../org/jooq/WindowSpecificationRowsStep.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep1.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep10.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep11.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep12.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep13.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep14.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep15.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep16.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep17.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep18.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep19.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep2.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep20.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep21.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep22.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep3.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep4.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep5.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep6.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep7.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep8.java | 1 + jOOQ/src/main/java/org/jooq/WithAsStep9.java | 1 + jOOQ/src/main/java/org/jooq/WithStep.java | 1 + .../java/org/jooq/impl/AbstractDMLQuery.java | 2 + jOOQ/src/main/java/org/jooq/impl/Alias.java | 1 + .../java/org/jooq/impl/AlterIndexImpl.java | 1 + .../java/org/jooq/impl/AlterTableImpl.java | 16 ++ .../java/org/jooq/impl/BetweenCondition.java | 1 + .../src/main/java/org/jooq/impl/BitCount.java | 1 + .../java/org/jooq/impl/CommentOnImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/Concat.java | 1 + .../java/org/jooq/impl/ConditionAsField.java | 1 + jOOQ/src/main/java/org/jooq/impl/Cosh.java | 1 + .../java/org/jooq/impl/CreateIndexImpl.java | 1 + .../java/org/jooq/impl/CreateTableImpl.java | 1 + .../java/org/jooq/impl/CreateViewImpl.java | 13 +- .../java/org/jooq/impl/CurrentSchema.java | 1 + jOOQ/src/main/java/org/jooq/impl/DSL.java | 15 +- jOOQ/src/main/java/org/jooq/impl/DateAdd.java | 1 + .../src/main/java/org/jooq/impl/DateDiff.java | 1 + .../main/java/org/jooq/impl/DateOrTime.java | 1 + .../java/org/jooq/impl/DefaultBinding.java | 1 + .../java/org/jooq/impl/DefaultDSLContext.java | 1 + .../java/org/jooq/impl/DeleteQueryImpl.java | 4 +- .../java/org/jooq/impl/DropIndexImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/Dual.java | 1 + jOOQ/src/main/java/org/jooq/impl/Euler.java | 1 + .../main/java/org/jooq/impl/ExplainQuery.java | 1 + .../main/java/org/jooq/impl/Expression.java | 2 + jOOQ/src/main/java/org/jooq/impl/Extract.java | 1 + .../java/org/jooq/impl/FieldCondition.java | 1 + .../org/jooq/impl/FieldMapsForInsert.java | 12 +- .../src/main/java/org/jooq/impl/Function.java | 3 +- .../main/java/org/jooq/impl/Identifiers.java | 1 + .../java/org/jooq/impl/InsertQueryImpl.java | 3 + .../java/org/jooq/impl/IsDistinctFrom.java | 1 + .../src/main/java/org/jooq/impl/Keywords.java | 1 + jOOQ/src/main/java/org/jooq/impl/Left.java | 1 + jOOQ/src/main/java/org/jooq/impl/Limit.java | 1 + jOOQ/src/main/java/org/jooq/impl/MD5.java | 1 + .../main/java/org/jooq/impl/MergeImpl.java | 1 + .../src/main/java/org/jooq/impl/MetaImpl.java | 5 +- .../src/main/java/org/jooq/impl/NotField.java | 1 + jOOQ/src/main/java/org/jooq/impl/Nvl.java | 1 + .../main/java/org/jooq/impl/RegexpLike.java | 1 + jOOQ/src/main/java/org/jooq/impl/Repeat.java | 1 + jOOQ/src/main/java/org/jooq/impl/Replace.java | 1 + jOOQ/src/main/java/org/jooq/impl/Reverse.java | 1 + jOOQ/src/main/java/org/jooq/impl/Right.java | 1 + .../org/jooq/impl/RowBetweenCondition.java | 1 + .../main/java/org/jooq/impl/RowCondition.java | 1 + .../java/org/jooq/impl/RowInCondition.java | 1 + .../java/org/jooq/impl/RowIsDistinctFrom.java | 1 + .../main/java/org/jooq/impl/RowIsNull.java | 1 + .../org/jooq/impl/RowOverlapsCondition.java | 1 + .../main/java/org/jooq/impl/SQLDataType.java | 5 + .../java/org/jooq/impl/SelectQueryImpl.java | 6 +- .../main/java/org/jooq/impl/SetCatalog.java | 1 + .../main/java/org/jooq/impl/SetSchema.java | 1 + jOOQ/src/main/java/org/jooq/impl/Sinh.java | 1 + .../java/org/jooq/impl/SortFieldImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/Space.java | 1 + .../java/org/jooq/impl/TableRecordImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/Tanh.java | 1 + jOOQ/src/main/java/org/jooq/impl/Term.java | 2 + .../java/org/jooq/impl/TimestampDiff.java | 1 + jOOQ/src/main/java/org/jooq/impl/Tools.java | 3 + jOOQ/src/main/java/org/jooq/impl/Trunc.java | 1 + .../java/org/jooq/impl/UpdateQueryImpl.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Values.java | 1 + .../jooq/impl/WindowSpecificationImpl.java | 1 + .../org/jooq/util/memsql/MemSQLDataType.java | 141 ++++++++++++++++++ .../org/jooq/util/memsql/package-info.java | 5 + .../java/org/jooq/util/mysql/MySQLDSL.java | 1 + 225 files changed, 624 insertions(+), 58 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/meta/memsql/MemSQLDatabase.java create mode 100644 jOOQ/src/main/java/org/jooq/util/memsql/MemSQLDataType.java create mode 100644 jOOQ/src/main/java/org/jooq/util/memsql/package-info.java diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java index efed2d3890..b95870bf72 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java @@ -40,6 +40,7 @@ package org.jooq.codegen; import static java.util.Arrays.asList; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index c8e90ab84e..147014fa11 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -40,6 +40,7 @@ package org.jooq.codegen; import static java.util.Arrays.asList; // ... +// ... import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SortOrder.DESC; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java index 5f349b70ff..76be8628c1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java @@ -51,6 +51,7 @@ import org.jooq.meta.hsqldb.HSQLDBDatabase; // ... import org.jooq.meta.jdbc.JDBCDatabase; import org.jooq.meta.mariadb.MariaDBDatabase; +// ... import org.jooq.meta.mysql.MySQLDatabase; // ... import org.jooq.meta.postgres.PostgresDatabase; @@ -106,6 +107,7 @@ public class Databases { + case CUBRID: result = CUBRIDDatabase.class; break; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/memsql/MemSQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/memsql/MemSQLDatabase.java new file mode 100644 index 0000000000..9888604532 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/meta/memsql/MemSQLDatabase.java @@ -0,0 +1,60 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: http://www.jooq.org/licenses + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ + +package org.jooq.meta.memsql; + +import org.jooq.DSLContext; +import org.jooq.SQLDialect; +import org.jooq.impl.DSL; +import org.jooq.meta.mysql.MySQLDatabase; + +/** + * @author Knut Wannheden + */ +public class MemSQLDatabase extends MySQLDatabase { + + @Override + protected boolean is8() { + return true; + } + + @Override + protected DSLContext create0() { + return DSL.using(getConnection(), SQLDialect.MEMSQL); + } +} diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java index fe728f389c..703dfcb78a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java @@ -94,7 +94,6 @@ import org.jooq.meta.mysql.information_schema.tables.Statistics; import org.jooq.meta.mysql.information_schema.tables.Tables; import org.jooq.meta.mysql.mysql.enums.ProcType; import org.jooq.meta.mysql.mysql.tables.Proc; -import org.jooq.tools.JooqLogger; import org.jooq.tools.csv.CSVReader; /** @@ -102,7 +101,6 @@ import org.jooq.tools.csv.CSVReader; */ public class MySQLDatabase extends AbstractDatabase { - private static final JooqLogger log = JooqLogger.getLogger(MySQLDatabase.class); private static Boolean is8; @Override @@ -111,7 +109,9 @@ public class MySQLDatabase extends AbstractDatabase { // Same implementation as in H2Database and HSQLDBDatabase Map> indexes = create() - .select( + // [#2059] In MemSQL primary key indexes are typically duplicated + // (once with INDEX_TYPE = 'SHARD' and once with INDEX_TYPE = 'BTREE) + .selectDistinct( Statistics.TABLE_SCHEMA, Statistics.TABLE_NAME, Statistics.INDEX_NAME, @@ -223,7 +223,7 @@ public class MySQLDatabase extends AbstractDatabase { return "KEY_" + tableName + "_" + keyName; } - private boolean is8() { + protected boolean is8() { if (is8 == null) { // [#6602] The mysql.proc table got removed in MySQL 8.0 @@ -243,7 +243,9 @@ public class MySQLDatabase extends AbstractDatabase { // [#3560] It has been shown that querying the STATISTICS table is much faster on // very large databases than going through TABLE_CONSTRAINTS and KEY_COLUMN_USAGE - return create().select( + // [#2059] In MemSQL primary key indexes are typically duplicated + // (once with INDEX_TYPE = 'SHARD' and once with INDEX_TYPE = 'BTREE) + return create().selectDistinct( Statistics.TABLE_SCHEMA, Statistics.TABLE_NAME, Statistics.COLUMN_NAME, diff --git a/jOOQ/src/main/java/org/jooq/Allow.java b/jOOQ/src/main/java/org/jooq/Allow.java index ad340ef8cf..763bb6c7dd 100644 --- a/jOOQ/src/main/java/org/jooq/Allow.java +++ b/jOOQ/src/main/java/org/jooq/Allow.java @@ -57,6 +57,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -168,6 +169,7 @@ 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 e1709456c5..f070493365 100644 --- a/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java @@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexStep.java index 9ec31b3b77..0feeaf6618 100644 --- a/jOOQ/src/main/java/org/jooq/AlterIndexStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterIndexStep.java @@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java index 45de44f431..593e8c1232 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java @@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java b/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java index 507dfee749..b37692c563 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableRenameIndexToStep.java @@ -43,6 +43,7 @@ package org.jooq; import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java index 0df7394c9f..ed1bd5143d 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -177,21 +178,21 @@ public interface AlterTableStep { * Add a RENAME CONSTRAINT clause to the ALTER TABLE * statement. */ - @Support + @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) AlterTableRenameConstraintToStep renameConstraint(Constraint oldName); /** * Add a RENAME CONSTRAINT clause to the ALTER TABLE * statement. */ - @Support + @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) AlterTableRenameConstraintToStep renameConstraint(Name oldName); /** * Add a RENAME CONSTRAINT clause to the ALTER TABLE * statement. */ - @Support + @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) AlterTableRenameConstraintToStep renameConstraint(String oldName); /** diff --git a/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java b/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java index a85d874e38..38fffb3945 100644 --- a/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java +++ b/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java @@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java index 2986b17fea..656ffdb6e4 100644 --- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java +++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyOnStep.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java index 7d0272a2cc..10cadc7a54 100644 --- a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... 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 de4405627e..a8b3852f55 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java index 1cc41efbac..9b08aa93f3 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java @@ -41,6 +41,7 @@ package org.jooq; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java b/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java index 53fd319ecb..9afe28b14d 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableIndexStep.java @@ -42,6 +42,7 @@ package org.jooq; // ... import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... 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 7f9f87c400..fc151e70ef 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index f84f479c00..ea21ce8e48 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.MYSQL; // ... diff --git a/jOOQ/src/main/java/org/jooq/DatePart.java b/jOOQ/src/main/java/org/jooq/DatePart.java index 0fefeb2c32..2aeba45306 100644 --- a/jOOQ/src/main/java/org/jooq/DatePart.java +++ b/jOOQ/src/main/java/org/jooq/DatePart.java @@ -44,6 +44,7 @@ package org.jooq; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java index 2f814dca5e..13c071ad22 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList1.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java index d79f44d3b6..0a249714ac 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList10.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java index e00effc98c..251e190aed 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList11.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java index 4f0782f638..066dff1990 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList12.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java index 63df72ecea..5a2df3faeb 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList13.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java index f8b993d570..f0c6140537 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList14.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java index cd5bf07bf5..aa9e77cb03 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList15.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java index a0f7eb59dd..afb1f07a48 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList16.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java index f511966335..48287439ef 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList17.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java index ee0c81a142..8bf366eebf 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList18.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java index 2a84567e33..281f8a47b6 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList19.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java index fe6b9d01f4..3f964ac32b 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList2.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java index 4f8bcc4e95..b3dd1a3875 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList20.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java index cddb31747f..ef461308d2 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList21.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java index 66090c0863..cb13a11f13 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList22.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java index eb445b738d..9d7b4cf516 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList3.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java index f2754ce02a..99ae434b18 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList4.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java index c7fdfd528d..905e15657b 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList5.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java index a08bf0c72f..e7f10c247b 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList6.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java index 393ef4ca47..4a16f7b835 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList7.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java index 940a7b77ce..de636d8ebf 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList8.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java b/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java index 9cf74c96f3..a24e84ff54 100644 --- a/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java +++ b/jOOQ/src/main/java/org/jooq/DerivedColumnList9.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java index 9aa51f10ea..14a837df84 100644 --- a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java @@ -37,6 +37,31 @@ */ package org.jooq; +// ... +// ... +// ... +// ... +import static org.jooq.SQLDialect.CUBRID; +// ... +import static org.jooq.SQLDialect.DERBY; +import static org.jooq.SQLDialect.FIREBIRD; +import static org.jooq.SQLDialect.H2; +// ... +import static org.jooq.SQLDialect.HSQLDB; +// ... +// ... +import static org.jooq.SQLDialect.MARIADB; +import static org.jooq.SQLDialect.MYSQL; +// ... +import static org.jooq.SQLDialect.POSTGRES; +// ... +// ... +import static org.jooq.SQLDialect.SQLITE; +// ... +// ... +// ... +// ... + import org.jooq.impl.DSL; /** @@ -69,14 +94,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep and(Condition condition); /** * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep and(Field condition); /** @@ -90,7 +115,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * argument, this method will be removed in the future. */ @Deprecated - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep and(Boolean condition); /** @@ -105,7 +130,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#condition(SQL) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep and(SQL sql); @@ -121,7 +146,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#condition(String) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep and(String sql); @@ -138,7 +163,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#sql(String, Object...) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep and(String sql, Object... bindings); @@ -155,7 +180,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#sql(String, QueryPart...) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep and(String sql, QueryPart... parts); @@ -163,14 +188,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep andNot(Condition condition); /** * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep andNot(Field condition); /** @@ -185,35 +210,35 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * removed in the future. */ @Deprecated - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep andNot(Boolean condition); /** * Combine the currently assembled conditions with an EXISTS * clause using the {@link Operator#AND} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep andExists(Select select); /** * Combine the currently assembled conditions with a NOT EXISTS * clause using the {@link Operator#AND} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep andNotExists(Select select); /** * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep or(Condition condition); /** * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep or(Field condition); /** @@ -227,7 +252,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * argument, this method will be removed in the future. */ @Deprecated - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep or(Boolean condition); /** @@ -242,7 +267,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#condition(SQL) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep or(SQL sql); @@ -258,7 +283,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#condition(String) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep or(String sql); @@ -275,7 +300,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#sql(String, Object...) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep or(String sql, Object... bindings); @@ -292,7 +317,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * @see DSL#sql(String, QueryPart...) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep or(String sql, QueryPart... parts); @@ -300,14 +325,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep orNot(Condition condition); /** * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep orNot(Field condition); /** @@ -322,20 +347,20 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * removed in the future. */ @Deprecated - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep orNot(Boolean condition); /** * Combine the currently assembled conditions with an EXISTS * clause using the {@link Operator#OR} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep orExists(Select select); /** * Combine the currently assembled conditions with a NOT EXISTS * clause using the {@link Operator#OR} operator. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep orNotExists(Select select); } diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java index fb1fcc7dab..1926ffcb69 100644 --- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java +++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java @@ -37,6 +37,31 @@ */ package org.jooq; +// ... +// ... +// ... +// ... +import static org.jooq.SQLDialect.CUBRID; +// ... +import static org.jooq.SQLDialect.DERBY; +import static org.jooq.SQLDialect.FIREBIRD; +import static org.jooq.SQLDialect.H2; +// ... +import static org.jooq.SQLDialect.HSQLDB; +// ... +// ... +import static org.jooq.SQLDialect.MARIADB; +import static org.jooq.SQLDialect.MYSQL; +// ... +import static org.jooq.SQLDialect.POSTGRES; +// ... +// ... +import static org.jooq.SQLDialect.SQLITE; +// ... +// ... +// ... +// ... + import org.jooq.impl.DSL; @@ -69,20 +94,20 @@ public interface DivideByOnStep { * Add a division condition to the DIVIDE BY clause, connecting * them with each other with {@link Operator#AND}. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep on(Condition condition); /** * Add a division condition to the DIVIDE BY clause, connecting * them with each other with {@link Operator#AND}. */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep on(Condition... conditions); /** * Add a division condition to the DIVIDE BY clause */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep on(Field condition); /** @@ -95,7 +120,7 @@ public interface DivideByOnStep { * argument, this method will be removed in the future. */ @Deprecated - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnConditionStep on(Boolean condition); /** @@ -109,7 +134,7 @@ public interface DivideByOnStep { * @see DSL#condition(SQL) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep on(SQL sql); @@ -124,7 +149,7 @@ public interface DivideByOnStep { * @see DSL#condition(String) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep on(String sql); @@ -140,7 +165,7 @@ public interface DivideByOnStep { * @see DSL#sql(String, Object...) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep on(String sql, Object... bindings); @@ -156,7 +181,7 @@ public interface DivideByOnStep { * @see DSL#sql(String, QueryPart...) * @see SQL */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) @PlainSQL DivideByOnConditionStep on(String sql, QueryPart... parts); } diff --git a/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java b/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java index 9cf9638c72..5bd427ddf8 100644 --- a/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java +++ b/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java @@ -37,6 +37,31 @@ */ package org.jooq; +// ... +// ... +// ... +// ... +import static org.jooq.SQLDialect.CUBRID; +// ... +import static org.jooq.SQLDialect.DERBY; +import static org.jooq.SQLDialect.FIREBIRD; +import static org.jooq.SQLDialect.H2; +// ... +import static org.jooq.SQLDialect.HSQLDB; +// ... +// ... +import static org.jooq.SQLDialect.MARIADB; +import static org.jooq.SQLDialect.MYSQL; +// ... +import static org.jooq.SQLDialect.POSTGRES; +// ... +// ... +import static org.jooq.SQLDialect.SQLITE; +// ... +// ... +// ... +// ... + import java.util.Collection; /** @@ -67,12 +92,12 @@ public interface DivideByReturningStep { /** * Specify the fields that you want the division to return from the dividend */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) Table returning(Field... fields); /** * Specify the fields that you want the division to return from the dividend */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) Table returning(Collection> fields); } diff --git a/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java b/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java index eb91ceee55..2105bcf6d3 100644 --- a/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java +++ b/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... 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 810ae33813..81a5b25615 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/GrantOnStep.java b/jOOQ/src/main/java/org/jooq/GrantOnStep.java index d40442912f..9db7b2fbea 100644 --- a/jOOQ/src/main/java/org/jooq/GrantOnStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantOnStep.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/GrantToStep.java b/jOOQ/src/main/java/org/jooq/GrantToStep.java index 229a328542..48a8aa15bf 100644 --- a/jOOQ/src/main/java/org/jooq/GrantToStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantToStep.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java b/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java index b633ef763b..cb468c5cea 100644 --- a/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java @@ -41,6 +41,7 @@ package org.jooq; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java index 382e1d9ef1..5e63a02580 100644 --- a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java +++ b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java @@ -44,6 +44,7 @@ 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.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java index fc377e04c1..632f46b447 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java index 609e41636c..077d8abb52 100644 --- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/InsertQuery.java b/jOOQ/src/main/java/org/jooq/InsertQuery.java index c19667621e..4229e5872e 100644 --- a/jOOQ/src/main/java/org/jooq/InsertQuery.java +++ b/jOOQ/src/main/java/org/jooq/InsertQuery.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/InsertSetStep.java b/jOOQ/src/main/java/org/jooq/InsertSetStep.java index 55fed008db..bbb75b1c7d 100644 --- a/jOOQ/src/main/java/org/jooq/InsertSetStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertSetStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/JoinType.java b/jOOQ/src/main/java/org/jooq/JoinType.java index ec23adf477..83c6da6b16 100644 --- a/jOOQ/src/main/java/org/jooq/JoinType.java +++ b/jOOQ/src/main/java/org/jooq/JoinType.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java b/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java index 014a5c94cd..564716a25c 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java index 2e5923060a..3d6001c305 100644 --- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java index 05ab3a9ac8..52c2c6a202 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java index 0efe775e9d..f8fcf8998b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java index d8c56f16b2..a3a2c13a69 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java index af523d1f34..e07f303f14 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java index 5352dba9c7..283d742fa6 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java index 4babd6988e..ffdf8bf153 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java index 520a4f05e5..1c5254e278 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java index 5aad1af620..0bb4d11e93 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java index 875823bac0..eb402191cc 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java index 8e9a24c9fd..1f0484456d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java index d426341162..c6d514137d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java index a2bfb20d5d..0778e76665 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java index d8a84b4ad6..1f1b7ed505 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java index f4cb1508fd..6dc9109b04 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java index 1029a1491a..e770fa98f7 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java index e5c9f9181c..905802965f 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java index 15d27a117c..4cd0ccf7a8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java index c8b2c6d163..744f135f40 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java index b1d494099b..94e69b2cbd 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java index b3b9447ab4..02dbc008ce 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java index c3b33fe2c5..030671f6cb 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java index 8425931031..3ab0dca7e9 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java b/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java index bd3a46b16b..e53d79fd5e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java index 41b8e31668..2c81901cca 100644 --- a/jOOQ/src/main/java/org/jooq/Name.java +++ b/jOOQ/src/main/java/org/jooq/Name.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/RevokeFromStep.java b/jOOQ/src/main/java/org/jooq/RevokeFromStep.java index 0b014480e0..4ef4af03c1 100644 --- a/jOOQ/src/main/java/org/jooq/RevokeFromStep.java +++ b/jOOQ/src/main/java/org/jooq/RevokeFromStep.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/RevokeOnStep.java b/jOOQ/src/main/java/org/jooq/RevokeOnStep.java index a59da3e38f..5cb0d738ca 100644 --- a/jOOQ/src/main/java/org/jooq/RevokeOnStep.java +++ b/jOOQ/src/main/java/org/jooq/RevokeOnStep.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row1.java b/jOOQ/src/main/java/org/jooq/Row1.java index 878b3b8be9..982bb4d2c1 100644 --- a/jOOQ/src/main/java/org/jooq/Row1.java +++ b/jOOQ/src/main/java/org/jooq/Row1.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row10.java b/jOOQ/src/main/java/org/jooq/Row10.java index 5416b23de6..165da50109 100644 --- a/jOOQ/src/main/java/org/jooq/Row10.java +++ b/jOOQ/src/main/java/org/jooq/Row10.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row11.java b/jOOQ/src/main/java/org/jooq/Row11.java index 2d2a53a57d..d1a546d7d4 100644 --- a/jOOQ/src/main/java/org/jooq/Row11.java +++ b/jOOQ/src/main/java/org/jooq/Row11.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row12.java b/jOOQ/src/main/java/org/jooq/Row12.java index 6e94b045e7..1573415c27 100644 --- a/jOOQ/src/main/java/org/jooq/Row12.java +++ b/jOOQ/src/main/java/org/jooq/Row12.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row13.java b/jOOQ/src/main/java/org/jooq/Row13.java index a66d2c5d34..d3997c4121 100644 --- a/jOOQ/src/main/java/org/jooq/Row13.java +++ b/jOOQ/src/main/java/org/jooq/Row13.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row14.java b/jOOQ/src/main/java/org/jooq/Row14.java index 851ae090b5..ffbc58e487 100644 --- a/jOOQ/src/main/java/org/jooq/Row14.java +++ b/jOOQ/src/main/java/org/jooq/Row14.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row15.java b/jOOQ/src/main/java/org/jooq/Row15.java index 8cc83d4bb1..21bde0c979 100644 --- a/jOOQ/src/main/java/org/jooq/Row15.java +++ b/jOOQ/src/main/java/org/jooq/Row15.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row16.java b/jOOQ/src/main/java/org/jooq/Row16.java index 9cb21c22ab..7cdeb012a4 100644 --- a/jOOQ/src/main/java/org/jooq/Row16.java +++ b/jOOQ/src/main/java/org/jooq/Row16.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row17.java b/jOOQ/src/main/java/org/jooq/Row17.java index 2124bf64cc..dab3829d9c 100644 --- a/jOOQ/src/main/java/org/jooq/Row17.java +++ b/jOOQ/src/main/java/org/jooq/Row17.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row18.java b/jOOQ/src/main/java/org/jooq/Row18.java index ae28b803cf..0996914f52 100644 --- a/jOOQ/src/main/java/org/jooq/Row18.java +++ b/jOOQ/src/main/java/org/jooq/Row18.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row19.java b/jOOQ/src/main/java/org/jooq/Row19.java index c2bc6999f0..974c306066 100644 --- a/jOOQ/src/main/java/org/jooq/Row19.java +++ b/jOOQ/src/main/java/org/jooq/Row19.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row2.java b/jOOQ/src/main/java/org/jooq/Row2.java index 165ebf621f..5e43ded1de 100644 --- a/jOOQ/src/main/java/org/jooq/Row2.java +++ b/jOOQ/src/main/java/org/jooq/Row2.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row20.java b/jOOQ/src/main/java/org/jooq/Row20.java index 265d06011d..f6b740e198 100644 --- a/jOOQ/src/main/java/org/jooq/Row20.java +++ b/jOOQ/src/main/java/org/jooq/Row20.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row21.java b/jOOQ/src/main/java/org/jooq/Row21.java index d11833beda..ec8a9ff79f 100644 --- a/jOOQ/src/main/java/org/jooq/Row21.java +++ b/jOOQ/src/main/java/org/jooq/Row21.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row22.java b/jOOQ/src/main/java/org/jooq/Row22.java index 60e429a9a9..bda6f9cf08 100644 --- a/jOOQ/src/main/java/org/jooq/Row22.java +++ b/jOOQ/src/main/java/org/jooq/Row22.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row3.java b/jOOQ/src/main/java/org/jooq/Row3.java index 491193a6d2..659a610cb8 100644 --- a/jOOQ/src/main/java/org/jooq/Row3.java +++ b/jOOQ/src/main/java/org/jooq/Row3.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row4.java b/jOOQ/src/main/java/org/jooq/Row4.java index 388a44a173..023035b109 100644 --- a/jOOQ/src/main/java/org/jooq/Row4.java +++ b/jOOQ/src/main/java/org/jooq/Row4.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row5.java b/jOOQ/src/main/java/org/jooq/Row5.java index 1c2c32a12f..a15a23fe98 100644 --- a/jOOQ/src/main/java/org/jooq/Row5.java +++ b/jOOQ/src/main/java/org/jooq/Row5.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row6.java b/jOOQ/src/main/java/org/jooq/Row6.java index aa512b1ae4..2f2dccbc3e 100644 --- a/jOOQ/src/main/java/org/jooq/Row6.java +++ b/jOOQ/src/main/java/org/jooq/Row6.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row7.java b/jOOQ/src/main/java/org/jooq/Row7.java index c241fd74bf..0a33a3562a 100644 --- a/jOOQ/src/main/java/org/jooq/Row7.java +++ b/jOOQ/src/main/java/org/jooq/Row7.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row8.java b/jOOQ/src/main/java/org/jooq/Row8.java index 18d08476c3..12f3fa6319 100644 --- a/jOOQ/src/main/java/org/jooq/Row8.java +++ b/jOOQ/src/main/java/org/jooq/Row8.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Row9.java b/jOOQ/src/main/java/org/jooq/Row9.java index 1232c258e9..ed6f3bd59a 100644 --- a/jOOQ/src/main/java/org/jooq/Row9.java +++ b/jOOQ/src/main/java/org/jooq/Row9.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/RowN.java b/jOOQ/src/main/java/org/jooq/RowN.java index 943be370b1..559b1b6def 100644 --- a/jOOQ/src/main/java/org/jooq/RowN.java +++ b/jOOQ/src/main/java/org/jooq/RowN.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index a3814949f6..ce5fce8d1e 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -123,6 +123,13 @@ public enum SQLDialect { */ MARIADB("MariaDB", false), + + + + + + + /** * The MySQL dialect family. */ @@ -715,6 +722,9 @@ public enum SQLDialect { case H2: return "H2"; case HSQLDB: return "HSQL"; case MARIADB: + + + case MYSQL: return "MySQL"; case POSTGRES: return "PostgreSQL"; @@ -768,6 +778,9 @@ public enum SQLDialect { case H2: return "org.hibernate.dialect.H2Dialect"; case HSQLDB: return "org.hibernate.dialect.HSQLDialect"; case MARIADB: + + + case MYSQL: return "org.hibernate.dialect.MySQL5Dialect"; diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java index d1c3be392f..65e030b093 100644 --- a/jOOQ/src/main/java/org/jooq/Select.java +++ b/jOOQ/src/main/java/org/jooq/Select.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java index 6170619326..91afa57676 100644 --- a/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java @@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... 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 cbeadd43fb..0b7ce9dcab 100644 --- a/jOOQ/src/main/java/org/jooq/SelectIntoStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java index fa1068e62e..74fba54b15 100644 --- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java index 5195dbac4a..74da285b21 100644 --- a/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java index 2eac435ee5..ca34b08348 100644 --- a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java index 6da8b9d2cc..58f519cae6 100644 --- a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java index 968b79772a..7cca72c379 100644 --- a/jOOQ/src/main/java/org/jooq/SelectQuery.java +++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.MYSQL; // ... diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java index f0d781cc1e..f658d245a3 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java index e6bc245483..3fe99ed3f6 100644 --- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java index 7b3fe822d0..01e75d123e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index 2978a5fa4e..89f2d1a0d6 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... @@ -59,6 +60,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.POSTGRES; // ... +// ... import static org.jooq.SQLDialect.SQLITE; // ... // ... @@ -2665,7 +2667,7 @@ public interface Table extends TableLike, Named { *

* This has been observed to work with all dialects */ - @Support + @Support({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE}) DivideByOnStep divideBy(Table divisor); /** diff --git a/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java b/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java index 4467cc09fd..5855a9bd82 100644 --- a/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java index 50326c5ac2..d7c270aa1c 100644 --- a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowOverStep.java b/jOOQ/src/main/java/org/jooq/WindowOverStep.java index abbc9e8c21..e9186621e5 100644 --- a/jOOQ/src/main/java/org/jooq/WindowOverStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowOverStep.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java index 32af555299..a1f44bbc20 100644 --- a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java index 6ab4b313e9..9d0e1ba47b 100644 --- a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java @@ -42,6 +42,7 @@ package org.jooq; import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java index 701aaf2b2b..51c0b52998 100644 --- a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java @@ -42,6 +42,7 @@ package org.jooq; import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java index 14a75227d5..6269addf6c 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java index 3b8499adea..b5db337cb7 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java index 861c6f401f..6365fa7bf7 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java @@ -42,6 +42,7 @@ package org.jooq; import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java index f6fc30942b..bef6975b0f 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java @@ -42,6 +42,7 @@ package org.jooq; import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep.java b/jOOQ/src/main/java/org/jooq/WithAsStep.java index 974ac3a31c..17aa9c9e2c 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep1.java b/jOOQ/src/main/java/org/jooq/WithAsStep1.java index e92e8d6bc1..9a50670960 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep1.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep1.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep10.java b/jOOQ/src/main/java/org/jooq/WithAsStep10.java index 3718bbaf8e..5aca8e4709 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep10.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep10.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep11.java b/jOOQ/src/main/java/org/jooq/WithAsStep11.java index f6d3b8c89c..4d6d434655 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep11.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep11.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep12.java b/jOOQ/src/main/java/org/jooq/WithAsStep12.java index 0fda2d0ec8..8f2ebcb2c7 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep12.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep12.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep13.java b/jOOQ/src/main/java/org/jooq/WithAsStep13.java index 64863696e0..63001a55cc 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep13.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep13.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep14.java b/jOOQ/src/main/java/org/jooq/WithAsStep14.java index 1c88da32d7..2a4f7c7982 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep14.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep14.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep15.java b/jOOQ/src/main/java/org/jooq/WithAsStep15.java index f79bdb825a..1aaaa7289b 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep15.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep15.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep16.java b/jOOQ/src/main/java/org/jooq/WithAsStep16.java index c9e9a33d01..1bdcb04cae 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep16.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep16.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep17.java b/jOOQ/src/main/java/org/jooq/WithAsStep17.java index 916908efd2..b4f6b18618 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep17.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep17.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep18.java b/jOOQ/src/main/java/org/jooq/WithAsStep18.java index 4a4b825d3d..82c9cd4237 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep18.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep18.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep19.java b/jOOQ/src/main/java/org/jooq/WithAsStep19.java index 0cfaed0643..f82897f467 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep19.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep19.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep2.java b/jOOQ/src/main/java/org/jooq/WithAsStep2.java index d1a95a3f2b..acb174d28a 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep2.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep2.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep20.java b/jOOQ/src/main/java/org/jooq/WithAsStep20.java index 4076d4f091..62ac00167d 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep20.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep20.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep21.java b/jOOQ/src/main/java/org/jooq/WithAsStep21.java index 249b4503d4..ab48d868ed 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep21.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep21.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep22.java b/jOOQ/src/main/java/org/jooq/WithAsStep22.java index e62f3fecdf..18cfca1443 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep22.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep22.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep3.java b/jOOQ/src/main/java/org/jooq/WithAsStep3.java index 54b5aed909..7d7a372be9 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep3.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep3.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep4.java b/jOOQ/src/main/java/org/jooq/WithAsStep4.java index d82966b10e..e63bda17ef 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep4.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep4.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep5.java b/jOOQ/src/main/java/org/jooq/WithAsStep5.java index 01408b2ace..5c361d4d14 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep5.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep5.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep6.java b/jOOQ/src/main/java/org/jooq/WithAsStep6.java index a7af6e6ee4..8c8db669c5 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep6.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep6.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep7.java b/jOOQ/src/main/java/org/jooq/WithAsStep7.java index 017042bd76..35406bae67 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep7.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep7.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep8.java b/jOOQ/src/main/java/org/jooq/WithAsStep8.java index 946a8d251c..13a7661021 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep8.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep8.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep9.java b/jOOQ/src/main/java/org/jooq/WithAsStep9.java index 4219c67d64..cdbc653658 100644 --- a/jOOQ/src/main/java/org/jooq/WithAsStep9.java +++ b/jOOQ/src/main/java/org/jooq/WithAsStep9.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java index 772d3cedae..1932602a0c 100644 --- a/jOOQ/src/main/java/org/jooq/WithStep.java +++ b/jOOQ/src/main/java/org/jooq/WithStep.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index 753de365e5..a9f443d4e0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -713,6 +713,7 @@ abstract class AbstractDMLQuery extends AbstractRowCountQuery + case DERBY: case H2: case MARIADB: @@ -848,6 +849,7 @@ abstract class AbstractDMLQuery extends AbstractRowCountQuery + case DERBY: case H2: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java index bcdc4e5a96..3868233c84 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Alias.java +++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java @@ -58,6 +58,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java index fad398d2d8..6ad1ece4c7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java @@ -173,6 +173,7 @@ final class AlterIndexImpl extends AbstractRowCountQuery implements + case MARIADB: case MYSQL: { ctx.visit(K_ALTER_TABLE).sql(' ') diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java index 5f353811b8..82b046fd30 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java @@ -64,6 +64,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -91,6 +92,7 @@ import static org.jooq.impl.Keywords.K_ALTER_COLUMN; import static org.jooq.impl.Keywords.K_ALTER_CONSTRAINT; import static org.jooq.impl.Keywords.K_ALTER_TABLE; import static org.jooq.impl.Keywords.K_CASCADE; +import static org.jooq.impl.Keywords.K_CHANGE; import static org.jooq.impl.Keywords.K_CHANGE_COLUMN; import static org.jooq.impl.Keywords.K_COMMENT; import static org.jooq.impl.Keywords.K_CONSTRAINT; @@ -782,6 +784,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements + case MARIADB: case MYSQL: break; @@ -823,6 +826,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements + case MYSQL: break; @@ -974,6 +978,16 @@ final class AlterTableImpl extends AbstractRowCountQuery implements + + + + + + + + + + @@ -1167,6 +1181,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements + case CUBRID: @@ -1244,6 +1259,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements + default: ctx.sql(' ').visit(K_SET_DEFAULT); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java index cc580cee11..5e8fb13455 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java @@ -54,6 +54,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java index 6fd9f4097f..2934966770 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java @@ -66,6 +66,7 @@ final class BitCount extends AbstractFunction { + case MARIADB: case MYSQL: return function("bit_count", getDataType(), getArguments()); diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index a52ebc1f2d..2a3ecac81a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -116,6 +116,7 @@ implements + case MARIADB: case MYSQL: { if (table != null) diff --git a/jOOQ/src/main/java/org/jooq/impl/Concat.java b/jOOQ/src/main/java/org/jooq/impl/Concat.java index fd3bae9062..476c68d930 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Concat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Concat.java @@ -80,6 +80,7 @@ final class Concat extends AbstractFunction { + case MARIADB: case MYSQL: return function("concat", SQLDataType.VARCHAR, cast); diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java index 1a3bab0606..5ad64783de 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java @@ -99,6 +99,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/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java index 7049f81b8f..96b6a01b67 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java @@ -79,6 +79,7 @@ final class Cosh extends AbstractFunction { + case CUBRID: case HSQLDB: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index 5f23671997..9eb9a451c1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; // ... // ... +// ... import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.POSTGRES; // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java index 113b66186b..3e66d26a54 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java @@ -58,6 +58,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index ff3eb27381..3c9a172b43 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -49,11 +49,15 @@ import static org.jooq.SQLDialect.FIREBIRD; // ... // ... // ... +// ... import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... import static org.jooq.conf.ParamType.INLINED; +import static org.jooq.impl.DSL.name; +import static org.jooq.impl.DSL.selectFrom; +import static org.jooq.impl.DSL.table; import static org.jooq.impl.Keywords.K_ALTER; import static org.jooq.impl.Keywords.K_AS; import static org.jooq.impl.Keywords.K_CREATE; @@ -209,7 +213,9 @@ final class CreateViewImpl extends AbstractRowCountQuery imple private final void accept0(Context ctx) { Field[] f = fields; + // [#2059] MemSQL doesn't support column aliases at the view level boolean rename = f != null && f.length > 0; + boolean renameSupported = true ; boolean replaceSupported = false ; @@ -252,7 +258,7 @@ final class CreateViewImpl extends AbstractRowCountQuery imple ctx.visit(view); - if (rename) { + if (rename && renameSupported) { boolean qualify = ctx.qualify(); ctx.sql('(') @@ -268,7 +274,10 @@ final class CreateViewImpl extends AbstractRowCountQuery imple .formatSeparator() .start(CREATE_VIEW_AS) .paramType(INLINED) - .visit(select) + .visit( + rename && !renameSupported + ? selectFrom(table(parsed()).as(name("t"), Tools.fieldNames(f))) + : select) .paramType(paramType) .end(CREATE_VIEW_AS); } diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java index 754386c8c5..c9a271f52a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java @@ -93,6 +93,7 @@ final class CurrentSchema extends AbstractFunction { + case MARIADB: case MYSQL: return DSL.field("{database}()", VARCHAR); diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 492b89c906..6af866d631 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -56,6 +56,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.MYSQL; // ... @@ -7585,7 +7586,7 @@ public class DSL { * @see DSLContext#dropSchema(String) */ @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - public static DropSchemaStep dropSchema(String schema){ + public static DropSchemaStep dropSchema(String schema) { return dsl().dropSchema(schema); } @@ -7595,7 +7596,7 @@ public class DSL { * @see DSLContext#dropSchema(Name) */ @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - public static DropSchemaStep dropSchema(Name schema){ + public static DropSchemaStep dropSchema(Name schema) { return dsl().dropSchema(schema); } @@ -7605,7 +7606,7 @@ public class DSL { * @see DSLContext#dropSchema(Schema) */ @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - public static DropSchemaStep dropSchema(Schema schema){ + public static DropSchemaStep dropSchema(Schema schema) { return dsl().dropSchema(schema); } @@ -7615,7 +7616,7 @@ public class DSL { * @see DSLContext#dropSchemaIfExists(String) */ @Support({ H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - public static DropSchemaStep dropSchemaIfExists(String schema){ + public static DropSchemaStep dropSchemaIfExists(String schema) { return dsl().dropSchemaIfExists(schema); } @@ -7625,7 +7626,7 @@ public class DSL { * @see DSLContext#dropSchemaIfExists(Name) */ @Support({ H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - public static DropSchemaStep dropSchemaIfExists(Name schema){ + public static DropSchemaStep dropSchemaIfExists(Name schema) { return dsl().dropSchemaIfExists(schema); } @@ -7635,7 +7636,7 @@ public class DSL { * @see DSLContext#dropSchemaIfExists(Schema) */ @Support({ H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - public static DropSchemaStep dropSchemaIfExists(Schema schema){ + public static DropSchemaStep dropSchemaIfExists(Schema schema) { return dsl().dropSchemaIfExists(schema); } @@ -18202,6 +18203,7 @@ public class DSL { *

  • {@link SQLDialect#CUBRID}
    • *
  • {@link SQLDialect#H2}
    • *
  • {@link SQLDialect#HSQLDB}
    • + *
  • {@link SQLDialect#MEMSQL} (but without ORDER BY)
    • *
  • {@link SQLDialect#MYSQL}
    • *
  • {@link SQLDialect#SQLITE} (but without ORDER BY)
    • * @@ -18230,6 +18232,7 @@ public class DSL { *
  • {@link SQLDialect#CUBRID}
    • *
  • {@link SQLDialect#H2}
    • *
  • {@link SQLDialect#HSQLDB}
    • + *
  • {@link SQLDialect#MEMSQL}
    • *
  • {@link SQLDialect#MYSQL}
    • *
  • {@link SQLDialect#SQLITE}
    • * diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java index cbce731e70..2d270c354d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java @@ -78,6 +78,7 @@ final class DateAdd extends AbstractFunction { + case CUBRID: case MARIADB: case MYSQL: { diff --git a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java index de4254d46f..e3defc4ec0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java @@ -69,6 +69,7 @@ final class DateDiff extends AbstractFunction { + case MARIADB: case MYSQL: return function("datediff", getDataType(), date1, date2); diff --git a/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java b/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java index 46aee0eaa6..f4869c403a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java @@ -78,6 +78,7 @@ final class DateOrTime extends AbstractFunction { + case MYSQL: case MARIADB: return DSL.field("{" + name(getDataType()) + "}({0})", getDataType(), field); diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index 2307b81d7b..af508de305 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 5fabe5f043..f490d7d2d2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -3710,6 +3710,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri + case CUBRID: case MARIADB: case MYSQL: { diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java index 9e5cac8d14..a455360681 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java @@ -56,6 +56,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -199,7 +200,8 @@ final class DeleteQueryImpl extends AbstractDMLQuery implem - if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family())) { + // [#2059] MemSQL does not support DELETE ... ORDER BY + if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family()) ) { Field[] keyFields = table().getKeys().isEmpty() ? new Field[] { table().rowid() } diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java index ddb84b420e..e0f8c393a4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/Dual.java b/jOOQ/src/main/java/org/jooq/impl/Dual.java index 66e94d5bc0..90d75084b1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Dual.java +++ b/jOOQ/src/main/java/org/jooq/impl/Dual.java @@ -190,6 +190,7 @@ final class Dual extends AbstractTable { + default: ctx.sql("dual"); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java index dfa09fc7ea..4d97c0dd4d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Euler.java +++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java @@ -80,6 +80,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 e133f1ff2b..a6b6550da8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java @@ -103,6 +103,7 @@ final class ExplainQuery { + case MARIADB: case MYSQL: case POSTGRES: diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java index ceb51248b9..a125ce69c6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Expression.java +++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java @@ -299,6 +299,7 @@ final class Expression extends AbstractFunction { + case CUBRID: case MARIADB: case MYSQL: { @@ -608,6 +609,7 @@ final class Expression extends AbstractFunction { + case CUBRID: case MARIADB: case MYSQL: { diff --git a/jOOQ/src/main/java/org/jooq/impl/Extract.java b/jOOQ/src/main/java/org/jooq/impl/Extract.java index 8a8d847aad..112ee9fcdf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Extract.java +++ b/jOOQ/src/main/java/org/jooq/impl/Extract.java @@ -271,6 +271,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 f545a59fa3..91a8591174 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java @@ -98,6 +98,7 @@ final class FieldCondition extends AbstractCondition { + // Native support case DERBY: case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java index 4965a9b1a4..f6aae76769 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java @@ -41,7 +41,6 @@ import static java.lang.Boolean.TRUE; import static org.jooq.Clause.FIELD_ROW; import static org.jooq.Clause.INSERT_SELECT; import static org.jooq.Clause.INSERT_VALUES; -// ... import static org.jooq.impl.DSL.name; import static org.jooq.impl.DSL.table; import static org.jooq.impl.Keywords.K_DEFAULT_VALUES; @@ -161,6 +160,7 @@ final class FieldMapsForInsert extends AbstractQueryPart { + case FIREBIRD: { @@ -192,6 +192,16 @@ final class FieldMapsForInsert extends AbstractQueryPart { + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index ce44558a88..506155b991 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -47,6 +47,7 @@ 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.MYSQL; import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.POSTGRES; @@ -150,7 +151,7 @@ class Function extends AbstractField implements private static final EnumSet SUPPORT_ARRAY_AGG = EnumSet.of(HSQLDB, POSTGRES); private static final EnumSet SUPPORT_GROUP_CONCAT = EnumSet.of(CUBRID, H2, HSQLDB, MARIADB, MYSQL, SQLITE); private static final EnumSet SUPPORT_STRING_AGG = EnumSet.of(POSTGRES); - private static final EnumSet SUPPORT_NO_PARENS_WINDOW_REFERENCE = EnumSet.of(MYSQL, POSTGRES); + private static final EnumSet SUPPORT_NO_PARENS_WINDOW_REFERENCE = EnumSet.of(/* -- See [#8279] */, MYSQL, POSTGRES); private static final EnumSet SUPPORT_FILTER = EnumSet.of(H2, HSQLDB, POSTGRES); static final Field ASTERISK = DSL.field("*", Integer.class); diff --git a/jOOQ/src/main/java/org/jooq/impl/Identifiers.java b/jOOQ/src/main/java/org/jooq/impl/Identifiers.java index 48b4045e3d..b5947f520e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Identifiers.java +++ b/jOOQ/src/main/java/org/jooq/impl/Identifiers.java @@ -75,6 +75,7 @@ final class Identifiers { + case MARIADB: case MYSQL: QUOTES.put(family, new char[][][] { diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java index 6de3993aa2..f6e2b3c33f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java @@ -48,6 +48,7 @@ import static org.jooq.Clause.INSERT_SELECT; // ... import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... @@ -291,6 +292,7 @@ final class InsertQueryImpl extends AbstractStoreQuery impl + case CUBRID: case H2: case MARIADB: @@ -602,6 +604,7 @@ final class InsertQueryImpl extends AbstractStoreQuery impl + case DERBY: case MARIADB: case MYSQL: diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java index 912d456923..56a876ef48 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.DERBY; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java index f0a28846cf..fc81df694e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java +++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java @@ -78,6 +78,7 @@ final class Keywords { static final Keyword K_CASE = keyword("case"); static final Keyword K_CAST = keyword("cast"); static final Keyword K_CATALOG = keyword("catalog"); + static final Keyword K_CHANGE = keyword("change"); static final Keyword K_CHANGE_COLUMN = keyword("change column"); static final Keyword K_CHECK = keyword("check"); static final Keyword K_COALESCE = keyword("coalesce"); diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java index 62b5aef9d2..0ea90f1e76 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Left.java +++ b/jOOQ/src/main/java/org/jooq/impl/Left.java @@ -82,6 +82,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 858bc9b762..96d020cde5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Limit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java @@ -276,6 +276,7 @@ final class Limit extends AbstractQueryPart { + // [#4785] OFFSET cannot be without LIMIT diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java index 865a0bd2ef..6e7655956e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MD5.java +++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java @@ -75,6 +75,7 @@ final class MD5 extends AbstractFunction { + case MARIADB: case MYSQL: default: diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index 3202d7da19..009dd59fd4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -1294,6 +1294,7 @@ implements + case MARIADB: case MYSQL: toSQLMySQLOnDuplicateKeyUpdate(ctx); diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index f2323734b5..74168deb19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -79,6 +79,7 @@ package org.jooq.impl; // ... import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.SQLITE; // ... @@ -142,8 +143,8 @@ final class MetaImpl extends AbstractMeta { private static final long serialVersionUID = 3582980783173033809L; private static final JooqLogger log = JooqLogger.getLogger(MetaImpl.class); - private static final EnumSet INVERSE_SCHEMA_CATALOG = EnumSet.of(MYSQL, MARIADB); - private static final EnumSet CURRENT_TIMESTAMP_COLUMN_DEFAULT = EnumSet.of(MYSQL, MARIADB); + private static final EnumSet INVERSE_SCHEMA_CATALOG = EnumSet.of(MARIADB, MYSQL); + private static final EnumSet CURRENT_TIMESTAMP_COLUMN_DEFAULT = EnumSet.of(MARIADB, MYSQL); private static final EnumSet EXPRESSION_COLUMN_DEFAULT = EnumSet.of(H2); diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java index 118ca4d340..5082ce3783 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotField.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java @@ -85,6 +85,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 9ff8adc8c0..06e04b6fc2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java @@ -86,6 +86,7 @@ final class Nvl extends AbstractFunction { + case MARIADB: case MYSQL: case SQLITE: diff --git a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java index c40583f3cd..b04b90a1fa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java @@ -74,6 +74,7 @@ final class RegexpLike extends AbstractCondition { + case CUBRID: case H2: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java index dfcd72664a..7a1b909d4f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java @@ -72,6 +72,7 @@ final class Repeat extends AbstractFunction { + case FIREBIRD: return DSL.rpad(string, DSL.length(string).mul(count), string); diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java index 18f2c7d690..7767ee9a79 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Replace.java +++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java @@ -87,6 +87,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 9ba04d118b..bb70b1a06f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java +++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java @@ -73,6 +73,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 8fe22ab2a6..c8b5f4b889 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Right.java +++ b/jOOQ/src/main/java/org/jooq/impl/Right.java @@ -84,6 +84,7 @@ final class Right extends AbstractFunction { + case CUBRID: case FIREBIRD: case H2: diff --git a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java index f6b2ce4e77..def616186d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java @@ -54,6 +54,7 @@ import static org.jooq.SQLDialect.H2; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java index ea8fad0520..085601d2dc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java @@ -60,6 +60,7 @@ import static org.jooq.SQLDialect.FIREBIRD; // ... // ... // ... +// ... import static org.jooq.impl.Keywords.K_NOT; import java.util.ArrayList; diff --git a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java index df8fce12eb..4f50185dc9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.FIREBIRD; // ... // ... // ... +// ... import static org.jooq.SQLDialect.SQLITE; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/RowIsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/RowIsDistinctFrom.java index 2ab4f1b1ab..f42f124605 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowIsDistinctFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowIsDistinctFrom.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.DERBY; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java b/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java index c2a7969356..b157fab4f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java index 824325db30..6b786d48ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.SQLITE; diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java index 9bc0d1ec09..64ae83becb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -105,6 +106,7 @@ import org.jooq.util.hsqldb.HSQLDBDataType; // ... // ... import org.jooq.util.mariadb.MariaDBDataType; +// ... import org.jooq.util.mysql.MySQLDataType; // ... import org.jooq.util.postgres.PostgresDataType; @@ -699,6 +701,9 @@ public final class SQLDataType { + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index e7d0ffad85..26a4398e9f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -74,6 +74,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... @@ -211,7 +212,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp private static final EnumSet NO_SUPPORT_FOR_UPDATE = EnumSet.of(CUBRID); private static final EnumSet NO_SUPPORT_FOR_UPDATE_QUALIFIED = EnumSet.of(DERBY, FIREBIRD, H2, HSQLDB); private static final EnumSet SUPPORT_SELECT_INTO_TABLE = EnumSet.of(HSQLDB, POSTGRES); - static final EnumSet SUPPORT_WINDOW_CLAUSE = EnumSet.of(H2, MYSQL, POSTGRES /*, SQLITE -- See [#8279] [#8548] */); + static final EnumSet SUPPORT_WINDOW_CLAUSE = EnumSet.of(H2 /* -- See [#8279] */, MYSQL, POSTGRES /*, SQLITE -- See [#8279] [#8548] */); private static final EnumSet REQUIRES_FROM_CLAUSE = EnumSet.of(CUBRID, DERBY, FIREBIRD, HSQLDB, MARIADB, MYSQL); private static final EnumSet REQUIRES_DERIVED_TABLE_DML = EnumSet.of(MARIADB, MYSQL); private static final EnumSet EMULATE_EMPTY_GROUP_BY_OTHER = EnumSet.of(FIREBIRD, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE); @@ -690,6 +691,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp + case CUBRID: @@ -731,6 +733,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp + case MARIADB: case MYSQL: context.formatSeparator() @@ -1661,6 +1664,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp + ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java index 6dd90c1cbd..22dca4ffcb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java @@ -66,6 +66,7 @@ final class SetCatalog extends AbstractRowCountQuery { + case MARIADB: case MYSQL: ctx.visit(K_USE).sql(' ').visit(catalog); diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java index 5239046e60..89cbb9dbc2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java @@ -74,6 +74,7 @@ final class SetSchema extends AbstractRowCountQuery { + case MARIADB: case MYSQL: ctx.visit(K_USE).sql(' ').visit(schema); diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java index 3c045e3e7c..8afaaf836a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java @@ -79,6 +79,7 @@ final class Sinh extends AbstractFunction { + case CUBRID: case HSQLDB: case MARIADB: diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java index c84e094ad7..0745b172c5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java @@ -122,6 +122,7 @@ final class SortFieldImpl extends AbstractQueryPart implements SortField { + // These OSS dialects don't support this syntax at all case CUBRID: 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 717df253aa..77b72cf1d3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Space.java +++ b/jOOQ/src/main/java/org/jooq/impl/Space.java @@ -69,6 +69,7 @@ final class Space extends AbstractFunction { + case DERBY: case FIREBIRD: case HSQLDB: diff --git a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java index debff3bf3d..98c59bbda5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java @@ -43,6 +43,7 @@ import static java.lang.Boolean.TRUE; import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java index 7b4c1f9ddb..8075358e91 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java @@ -79,6 +79,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 f64eedfb7f..748fba6e75 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Term.java +++ b/jOOQ/src/main/java/org/jooq/impl/Term.java @@ -87,6 +87,7 @@ enum Term { + case DERBY: case SQLITE: return "8 * length"; @@ -148,6 +149,7 @@ enum Term { + case CUBRID: case H2: case HSQLDB: diff --git a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java index 3a6cd820a8..d32729bd3e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java +++ b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java @@ -131,6 +131,7 @@ final class TimestampDiff extends AbstractFunction { + case MARIADB: case MYSQL: return DSL.field("{timestampdiff}(microsecond, {0}, {1}) / 1000", getDataType(), timestamp2, timestamp1); diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index d5724e2699..65c75ebd66 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; +// ... import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -4518,6 +4519,7 @@ final class Tools { + case H2: case MARIADB: case MYSQL: ctx.sql(' ').visit(K_AUTO_INCREMENT); break; @@ -4559,6 +4561,7 @@ final class Tools { + case H2: case MARIADB: case MYSQL: { diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java index 8f96abdd67..4976abb212 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java @@ -101,6 +101,7 @@ final class Trunc extends AbstractFunction { + case H2: case MARIADB: case MYSQL: diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java index 73ee18b79a..2459537b14 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java @@ -58,6 +58,7 @@ import static org.jooq.SQLDialect.HSQLDB; // ... // ... // ... +// ... import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.POSTGRES; // ... @@ -648,7 +649,8 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl break; } - if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family())) { + // [#2059] MemSQL does not support UPDATE ... ORDER BY + if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family()) ) { Field[] keyFields = table().getKeys().isEmpty() ? new Field[] { table().rowid() } diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java index 3035e1b015..72b4ce96ae 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Values.java +++ b/jOOQ/src/main/java/org/jooq/impl/Values.java @@ -112,6 +112,7 @@ final class Values extends AbstractTable { + case FIREBIRD: case MARIADB: case MYSQL: { diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java index e6ef239320..fdfda95930 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java @@ -43,6 +43,7 @@ import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.H2; // ... +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/util/memsql/MemSQLDataType.java b/jOOQ/src/main/java/org/jooq/util/memsql/MemSQLDataType.java new file mode 100644 index 0000000000..19d2671d89 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/util/memsql/MemSQLDataType.java @@ -0,0 +1,141 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: http://www.jooq.org/licenses + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ + +package org.jooq.util.memsql; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Date; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.UUID; + +import org.jooq.DataType; +import org.jooq.SQLDialect; +import org.jooq.impl.DefaultDataType; +import org.jooq.impl.SQLDataType; +import org.jooq.types.UByte; +import org.jooq.types.UInteger; +import org.jooq.types.ULong; +import org.jooq.types.UShort; + +/** + * Supported data types for the {@link SQLDialect#MEMSQL} dialect + * + * @author Knut Wannheden + * @see https://docs.memsql.com/sql-reference/v6.7/datatypes/ + * @deprecated - 3.11.0 - [#7375] - This type is part of jOOQ's internal API. Do + * not reference this type directly from client code. Referencing + * this type before the {@link SQLDataType} class has been + * initialised may lead to deadlocks! See https://github.com/jOOQ/jOOQ/issues/3777 + * for details. + *

    + * Use the corresponding {@link SQLDataType} instead. + */ +@Deprecated +public class MemSQLDataType { + + // ------------------------------------------------------------------------- + // Default SQL data types and synonyms thereof + // ------------------------------------------------------------------------- + + public static final DataType TINYINT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.TINYINT, "tinyint", "signed"); + public static final DataType TINYINTUNSIGNED = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.TINYINTUNSIGNED, "tinyint unsigned", "unsigned"); + public static final DataType SMALLINT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.SMALLINT, "smallint", "signed"); + public static final DataType SMALLINTUNSIGNED = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.SMALLINTUNSIGNED, "smallint unsigned", "unsigned"); + public static final DataType INT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.INTEGER, "int", "signed"); + public static final DataType INTUNSIGNED = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.INTEGERUNSIGNED, "int unsigned", "unsigned"); + public static final DataType MEDIUMINT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.INTEGER, "mediumint", "signed"); + public static final DataType MEDIUMINTUNSIGNED = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.INTEGERUNSIGNED, "mediumint unsigned", "unsigned"); + public static final DataType INTEGER = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.INTEGER, "integer", "signed"); + public static final DataType INTEGERUNSIGNED = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.INTEGERUNSIGNED, "integer unsigned", "unsigned"); + public static final DataType BIGINT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BIGINT, "bigint", "signed"); + public static final DataType BIGINTUNSIGNED = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BIGINTUNSIGNED, "bigint unsigned", "unsigned"); + public static final DataType DOUBLE = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.DOUBLE, "double", "decimal"); + public static final DataType FLOAT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.FLOAT, "float", "decimal"); + public static final DataType REAL = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.REAL, "real", "decimal"); + public static final DataType BOOLEAN = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BOOLEAN, "boolean", "unsigned"); + public static final DataType BOOL = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BOOLEAN, "bool", "unsigned"); + public static final DataType BIT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BIT, "bit", "unsigned"); + public static final DataType DECIMAL = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.DECIMAL, "decimal", "decimal"); + public static final DataType DEC = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.DECIMAL, "dec", "decimal"); + public static final DataType VARCHAR = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.VARCHAR, "varchar", "char"); + public static final DataType CHAR = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.CHAR, "char", "char"); + public static final DataType TEXT = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.CLOB, "text", "char"); + public static final DataType BLOB = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BLOB, "blob", "binary"); + public static final DataType BINARY = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.BINARY, "binary", "binary"); + public static final DataType VARBINARY = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.VARBINARY, "varbinary", "binary"); + public static final DataType DATE = new DefaultDataType(SQLDialect.MEMSQL, SQLDataType.DATE, "date", "date"); + public static final DataType