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

[jOOQ/jOOQ#11799] Java 8 fix

Browse Source
This commit is contained in:
Lukas Eder 2021-04-23 16:53:00 +02:00
parent 8336b91ade
commit cb799e8aed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ/src/main/java/org/jooq/impl/DSL.java
View File

@ -19296,7 +19296,7 @@ public class DSL {
@NotNull
@Support({ H2, MARIADB, MYSQL, POSTGRES })
public static JSONObjectNullStep<JSON> jsonObject(Field<?>... entries) {
return new JSONObject<>(SQLDataType.JSON, Tools.mapToList(entries, f -> jsonEntry(f)));
return new JSONObject<>(SQLDataType.JSON, Tools.jsonEntries(entries));
}
/**
@ -19323,7 +19323,7 @@ public class DSL {
@NotNull
@Support({ H2, MARIADB, MYSQL, POSTGRES })
public static JSONObjectNullStep<JSONB> jsonbObject(Field<?>... entries) {
return new JSONObject<>(SQLDataType.JSONB, Tools.mapToList(entries, f -> jsonEntry(f)));
return new JSONObject<>(SQLDataType.JSONB, Tools.jsonEntries(entries));
}
/**
@ -27561,7 +27561,7 @@ public class DSL {
@NotNull
@Support
public static <T> Table<Record1<T>> values(T... values) {
return values(Tools.map(values, t -> row(t), Row1[]::new));
return values(Tools.<T, Row1<T>>map(values, t -> row(t), Row1[]::new));
}
/**
@ -27594,7 +27594,7 @@ public class DSL {
@NotNull
@Support
public static <T> Table<Record1<T>> values(Field<T>... values) {
return values(Tools.map(values, f -> row(f), Row1[]::new));
return values(Tools.<Field<T>, Row1<T>>map(values, f -> row(f), Row1[]::new));
}

2
jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
View File

@ -3213,7 +3213,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
// [#7222] Workaround for https://issues.apache.org/jira/browse/DERBY-6983
if (ctx.family() == DERBY)
ctx.visit(new SelectFieldList<>(mapToList(fields, Tools::unqualified)));
ctx.visit(new SelectFieldList<Field<?>>(mapToList(fields, Tools::unqualified)));
else
ctx.sql('*');