[#2529] Cannot combine INSERT .. SELECT with INSERT .. ON DUPLICATE K…

…EY .. due to DSL API flaw
jOOQ · Aug 19, 2015 · 93f52fc · 93f52fc
1 parent 32831bf
commit 93f52fc
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 30 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep1.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep1.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep1<R extends Record, T1> extends InsertOnDuplica
      * {@link DSLContext#insertInto(Table, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record1<T1>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record1<T1>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep10.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep10.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep10<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep11.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep11.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep11<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep12.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep12.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep12<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep13.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep13.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep13<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep14.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep14.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep14<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep15.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep15.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep15<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep16.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep16.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep16<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep17.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep17.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep17<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep18.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep18.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep18<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep19.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep19.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep19<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep2.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep2.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep2<R extends Record, T1, T2> extends InsertOnDup
      * {@link DSLContext#insertInto(Table, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record2<T1, T2>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record2<T1, T2>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep20.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep20.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep20<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep21.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep21.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep21<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep22.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep22.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep22<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep3.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep3.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep3<R extends Record, T1, T2, T3> extends InsertO
      * {@link DSLContext#insertInto(Table, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record3<T1, T2, T3>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record3<T1, T2, T3>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep4.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep4.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep4<R extends Record, T1, T2, T3, T4> extends Ins
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record4<T1, T2, T3, T4>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record4<T1, T2, T3, T4>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep5.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep5.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep5<R extends Record, T1, T2, T3, T4, T5> extends
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record5<T1, T2, T3, T4, T5>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record5<T1, T2, T3, T4, T5>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep6.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep6.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep6<R extends Record, T1, T2, T3, T4, T5, T6> ext
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record6<T1, T2, T3, T4, T5, T6>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record6<T1, T2, T3, T4, T5, T6>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep7.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep7.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep7<R extends Record, T1, T2, T3, T4, T5, T6, T7>
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record7<T1, T2, T3, T4, T5, T6, T7>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record7<T1, T2, T3, T4, T5, T6, T7>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep8.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep8.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep8<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record8<T1, T2, T3, T4, T5, T6, T7, T8>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record8<T1, T2, T3, T4, T5, T6, T7, T8>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep9.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep9.java
@@ -91,5 +91,5 @@ public interface InsertValuesStep9<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
-    InsertReturningStep<R> select(Select<? extends Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> select);
+    InsertOnDuplicateStep<R> select(Select<? extends Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
@@ -57,6 +57,14 @@
 import org.jooq.InsertSetMoreStep;
 import org.jooq.InsertSetStep;
 import org.jooq.InsertValuesStep1;
+import org.jooq.InsertValuesStep2;
+import org.jooq.InsertValuesStep3;
+import org.jooq.InsertValuesStep4;
+import org.jooq.InsertValuesStep5;
+import org.jooq.InsertValuesStep6;
+import org.jooq.InsertValuesStep7;
+import org.jooq.InsertValuesStep8;
+import org.jooq.InsertValuesStep9;
 import org.jooq.InsertValuesStep10;
 import org.jooq.InsertValuesStep11;
 import org.jooq.InsertValuesStep12;
@@ -67,17 +75,9 @@
 import org.jooq.InsertValuesStep17;
 import org.jooq.InsertValuesStep18;
 import org.jooq.InsertValuesStep19;
-import org.jooq.InsertValuesStep2;
 import org.jooq.InsertValuesStep20;
 import org.jooq.InsertValuesStep21;
 import org.jooq.InsertValuesStep22;
-import org.jooq.InsertValuesStep3;
-import org.jooq.InsertValuesStep4;
-import org.jooq.InsertValuesStep5;
-import org.jooq.InsertValuesStep6;
-import org.jooq.InsertValuesStep7;
-import org.jooq.InsertValuesStep8;
-import org.jooq.InsertValuesStep9;
 import org.jooq.InsertValuesStepN;
 import org.jooq.Record;
 import org.jooq.Record1;