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

[jOOQ/jOOQ#11401] Improve JSON_VALUE formatting

Browse Source
This commit is contained in:
Lukas Eder 2021-10-18 16:53:50 +02:00
parent c0d6920504
commit b0c07733b5
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jOOQ/src/main/java/org/jooq/impl/JSONValue.java
View File

@ -39,6 +39,7 @@ package org.jooq.impl;
// ...
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.impl.DSL.function;
import static org.jooq.impl.DSL.inlined;
import static org.jooq.impl.JSONValue.Behaviour.DEFAULT;
import static org.jooq.impl.JSONValue.Behaviour.ERROR;
@ -51,6 +52,7 @@ import static org.jooq.impl.Names.N_JSON_EXTRACT;
import static org.jooq.impl.Names.N_JSON_VALUE;
import static org.jooq.impl.SQLDataType.JSONB;
import static org.jooq.impl.Tools.castIfNeeded;
import static org.jooq.impl.Tools.isSimple;
import java.util.Set;
@ -176,17 +178,29 @@ implements
case MYSQL:
case SQLITE:
ctx.visit(N_JSON_EXTRACT).sql('(').visit(json).sql(", ").visit(path).sql(')');
ctx.visit(function(N_JSON_EXTRACT, json.getDataType(), json, path));
break;
case POSTGRES:
case YUGABYTE:
ctx.visit(N_JSONB_PATH_QUERY_FIRST).sql('(').visit(castIfNeeded(json, JSONB)).sql(", ").visit(path).sql("::jsonpath)");
ctx.visit(function(N_JSONB_PATH_QUERY_FIRST, json.getDataType(), castIfNeeded(json, JSONB), DSL.field("{0}::jsonpath", path)));
break;
default:
ctx.visit(N_JSON_VALUE).sql('(').visit(json).sql(", ");
default: {
boolean format = !isSimple(json, path);
ctx.visit(N_JSON_VALUE).sql('(');
if (format)
ctx.sqlIndentStart();
ctx.visit(json).sql(",");
if (format)
ctx.formatSeparator();
else
ctx.sql(' ');
@ -205,11 +219,23 @@ implements
if (returning != null)
ctx.separatorRequired(true).visit(new JSONReturning(returning));
if (returning != null) {
JSONReturning r = new JSONReturning(returning);
if (r.rendersContent(ctx)) {
if (format)
ctx.formatNewLine();
ctx.separatorRequired(true).visit(r);
}
}
if (format)
ctx.sqlIndentEnd();
ctx.sql(')');
break;
}
}
}
@ -229,6 +255,12 @@ implements

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

@ -3434,6 +3434,14 @@ final class Tools {
return part instanceof SimpleQueryPart && ((SimpleQueryPart) part).isSimple();
}
static final boolean isSimple(QueryPart... parts) {
for (QueryPart part : parts)
if (!isSimple(part))
return false;
return true;
}
static final boolean isRendersSeparator(QueryPart part) {
return part instanceof SeparatedQueryPart && ((SeparatedQueryPart) part).rendersSeparator();
}