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

[#4629] Support INSERT INTO t VALUES with plain SQL tables

Browse Source
This commit is contained in:
lukaseder 2017-05-25 15:34:30 +02:00
parent 11db8b37de
commit 70dfe83e2a
4 changed files with 71 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
View File

@ -37,6 +37,8 @@ package org.jooq.impl;
import java.util.Map;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.DataType;
import org.jooq.Field;
import org.jooq.Record;
import org.jooq.StoreQuery;
@ -74,11 +76,35 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractDMLQuery<R>
@Override
public final <T> void addValue(Field<T> field, T value) {
getValues().put(field, Tools.field(value, field));
if (field == null)
addValue(new UnknownField<T>(getValues().size()), value);
else
getValues().put(field, Tools.field(value, field));
}
@Override
public final <T> void addValue(Field<T> field, Field<T> value) {
getValues().put(field, Tools.field(value, field));
if (field == null)
addValue(new UnknownField<T>(getValues().size()), value);
else
getValues().put(field, Tools.field(value, field));
}
static class UnknownField<T> extends AbstractField<T> {
/**
* Generated UID
*/
private static final long serialVersionUID = -8950654583203020935L;
@SuppressWarnings({ "rawtypes", "unchecked" })
UnknownField(int index) {
super(DSL.name("unknown field " + index), (DataType) SQLDataType.OTHER);
}
@Override
public void accept(Context<?> ctx) {
ctx.visit(getUnqualifiedName());
}
}
}

10
jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java
View File

@ -43,6 +43,7 @@ import java.util.Map;
import org.jooq.Clause;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.impl.AbstractStoreQuery.UnknownField;
/**
* @author Lukas Eder
@ -91,6 +92,15 @@ final class FieldMapForInsert extends AbstractQueryPartMap<Field<?>, Field<?>> {
if (size() == 0)
return;
// [#4629] Do not generate column lists for unknown columns
unknownFields: {
for (Field<?> field : keySet())
if (!(field instanceof UnknownField))
break unknownFields;
return;
}
boolean indent = (size() > 1);
ctx.sql(" (");

12
jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
View File

@ -149,12 +149,10 @@ final class FieldMapsForInsert extends AbstractQueryPart {
if (map != null) {
Select<Record> iteration = DSL.using(context.configuration()).select(map.values());
if (select == null) {
if (select == null)
select = iteration;
}
else {
else
select = select.unionAll(iteration);
}
}
}
@ -189,17 +187,15 @@ final class FieldMapsForInsert extends AbstractQueryPart {
}
public final FieldMapForInsert getMap() {
if (insertMaps.get(index()) == null) {
if (insertMaps.get(index()) == null)
insertMaps.set(index(), new FieldMapForInsert());
}
return insertMaps.get(index());
}
public final void newRecord() {
if (insertMaps.get(index()) != null) {
if (insertMaps.get(index()) != null)
insertMaps.add(null);
}
}
private final int index() {

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

@ -42,7 +42,6 @@ import static org.jooq.impl.Tools.EMPTY_FIELD;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -52,9 +51,9 @@ import org.jooq.Condition;
import org.jooq.Configuration;
import org.jooq.Field;
import org.jooq.FieldLike;
import org.jooq.InsertOnDuplicateSetMoreStep;
import org.jooq.InsertOnConflictConditionStep;
import org.jooq.InsertOnConflictDoUpdateStep;
import org.jooq.InsertOnDuplicateSetMoreStep;
import org.jooq.InsertQuery;
import org.jooq.InsertResultStep;
import org.jooq.InsertSetMoreStep;
@ -87,8 +86,8 @@ import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.Record1;
import org.jooq.Result;
import org.jooq.Select;
import org.jooq.SQL;
import org.jooq.Select;
import org.jooq.Table;
/**
@ -273,14 +272,18 @@ class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
@Override
public final InsertImpl values(Object... values) {
if (fields.length != values.length) {
// [#4629] Plain SQL INSERT INTO t VALUES (a, b, c) statements don't know the insert columns
if (fields.length > 0 && fields.length != values.length)
throw new IllegalArgumentException("The number of values must match the number of fields");
}
getDelegate().newRecord();
for (int i = 0; i < fields.length; i++) {
addValue(getDelegate(), fields[i], values[i]);
}
if (fields.length == 0)
for (Object value : values)
addValue(getDelegate(), null, value);
else
for (int i = 0; i < fields.length; i++)
addValue(getDelegate(), fields.length > 0 ? fields[i] : null, values[i]);
return this;
}
@ -293,15 +296,16 @@ class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
private <T> void addValue(InsertQuery<R> delegate, Field<T> field, Object object) {
// [#1343] Only convert non-jOOQ objects
if (object instanceof Field) {
if (object instanceof Field)
delegate.addValue(field, (Field<T>) object);
}
else if (object instanceof FieldLike) {
else if (object instanceof FieldLike)
delegate.addValue(field, ((FieldLike) object).<T>asField());
}
else {
else if (field != null)
delegate.addValue(field, field.getDataType().convert(object));
}
// [#4629] Plain SQL INSERT INTO t VALUES (a, b, c) statements don't know the insert columns
else
delegate.addValue(field, (T) object);
}
@Override
@ -416,16 +420,20 @@ class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
@Override
public final InsertImpl values(Field<?>... values) {
List<Field<?>> values1 = Arrays.asList(values);
if (fields.length != values1.size()) {
// [#4629] Plain SQL INSERT INTO t VALUES (a, b, c) statements don't know the insert columns
if (fields.length > 0 && fields.length != values.length)
throw new IllegalArgumentException("The number of values must match the number of fields");
}
getDelegate().newRecord();
for (int i = 0; i < fields.length; i++) {
// javac has trouble when inferring Object for T. Use Void instead
getDelegate().addValue((Field<Void>) fields[i], (Field<Void>) values1.get(i));
}
// javac has trouble when inferring Object for T. Use Void instead
if (fields.length == 0)
for (Field<?> value : values)
getDelegate().addValue((Field<Void>) null, (Field<Void>) value);
else
for (int i = 0; i < fields.length; i++)
getDelegate().addValue((Field<Void>) fields[i], (Field<Void>) values[i]);
return this;
}