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

[jOOQ/jOOQ#9928] Added parser support for <JSON constructor null clause>

Browse Source
This commit is contained in:
Lukas Eder 2020-03-09 11:45:34 +01:00
parent 8e0532c728
commit 6e95ffce50
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -420,7 +420,9 @@ import org.jooq.InsertOnDuplicateStep;
import org.jooq.InsertReturningStep;
import org.jooq.InsertSetStep;
import org.jooq.InsertValuesStepN;
import org.jooq.JSON;
import org.jooq.JSONEntry;
import org.jooq.JSONObjectNullStep;
import org.jooq.JoinType;
import org.jooq.Keyword;
// ...
@ -502,6 +504,7 @@ import org.jooq.conf.RenderNameCase;
import org.jooq.conf.RenderQuotedNames;
import org.jooq.conf.Settings;
import org.jooq.conf.SettingsTools;
import org.jooq.impl.JSONObject.NullClause;
import org.jooq.tools.StringUtils;
import org.jooq.tools.reflect.Reflect;
import org.jooq.types.DayToSecond;
@ -6677,18 +6680,38 @@ final class ParserImpl implements Parser {
return DSL.jsonObject();
List<JSONEntry<?>> result = new ArrayList<>();
do {
result.add(parseJSONEntry(ctx));
NullClause nullClause = parseJSONObjectNullClauseIf(ctx);
if (nullClause == null) {
do {
result.add(parseJSONEntry(ctx));
}
while (parseIf(ctx, ','));
nullClause = parseJSONObjectNullClauseIf(ctx);
}
while (parseIf(ctx, ','));
parse(ctx, ')');
return DSL.jsonObject(result);
JSONObjectNullStep<JSON> o = DSL.jsonObject(result);
return nullClause == NullClause.NULL_ON_NULL
? o.nullOnNull()
: nullClause == NullClause.ABSENT_ON_NULL
? o.absentOnNull()
: o;
}
return null;
}
private static final NullClause parseJSONObjectNullClauseIf(ParserContext ctx) {
if (parseKeywordIf(ctx, "NULL ON NULL"))
return NullClause.NULL_ON_NULL;
else if (parseKeywordIf(ctx, "ABSENT ON NULL"))
return NullClause.ABSENT_ON_NULL;
else
return null;
}
private static final JSONEntry<?> parseJSONEntry(ParserContext ctx) {
boolean valueRequired = parseKeywordIf(ctx, "KEY");