From 536cebfabae0e82dedf7027f51e049193939a3bb Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 21 Aug 2020 15:56:28 +0200 Subject: [PATCH] [jOOQ/jOOQ#8353] Fixed Record[N]::values for embeddables --- .../main/java/org/jooq/impl/RecordImpl1.java | 2 +- .../main/java/org/jooq/impl/RecordImpl10.java | 11 ++++++++- .../main/java/org/jooq/impl/RecordImpl11.java | 12 +++++++++- .../main/java/org/jooq/impl/RecordImpl12.java | 13 ++++++++++- .../main/java/org/jooq/impl/RecordImpl13.java | 14 ++++++++++- .../main/java/org/jooq/impl/RecordImpl14.java | 15 +++++++++++- .../main/java/org/jooq/impl/RecordImpl15.java | 16 ++++++++++++- .../main/java/org/jooq/impl/RecordImpl16.java | 17 +++++++++++++- .../main/java/org/jooq/impl/RecordImpl17.java | 18 ++++++++++++++- .../main/java/org/jooq/impl/RecordImpl18.java | 19 ++++++++++++++- .../main/java/org/jooq/impl/RecordImpl19.java | 20 +++++++++++++++- .../main/java/org/jooq/impl/RecordImpl2.java | 3 ++- .../main/java/org/jooq/impl/RecordImpl20.java | 21 ++++++++++++++++- .../main/java/org/jooq/impl/RecordImpl21.java | 22 +++++++++++++++++- .../main/java/org/jooq/impl/RecordImpl22.java | 23 ++++++++++++++++++- .../main/java/org/jooq/impl/RecordImpl3.java | 4 +++- .../main/java/org/jooq/impl/RecordImpl4.java | 5 +++- .../main/java/org/jooq/impl/RecordImpl5.java | 6 ++++- .../main/java/org/jooq/impl/RecordImpl6.java | 7 +++++- .../main/java/org/jooq/impl/RecordImpl7.java | 8 ++++++- .../main/java/org/jooq/impl/RecordImpl8.java | 9 +++++++- .../main/java/org/jooq/impl/RecordImpl9.java | 10 +++++++- 22 files changed, 253 insertions(+), 22 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java index 944bba331a..bb7372e6f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java @@ -95,7 +95,7 @@ class RecordImpl1 extends AbstractRecord implements InternalRecord, Record1< @Override public final Record1 values(T1 t1) { - fromArray(t1); + set(0, t1); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java index 1acdb04694..838b0487d7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java @@ -239,7 +239,16 @@ class RecordImpl10 extends AbstractReco @Override public final Record10 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java index af27d7c7ba..0ffcf6d0a3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java @@ -255,7 +255,17 @@ class RecordImpl11 extends Abstrac @Override public final Record11 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java index b00d67d066..e38f2c0b7f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java @@ -271,7 +271,18 @@ class RecordImpl12 extends Ab @Override public final Record12 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java index 6e5d4c627c..1dbf0a7466 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java @@ -287,7 +287,19 @@ class RecordImpl13 exten @Override public final Record13 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java index a820f45333..05aa0879a7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java @@ -303,7 +303,20 @@ class RecordImpl14 @Override public final Record14 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java index 9d22655f07..06e251273a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java @@ -319,7 +319,21 @@ class RecordImpl15 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java index 4f8721cb3a..8adb4fb978 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java @@ -335,7 +335,22 @@ class RecordImpl16 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java index bba701c3a8..76448005d7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java @@ -351,7 +351,23 @@ class RecordImpl17 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); + set(16, t17); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java index 5e47f64277..114ebd8fcd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java @@ -367,7 +367,24 @@ class RecordImpl18 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); + set(16, t17); + set(17, t18); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java index 1e307f8362..ab3e2edaec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java @@ -383,7 +383,25 @@ class RecordImpl19 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); + set(16, t17); + set(17, t18); + set(18, t19); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java index 28c747bfad..01a192a721 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java @@ -111,7 +111,8 @@ class RecordImpl2 extends AbstractRecord implements InternalRecord, Reco @Override public final Record2 values(T1 t1, T2 t2) { - fromArray(t1, t2); + set(0, t1); + set(1, t2); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java index ca31f92bc1..6a147588ba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java @@ -399,7 +399,26 @@ class RecordImpl20 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); + set(16, t17); + set(17, t18); + set(18, t19); + set(19, t20); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java index 8451023378..fd8a45b3aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java @@ -415,7 +415,27 @@ class RecordImpl21 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); + set(16, t17); + set(17, t18); + set(18, t19); + set(19, t20); + set(20, t21); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java index 3a6d6fcdc2..220f3f97a4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java @@ -431,7 +431,28 @@ class RecordImpl22 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); + set(9, t10); + set(10, t11); + set(11, t12); + set(12, t13); + set(13, t14); + set(14, t15); + set(15, t16); + set(16, t17); + set(17, t18); + set(18, t19); + set(19, t20); + set(20, t21); + set(21, t22); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java index c206631bc6..b504e86400 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java @@ -127,7 +127,9 @@ class RecordImpl3 extends AbstractRecord implements InternalRecord, @Override public final Record3 values(T1 t1, T2 t2, T3 t3) { - fromArray(t1, t2, t3); + set(0, t1); + set(1, t2); + set(2, t3); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java index 2c37574932..0f4d424a9f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java @@ -143,7 +143,10 @@ class RecordImpl4 extends AbstractRecord implements InternalReco @Override public final Record4 values(T1 t1, T2 t2, T3 t3, T4 t4) { - fromArray(t1, t2, t3, t4); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java index 22ec4d35e4..8b9e213df2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java @@ -159,7 +159,11 @@ class RecordImpl5 extends AbstractRecord implements Internal @Override public final Record5 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) { - fromArray(t1, t2, t3, t4, t5); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java index 257aeb1191..8f07051ec4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java @@ -175,7 +175,12 @@ class RecordImpl6 extends AbstractRecord implements Inte @Override public final Record6 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) { - fromArray(t1, t2, t3, t4, t5, t6); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java index e36269c0e3..bf35f00ed7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java @@ -191,7 +191,13 @@ class RecordImpl7 extends AbstractRecord implements @Override public final Record7 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) { - fromArray(t1, t2, t3, t4, t5, t6, t7); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java index 4a93e49a45..a7afa0b6f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java @@ -207,7 +207,14 @@ class RecordImpl8 extends AbstractRecord impleme @Override public final Record8 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java index 327dfe618d..cae00a4d85 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java @@ -223,7 +223,15 @@ class RecordImpl9 extends AbstractRecord imp @Override public final Record9 values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) { - fromArray(t1, t2, t3, t4, t5, t6, t7, t8, t9); + set(0, t1); + set(1, t2); + set(2, t3); + set(3, t4); + set(4, t5); + set(5, t6); + set(6, t7); + set(7, t8); + set(8, t9); return this; }