github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11043] NullPointerException when parsing WITH .. INSERT .. SELECT without explicit INSERT column list

Browse Source
This commit is contained in:
Lukas Eder 2021-02-25 15:51:19 +01:00
parent 70e5a9555a
commit b73dd6e65c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
View File

@ -42,12 +42,11 @@ import static org.jooq.impl.DSL.exists;
import static org.jooq.impl.DSL.not;
import static org.jooq.impl.DSL.notExists;
import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.filterOne;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import org.jooq.Condition;
import org.jooq.Configuration;
@ -196,13 +195,13 @@ final class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
private transient boolean doUpdateWhere;
InsertImpl(Configuration configuration, WithImpl with, Table<R> into) {
super(new InsertQueryImpl<>(configuration, with, into));
this.into = into;
this(configuration, with, into, Collections.emptyList());
}
InsertImpl(Configuration configuration, WithImpl with, Table<R> into, Collection<? extends Field<?>> fields) {
this(configuration, with, into);
super(new InsertQueryImpl<>(configuration, with, into));
this.into = into;
columns(fields);
}
@ -790,11 +789,11 @@ final class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
return defaultValues();
// [#4629] Plain SQL INSERT INTO t VALUES (a, b, c) statements don't know the insert columns
else if (fields.length > 0 && fields.length != values.length)
else if (!Tools.isEmpty(fields) && fields.length != values.length)
throw new IllegalArgumentException("The number of values must match the number of fields");
getDelegate().newRecord();
if (fields.length == 0)
if (Tools.isEmpty(fields))
for (int i = 0; i < values.length; i++)
addValue(getDelegate(), null, i, values[i]);
else
@ -944,13 +943,13 @@ final class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
return defaultValues();
// [#4629] Plain SQL INSERT INTO t VALUES (a, b, c) statements don't know the insert columns
else if (fields.length > 0 && fields.length != values.length)
else if (!Tools.isEmpty(fields) && fields.length != values.length)
throw new IllegalArgumentException("The number of values must match the number of fields");
getDelegate().newRecord();
// javac has trouble when inferring Object for T. Use Void instead
if (fields.length == 0)
if (Tools.isEmpty(fields))
for (int i = 0; i < values.length; i++)
addValue(getDelegate(), (Field<Void>) null, i, (Field<Void>) values[i]);
else
@ -1094,7 +1093,7 @@ final class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
@Override
public final InsertImpl columns(Field<?>... f) {
this.fields = (f == null || f.length == 0) ? into.fields() : f;
this.fields = Tools.isEmpty(f) ? into.fields() : f;
return this;
}