From 3caca1827870e95a1dbf3fb477995ec7b0ae0da8 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 19 Aug 2015 18:07:08 +0200 Subject: [PATCH] [#4464] Emulate H2's MERGE statement for PostgreSQL 9.5 --- jOOQ/src/main/java/org/jooq/DSLContext.java | 45 +++++----- .../src/main/java/org/jooq/MergeKeyStep1.java | 5 +- .../main/java/org/jooq/MergeKeyStep10.java | 5 +- .../main/java/org/jooq/MergeKeyStep11.java | 5 +- .../main/java/org/jooq/MergeKeyStep12.java | 5 +- .../main/java/org/jooq/MergeKeyStep13.java | 5 +- .../main/java/org/jooq/MergeKeyStep14.java | 5 +- .../main/java/org/jooq/MergeKeyStep15.java | 5 +- .../main/java/org/jooq/MergeKeyStep16.java | 5 +- .../main/java/org/jooq/MergeKeyStep17.java | 5 +- .../main/java/org/jooq/MergeKeyStep18.java | 5 +- .../main/java/org/jooq/MergeKeyStep19.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep2.java | 5 +- .../main/java/org/jooq/MergeKeyStep20.java | 5 +- .../main/java/org/jooq/MergeKeyStep21.java | 5 +- .../main/java/org/jooq/MergeKeyStep22.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep3.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep4.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep5.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep6.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep7.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep8.java | 5 +- .../src/main/java/org/jooq/MergeKeyStep9.java | 5 +- .../main/java/org/jooq/MergeValuesStep1.java | 7 +- .../main/java/org/jooq/MergeValuesStep10.java | 7 +- .../main/java/org/jooq/MergeValuesStep11.java | 7 +- .../main/java/org/jooq/MergeValuesStep12.java | 7 +- .../main/java/org/jooq/MergeValuesStep13.java | 7 +- .../main/java/org/jooq/MergeValuesStep14.java | 7 +- .../main/java/org/jooq/MergeValuesStep15.java | 7 +- .../main/java/org/jooq/MergeValuesStep16.java | 7 +- .../main/java/org/jooq/MergeValuesStep17.java | 7 +- .../main/java/org/jooq/MergeValuesStep18.java | 7 +- .../main/java/org/jooq/MergeValuesStep19.java | 7 +- .../main/java/org/jooq/MergeValuesStep2.java | 7 +- .../main/java/org/jooq/MergeValuesStep20.java | 7 +- .../main/java/org/jooq/MergeValuesStep21.java | 7 +- .../main/java/org/jooq/MergeValuesStep22.java | 7 +- .../main/java/org/jooq/MergeValuesStep3.java | 7 +- .../main/java/org/jooq/MergeValuesStep4.java | 7 +- .../main/java/org/jooq/MergeValuesStep5.java | 7 +- .../main/java/org/jooq/MergeValuesStep6.java | 7 +- .../main/java/org/jooq/MergeValuesStep7.java | 7 +- .../main/java/org/jooq/MergeValuesStep8.java | 7 +- .../main/java/org/jooq/MergeValuesStep9.java | 7 +- jOOQ/src/main/java/org/jooq/impl/DSL.java | 88 +++++++++---------- .../java/org/jooq/impl/InsertQueryImpl.java | 6 +- .../main/java/org/jooq/impl/MergeImpl.java | 58 +++++++++--- 48 files changed, 270 insertions(+), 191 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 30c2f4d22c..b8ae861569 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... import static org.jooq.SQLDialect.SQLITE; // ... @@ -4650,7 +4651,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep1 mergeInto(Table table, Field field1); /** @@ -4680,7 +4681,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep2 mergeInto(Table table, Field field1, Field field2); /** @@ -4710,7 +4711,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3); /** @@ -4740,7 +4741,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4); /** @@ -4770,7 +4771,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5); /** @@ -4800,7 +4801,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); /** @@ -4830,7 +4831,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); /** @@ -4860,7 +4861,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); /** @@ -4890,7 +4891,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -4920,7 +4921,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -4950,7 +4951,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -4980,7 +4981,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5010,7 +5011,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5040,7 +5041,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5070,7 +5071,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5100,7 +5101,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5130,7 +5131,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5160,7 +5161,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5190,7 +5191,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5220,7 +5221,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5250,7 +5251,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); /** @@ -5280,7 +5281,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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] diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java index af250d2d6b..76fb905ceb 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep1 extends MergeValuesStep1PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep1 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep1 extends MergeValuesStep1PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep1 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java index 38e98d98e1..f593fb98eb 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep10PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep10 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep10PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep10 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java index 5b11c7f06f..b9d9a518b4 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep11PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep11 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep11PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep11 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java index ccfff85965..491698272a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep12PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep12 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep12PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep12 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java index 4d0de62b8a..b984b29191 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep13PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep13 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep13PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep13 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java index 364df444d8..a8af3ec406 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep14PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep14 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep14PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep14 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java index 63f0dbe6c0..da70b63101 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep15PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep15 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep15PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep15 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java index 2d339a4022..88453b3780 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep16PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep16 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep16PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep16 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java index 116be1ff1c..76bd9e4241 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep17PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep17 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep17PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep17 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java index ec14f17c8a..da8055587c 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep18PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep18 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep18PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep18 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java index 2910dfb137..53436b052f 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep19PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep19 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep19PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep19 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java index 2ec631b0fe..875723e85f 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep2 extends MergeValuesStep * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep2 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep2 extends MergeValuesStep * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep2 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java index f78d0a1df7..f8ffbb3d8c 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep20PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep20 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep20PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep20 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java index 50f6aa48b2..2778c8daa4 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep21PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep21 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep21PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep21 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java index 7ff0367a84..ee5d46ede6 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep22PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep22 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep22PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep22 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java index 0e90d349d4..8b1da80d5e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep3 extends MergeValues * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep3 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep3 extends MergeValues * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep3 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java index e69526e74f..8f0d37598c 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep4 extends MergeVa * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep4 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep4 extends MergeVa * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep4 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java index 9e2af4b50c..bb420ae88b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep5 extends Mer * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep5 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep5 extends Mer * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep5 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java index 70aecceab7..a820d3a3e4 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep6 extends * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep6 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep6 extends * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep6 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java index 1b1e37c757..e5a73cac1a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep7 ext * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep7 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep7 ext * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep7 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java index c52b3b0ab4..52920a3c33 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep8 * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep8 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep8 * Use this optional clause in order to override using the underlying * PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep8 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java index 47847a9060..a0dea0fcd0 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -76,7 +77,7 @@ public interface MergeKeyStep9PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep9 key(Field... keys); /** @@ -85,6 +86,6 @@ public interface MergeKeyStep9PRIMARY KEY. */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) MergeValuesStep9 key(Collection> keys); } diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java index 7a4de81bf6..8443f767b5 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep1 { /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(T1 value1); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(Field value1); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 517f038c31..6670de9436 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep10VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 8eea63fb77..ce0cdcd61e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep11VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 5049f465cc..ee8d352628 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep12VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 f5b80e15eb..6709bbd368 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep13VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 dc2c6c27ec..e054e1af0d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep14VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 c5f4914f42..4bc8f29e9a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep15VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 382096d344..8adffd9930 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep16VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 8d4f10f7cb..d47080aaa2 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep17VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 f6b9125aaa..aab36dc2da 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep18VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 2ac333a5ff..f9dcd48736 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep19VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 b34f0b1d40..d23367ccb8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep2 { /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(Field value1, Field value2); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 66ddf637cd..cf5d8fa471 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep20VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 209f7dbac2..e059cf956a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep21VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 d6d8e82414..50a5970248 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep22VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 3c2b9d8e22..6c443ffa21 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep3 { /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 bb7302de85..d593143c17 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep4 { /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 d01430ff9c..1f59284e9e 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep5 { /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 dcdccca005..7ce3597a6d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep6 { /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6); /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 16fc9ae737..3209964161 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep7 /** * Specify a VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 b808d4702d..e39cc5759b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep8VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 d1692b0882..ca2cdc55d0 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java @@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.H2; // ... import static org.jooq.SQLDialect.HSQLDB; // ... +import static org.jooq.SQLDialect.POSTGRES_9_5; // ... // ... @@ -72,19 +73,19 @@ public interface MergeValuesStep9VALUES clause */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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 fb8f1278b9..509b32b00e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -3478,9 +3478,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) public static MergeKeyStep1 mergeInto(Table table, Field field1) { - return using(new DefaultConfiguration()).mergeInto(table, field1); + return using(new DefaultConfiguration()).mergeInto(table, field1); } /** @@ -3510,9 +3510,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) public static MergeKeyStep2 mergeInto(Table table, Field field1, Field field2) { - return using(new DefaultConfiguration()).mergeInto(table, field1, field2); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2); } /** @@ -3542,9 +3542,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 }) public static MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3) { - return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3); } /** @@ -3574,9 +3574,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4); } /** @@ -3606,9 +3606,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5); } /** @@ -3638,9 +3638,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6); } /** @@ -3670,9 +3670,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7); } /** @@ -3702,9 +3702,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8); } /** @@ -3734,9 +3734,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9); } /** @@ -3766,9 +3766,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10); } /** @@ -3798,9 +3798,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11); } /** @@ -3830,9 +3830,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12); } /** @@ -3862,9 +3862,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13); } /** @@ -3894,9 +3894,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14); } /** @@ -3926,9 +3926,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15); } /** @@ -3958,9 +3958,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16); } /** @@ -3990,9 +3990,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17); } /** @@ -4022,9 +4022,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18); } /** @@ -4054,9 +4054,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + 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); } /** @@ -4086,9 +4086,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + 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); } /** @@ -4118,9 +4118,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + 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); } /** @@ -4150,9 +4150,9 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field) */ @Generated("This method was generated using jOOQ-tools") - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, H2, HSQLDB, 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); + 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); } // [jooq-tools] END [merge] diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java index 771e704a9f..2ec17bb91a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java @@ -195,9 +195,13 @@ class InsertQueryImpl extends AbstractStoreQuery implements } ctx.sql(") ") - .keyword("do update set") + .keyword("do update") + .formatSeparator() + .keyword("set") .sql(' ') + .formatIndentLockStart() .visit(updateMap) + .formatIndentLockEnd() .end(INSERT_ON_DUPLICATE_KEY_UPDATE); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index ec58edbab9..be8ba3702c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -51,11 +51,10 @@ import static org.jooq.Clause.MERGE_VALUES; import static org.jooq.Clause.MERGE_WHEN_MATCHED_THEN_UPDATE; import static org.jooq.Clause.MERGE_WHEN_NOT_MATCHED_THEN_INSERT; import static org.jooq.Clause.MERGE_WHERE; -import static org.jooq.SQLDialect.H2; -// ... // ... import static org.jooq.impl.DSL.condition; import static org.jooq.impl.DSL.exists; +import static org.jooq.impl.DSL.insertInto; import static org.jooq.impl.DSL.notExists; import static org.jooq.impl.DSL.nullSafe; import static org.jooq.impl.Utils.DATA_WRAP_DERIVED_TABLES_IN_PARENTHESES; @@ -977,8 +976,10 @@ implements /** * Return a standard MERGE statement emulating the H2-specific syntax */ - private final QueryPart getStandardMerge(Configuration config) { - switch (config.dialect().family()) { + private final QueryPart getStandardMerge(Context ctx) { + Configuration config = ctx.configuration(); + + switch (ctx.family()) { /* [pro] xx xxxx xxxx xxxx xxxxxxxxx @@ -1092,16 +1093,24 @@ implements @Override public final void accept(Context ctx) { if (upsertStyle) { - if (ctx.family() == H2) { - toSQLH2Merge(ctx); - } - /* [pro] xx - xxxx xx xxxxxxxxxxxxx xx xxxxx x - xxxxxxxxxxxxxxxxxxxxx - x - xx [/pro] */ - else { - ctx.visit(getStandardMerge(ctx.configuration())); + switch (ctx.family()) { + case H2: + toSQLH2Merge(ctx); + break; + + case POSTGRES: + toPostgresInsertOnConflict(ctx); + break; + + /* [pro] xx + xxxx xxxxx + xxxxxxxxxxxxxxxxxxxxx + xxxxxx + xx [/pro] */ + + default: + ctx.visit(getStandardMerge(ctx)); + break; } } else { @@ -1109,6 +1118,27 @@ implements } } + private final void toPostgresInsertOnConflict(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) { + // TODO [#2529] This cannot be implemented yet +// ctx.visit(insertInto(table, getUpsertFields()) +// .select(upsertSelect) +// .onDuplicateKeyUpdate() +// .set(map)); + } + else { + ctx.visit(insertInto(table, getUpsertFields()) + .values(getUpsertValues()) + .onDuplicateKeyUpdate() + .set(map)); + } + } + private final void toSQLH2Merge(Context ctx) { ctx.keyword("merge into") .sql(' ')