From 0fb1175b20e35f5c51a2d078a52c28dd67d917a3 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 8 Feb 2016 13:07:58 +0100 Subject: [PATCH] [#4480] Emulate H2's MERGE statement for MySQL and MariaDB --- jOOQ/src/main/java/org/jooq/DSLContext.java | 47 ++++++++--------- .../main/java/org/jooq/MergeUsingStep.java | 50 ++++++++++--------- .../main/java/org/jooq/MergeValuesStep1.java | 8 +-- .../main/java/org/jooq/MergeValuesStep10.java | 8 +-- .../main/java/org/jooq/MergeValuesStep11.java | 8 +-- .../main/java/org/jooq/MergeValuesStep12.java | 8 +-- .../main/java/org/jooq/MergeValuesStep13.java | 8 +-- .../main/java/org/jooq/MergeValuesStep14.java | 8 +-- .../main/java/org/jooq/MergeValuesStep15.java | 8 +-- .../main/java/org/jooq/MergeValuesStep16.java | 8 +-- .../main/java/org/jooq/MergeValuesStep17.java | 8 +-- .../main/java/org/jooq/MergeValuesStep18.java | 8 +-- .../main/java/org/jooq/MergeValuesStep19.java | 8 +-- .../main/java/org/jooq/MergeValuesStep2.java | 8 +-- .../main/java/org/jooq/MergeValuesStep20.java | 8 +-- .../main/java/org/jooq/MergeValuesStep21.java | 8 +-- .../main/java/org/jooq/MergeValuesStep22.java | 8 +-- .../main/java/org/jooq/MergeValuesStep3.java | 8 +-- .../main/java/org/jooq/MergeValuesStep4.java | 8 +-- .../main/java/org/jooq/MergeValuesStep5.java | 8 +-- .../main/java/org/jooq/MergeValuesStep6.java | 8 +-- .../main/java/org/jooq/MergeValuesStep7.java | 8 +-- .../main/java/org/jooq/MergeValuesStep8.java | 8 +-- .../main/java/org/jooq/MergeValuesStep9.java | 8 +-- jOOQ/src/main/java/org/jooq/impl/DSL.java | 44 ++++++++-------- .../java/org/jooq/impl/DefaultDSLContext.java | 1 - .../main/java/org/jooq/impl/MergeImpl.java | 22 ++++++++ 27 files changed, 204 insertions(+), 136 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index c704f8ee0b..dff9fa913c 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -6264,7 +6264,7 @@ public interface DSLContext extends Scope , AutoCloseable { * statement without field specification. See also * {@link #mergeInto(Table, Field...)} */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL }) MergeUsingStep mergeInto(Table table); // [jooq-tools] START [merge] @@ -6276,7 +6276,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep1 mergeInto(Table table, Field field1); /** @@ -6286,7 +6286,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep2 mergeInto(Table table, Field field1, Field field2); /** @@ -6296,7 +6296,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3); /** @@ -6306,7 +6306,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4); /** @@ -6316,7 +6316,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5); /** @@ -6326,7 +6326,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); /** @@ -6336,7 +6336,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); /** @@ -6346,7 +6346,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); /** @@ -6356,7 +6356,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9); /** @@ -6366,7 +6366,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10); /** @@ -6376,7 +6376,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11); /** @@ -6386,7 +6386,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12); /** @@ -6396,7 +6396,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13); /** @@ -6406,7 +6406,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14); /** @@ -6416,7 +6416,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15); /** @@ -6426,7 +6426,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16); /** @@ -6436,7 +6436,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17); /** @@ -6446,7 +6446,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18); /** @@ -6456,7 +6456,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19); /** @@ -6466,7 +6466,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20); /** @@ -6476,7 +6476,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21); /** @@ -6486,7 +6486,7 @@ public interface DSLContext extends Scope , AutoCloseable { * @see #mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); // [jooq-tools] END [merge] @@ -7704,6 +7704,7 @@ public interface DSLContext extends Scope , AutoCloseable { Record newRecord(Field... fields); // [jooq-tools] START [newRecord] + /** * Create a new empty {@link Record}. *

diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java index 4a85a5a199..cc2b9ed484 100644 --- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java @@ -47,6 +47,8 @@ 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_9_5; // ... @@ -126,7 +128,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * * */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL }) MergeKeyStepN columns(Field... fields); /** @@ -134,7 +136,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * * @see #columns(Field...) */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL }) MergeKeyStepN columns(Collection> fields); // [jooq-tools] START [columns] @@ -145,7 +147,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep1 columns(Field field1); /** @@ -155,7 +157,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep2 columns(Field field1, Field field2); /** @@ -165,7 +167,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep3 columns(Field field1, Field field2, Field field3); /** @@ -175,7 +177,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep4 columns(Field field1, Field field2, Field field3, Field field4); /** @@ -185,7 +187,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep5 columns(Field field1, Field field2, Field field3, Field field4, Field field5); /** @@ -195,7 +197,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep6 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); /** @@ -205,7 +207,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep7 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); /** @@ -215,7 +217,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep8 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); /** @@ -225,7 +227,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep9 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9); /** @@ -235,7 +237,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep10 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10); /** @@ -245,7 +247,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep11 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11); /** @@ -255,7 +257,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep12 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12); /** @@ -265,7 +267,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep13 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13); /** @@ -275,7 +277,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep14 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14); /** @@ -285,7 +287,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep15 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15); /** @@ -295,7 +297,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep16 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16); /** @@ -305,7 +307,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep17 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17); /** @@ -315,7 +317,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep18 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18); /** @@ -325,7 +327,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep19 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19); /** @@ -335,7 +337,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep20 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20); /** @@ -345,7 +347,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep21 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21); /** @@ -355,7 +357,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStep22 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); // [jooq-tools] END [columns] diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java index e579c94663..6f73b24fad 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep1 { /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java index c079f6250d..e8b7027b1c 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep10VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java index 0f74d5ba54..1072c54e57 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep11VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java index 63140f1da0..2b0eaf50da 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep12VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java index 101c9ce8d1..a293df5754 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep13VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java index c93b051bb2..ae675ba60e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep14VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java index 05ed540b5f..9354e5258b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep15VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java index d3290132dc..b56f9ea487 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep16VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java index 584a3a6e3d..f07ec239f6 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep17VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java index 9e223708ef..d708458d08 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep18VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java index 81533f85a4..f312dd6d3d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep19VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java index 661aae1d86..2b73503dbf 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep2 { /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java index fe0b7b1fa3..c6d68465f2 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep20VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19, T20 value20); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19, Field value20); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java index 42ae8dc7f2..1605f2d521 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep21VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19, T20 value20, T21 value21); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19, Field value20, Field value21); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java index d4dc277b9d..f19f167574 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep22VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19, T20 value20, T21 value21, T22 value22); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19, Field value20, Field value21, Field value22); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java index ba81787c8a..0b49c5463d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep3 { /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java index 512c4c93e0..8ed08367c3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep4 { /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java index 3d33bcd52f..1188cd950d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep5 { /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java index cb7cc398f2..a4b2d095a3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep6 { /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java index 4317eb842b..d7a404aa7e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep7 /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java index 1956ddc1a3..73b9b02553 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep8VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java index 314244173a..62cc8aaacd 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java @@ -46,6 +46,8 @@ import static org.jooq.SQLDialect.FIREBIRD_3_0; 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_9_5; // ... @@ -74,19 +76,19 @@ public interface MergeValuesStep9VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9); /** * Specify a VALUES clause */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) Merge values(Collection values); /** diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index e9f1d46bb8..cd3a4b8075 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -4432,7 +4432,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep1 mergeInto(Table table, Field field1) { return using(new DefaultConfiguration()).mergeInto(table, field1); } @@ -4444,7 +4444,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep2 mergeInto(Table table, Field field1, Field field2) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2); } @@ -4456,7 +4456,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3); } @@ -4468,7 +4468,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4); } @@ -4480,7 +4480,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5); } @@ -4492,7 +4492,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6); } @@ -4504,7 +4504,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7); } @@ -4516,7 +4516,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8); } @@ -4528,7 +4528,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9); } @@ -4540,7 +4540,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10); } @@ -4552,7 +4552,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11); } @@ -4564,7 +4564,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12); } @@ -4576,7 +4576,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13); } @@ -4588,7 +4588,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14); } @@ -4600,7 +4600,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15); } @@ -4612,7 +4612,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16); } @@ -4624,7 +4624,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17); } @@ -4636,7 +4636,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18); } @@ -4648,7 +4648,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19); } @@ -4660,7 +4660,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20); } @@ -4672,7 +4672,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21); } @@ -4684,7 +4684,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, POSTGRES_9_5 }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22) { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 5a0bb135cd..771b1d0b82 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -2750,7 +2750,6 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } // [jooq-tools] START [newRecord] - @Generated("This method was generated using jOOQ-tools") @Override public Record1 newRecord(Field field1) { diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index 6b19965580..f9447fb20b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -1279,6 +1279,11 @@ implements toSQLH2Merge(ctx); break; + case MARIADB: + case MYSQL: + toSQLMySQLOnDuplicateKeyUpdate(ctx); + break; + case POSTGRES: toPostgresInsertOnConflict(ctx); break; @@ -1299,6 +1304,23 @@ implements } } + private final void toSQLMySQLOnDuplicateKeyUpdate(Context ctx) { + Fields fields = new Fields(getUpsertFields()); + Map, Field> map = new LinkedHashMap, Field>(); + for (Field field : fields.fields) + map.put(field, getUpsertValues().get(fields.indexOf(field))); + + if (upsertSelect != null) { + ctx.sql("[ merge with select is not supported in MySQL / MariaDB ]"); + } + else { + ctx.visit(insertInto(table, getUpsertFields()) + .values(getUpsertValues()) + .onDuplicateKeyUpdate() + .set(map)); + } + } + private final void toPostgresInsertOnConflict(Context ctx) { Fields fields = new Fields(getUpsertFields()); Map, Field> map = new LinkedHashMap, Field>();