diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java index 56c30e4cb9..df49671b3b 100644 --- a/jOOQ/src/main/java/org/jooq/WithStep.java +++ b/jOOQ/src/main/java/org/jooq/WithStep.java @@ -2671,7 +2671,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep1 mergeInto(Table table, Field field1); @@ -2694,7 +2696,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep2 mergeInto(Table table, Field field1, Field field2); @@ -2717,7 +2721,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3); @@ -2740,7 +2746,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4); @@ -2763,7 +2771,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5); @@ -2786,7 +2796,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); @@ -2809,7 +2821,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); @@ -2832,7 +2846,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); @@ -2855,7 +2871,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9); @@ -2878,7 +2896,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10); @@ -2901,7 +2921,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -2924,7 +2946,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -2947,7 +2971,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -2970,7 +2996,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -2993,7 +3021,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3016,7 +3046,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3039,7 +3071,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3062,7 +3096,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3085,7 +3121,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3108,7 +3146,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3131,7 +3171,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); @@ -3154,7 +3196,9 @@ public interface WithStep extends QueryPart { * See {@link #mergeInto(Table)} for the standard MERGE statement * * + * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ + @Deprecated @Support({ H2 }) 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); diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index 7569c4ea57..c94714e088 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -976,111 +976,133 @@ implements @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1) { return mergeInto(table, Arrays.asList(field1)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2) { return mergeInto(table, Arrays.asList(field1, field2)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3) { return mergeInto(table, Arrays.asList(field1, field2, field3)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9)); } @Override + @Deprecated public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21)); } @Override + @Deprecated public final MergeImpl 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 mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); }