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

[jOOQ/jOOQ#8950] Fixed PG JSON_ARRAY() NULL clause support

Browse Source
This commit is contained in:
Lukas Eder 2020-03-11 16:21:29 +01:00
parent b1ffa703b0
commit a5962b8d7f
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jOOQ/src/main/java/org/jooq/JSONArrayNullStep.java
View File

@ -44,7 +44,6 @@ import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
import org.jooq.impl.DSL;

19
jOOQ/src/main/java/org/jooq/impl/JSONArray.java
View File

@ -38,7 +38,11 @@
package org.jooq.impl;
import static org.jooq.SQLDialect.H2;
import static org.jooq.impl.DSL.jsonArrayAgg;
import static org.jooq.impl.DSL.row;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.DSL.unquotedName;
import static org.jooq.impl.DSL.values;
import static org.jooq.impl.JSONNullClause.ABSENT_ON_NULL;
import static org.jooq.impl.JSONNullClause.NULL_ON_NULL;
import static org.jooq.impl.JSONObject.acceptJSONNullClause;
@ -53,6 +57,8 @@ import org.jooq.Context;
import org.jooq.DataType;
import org.jooq.Field;
import org.jooq.JSONArrayNullStep;
import org.jooq.Row1;
import org.jooq.Table;
/**
@ -107,7 +113,18 @@ final class JSONArray<J> extends AbstractField<J> implements JSONArrayNullStep<J
case POSTGRES:
ctx.visit(unquotedName("json_build_array")).sql('(').visit(args).sql(')');
if (nullClause == ABSENT_ON_NULL) {
Row1<?>[] rows = new Row1[args.size()];
for (int i = 0; i < rows.length; i++)
rows[i] = row(args.get(i));
Table<?> t = values(rows).as("t", "a");
Field<?> a = t.field("a");
ctx.visit(DSL.field(select(jsonArrayAgg(a)).from(t).where(a.isNotNull())));
}
else {
ctx.visit(unquotedName("json_build_array")).sql('(').visit(args).sql(')');
}
break;
default: