Skip to content

Commit

Permalink
[#4464] Emulate H2's MERGE statement for PostgreSQL 9.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukaseder
lukaseder committed Aug 19, 2015
1 parent 06abd6f commit 3caca18
Show file tree
Hide file tree
Showing 48 changed files with 270 additions and 191 deletions.
45 changes: 23 additions & 22 deletions jOOQ/src/main/java/org/jooq/DSLContext.java
View file
Expand Up @@ -55,6 +55,7 @@
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;
// ...
Expand Down Expand Up @@ -4650,7 +4651,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1> MergeKeyStep1<R, T1> mergeInto(Table<R> table, Field<T1> field1);

/**
Expand Down Expand Up @@ -4680,7 +4681,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2> MergeKeyStep2<R, T1, T2> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2);

/**
Expand Down Expand Up @@ -4710,7 +4711,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3> MergeKeyStep3<R, T1, T2, T3> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3);

/**
Expand Down Expand Up @@ -4740,7 +4741,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4> MergeKeyStep4<R, T1, T2, T3, T4> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4);

/**
Expand Down Expand Up @@ -4770,7 +4771,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5> MergeKeyStep5<R, T1, T2, T3, T4, T5> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5);

/**
Expand Down Expand Up @@ -4800,7 +4801,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6> MergeKeyStep6<R, T1, T2, T3, T4, T5, T6> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6);

/**
Expand Down Expand Up @@ -4830,7 +4831,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7> MergeKeyStep7<R, T1, T2, T3, T4, T5, T6, T7> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7);

/**
Expand Down Expand Up @@ -4860,7 +4861,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8> MergeKeyStep8<R, T1, T2, T3, T4, T5, T6, T7, T8> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8);

/**
Expand Down Expand Up @@ -4890,7 +4891,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9> MergeKeyStep9<R, T1, T2, T3, T4, T5, T6, T7, T8, T9> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9);

/**
Expand Down Expand Up @@ -4920,7 +4921,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> MergeKeyStep10<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10);

/**
Expand Down Expand Up @@ -4950,7 +4951,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> MergeKeyStep11<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11);

/**
Expand Down Expand Up @@ -4980,7 +4981,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> MergeKeyStep12<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12);

/**
Expand Down Expand Up @@ -5010,7 +5011,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> MergeKeyStep13<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13);

/**
Expand Down Expand Up @@ -5040,7 +5041,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> MergeKeyStep14<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14);

/**
Expand Down Expand Up @@ -5070,7 +5071,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> MergeKeyStep15<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15);

/**
Expand Down Expand Up @@ -5100,7 +5101,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> MergeKeyStep16<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16);

/**
Expand Down Expand Up @@ -5130,7 +5131,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> MergeKeyStep17<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17);

/**
Expand Down Expand Up @@ -5160,7 +5161,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> MergeKeyStep18<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18);

/**
Expand Down Expand Up @@ -5190,7 +5191,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> MergeKeyStep19<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19);

/**
Expand Down Expand Up @@ -5220,7 +5221,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> MergeKeyStep20<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20);

/**
Expand Down Expand Up @@ -5250,7 +5251,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> MergeKeyStep21<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21);

/**
Expand Down Expand Up @@ -5280,7 +5281,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
* </table>
*/
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MergeKeyStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);

// [jooq-tools] END [merge]
Expand Down
5 changes: 3 additions & 2 deletions jOOQ/src/main/java/org/jooq/MergeKeyStep1.java
View file
Expand Up @@ -46,6 +46,7 @@
// ...
import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.SQLDialect.POSTGRES_9_5;
// ...
// ...

Expand Down Expand Up @@ -76,7 +77,7 @@ public interface MergeKeyStep1<R extends Record, T1> extends MergeValuesStep1<R,
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep1<R, T1> key(Field<?>... keys);

/**
Expand All @@ -85,6 +86,6 @@ public interface MergeKeyStep1<R extends Record, T1> extends MergeValuesStep1<R,
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep1<R, T1> key(Collection<? extends Field<?>> keys);
}
5 changes: 3 additions & 2 deletions jOOQ/src/main/java/org/jooq/MergeKeyStep10.java
View file
Expand Up @@ -46,6 +46,7 @@
// ...
import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.SQLDialect.POSTGRES_9_5;
// ...
// ...

Expand Down Expand Up @@ -76,7 +77,7 @@ public interface MergeKeyStep10<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep10<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> key(Field<?>... keys);

/**
Expand All @@ -85,6 +86,6 @@ public interface MergeKeyStep10<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep10<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> key(Collection<? extends Field<?>> keys);
}
5 changes: 3 additions & 2 deletions jOOQ/src/main/java/org/jooq/MergeKeyStep11.java
View file
Expand Up @@ -46,6 +46,7 @@
// ...
import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.SQLDialect.POSTGRES_9_5;
// ...
// ...

Expand Down Expand Up @@ -76,7 +77,7 @@ public interface MergeKeyStep11<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep11<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> key(Field<?>... keys);

/**
Expand All @@ -85,6 +86,6 @@ public interface MergeKeyStep11<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep11<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> key(Collection<? extends Field<?>> keys);
}
5 changes: 3 additions & 2 deletions jOOQ/src/main/java/org/jooq/MergeKeyStep12.java
View file
Expand Up @@ -46,6 +46,7 @@
// ...
import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.SQLDialect.POSTGRES_9_5;
// ...
// ...

Expand Down Expand Up @@ -76,7 +77,7 @@ public interface MergeKeyStep12<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep12<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> key(Field<?>... keys);

/**
Expand All @@ -85,6 +86,6 @@ public interface MergeKeyStep12<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep12<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> key(Collection<? extends Field<?>> keys);
}
5 changes: 3 additions & 2 deletions jOOQ/src/main/java/org/jooq/MergeKeyStep13.java
View file
Expand Up @@ -46,6 +46,7 @@
// ...
import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.SQLDialect.POSTGRES_9_5;
// ...
// ...

Expand Down Expand Up @@ -76,7 +77,7 @@ public interface MergeKeyStep13<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep13<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> key(Field<?>... keys);

/**
Expand All @@ -85,6 +86,6 @@ public interface MergeKeyStep13<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8
* Use this optional clause in order to override using the underlying
* <code>PRIMARY KEY</code>.
*/
@Support({ CUBRID, H2, HSQLDB })
@Support({ CUBRID, H2, HSQLDB, POSTGRES_9_5 })
MergeValuesStep13<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> key(Collection<? extends Field<?>> keys);
}

0 comments on commit 3caca18

Please sign in to comment.