[jOOQ/jOOQ#17113] Remove ELSE NULL emulation as it's no longer necessary

This commit is contained in:
Lukas Eder 2024-08-21 15:09:11 +02:00
parent d57dcdbb85
commit 9d67a2eb37
3 changed files with 1 additions and 24 deletions

View File

@ -37,7 +37,6 @@
*/
package org.jooq.impl;
import static java.lang.Boolean.TRUE;
// ...
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.DSL.one;
@ -45,13 +44,11 @@ import static org.jooq.impl.DSL.select;
import static org.jooq.impl.Keywords.K_CASE;
import static org.jooq.impl.Keywords.K_ELSE;
import static org.jooq.impl.Keywords.K_END;
import static org.jooq.impl.Keywords.K_NULL;
import static org.jooq.impl.Keywords.K_SWITCH;
import static org.jooq.impl.Keywords.K_THEN;
import static org.jooq.impl.Keywords.K_TRUE;
import static org.jooq.impl.Keywords.K_WHEN;
import static org.jooq.impl.Names.NQ_CASE;
import static org.jooq.impl.Tools.BooleanDataKey.DATA_FORCE_CASE_ELSE_NULL;
import java.util.List;
@ -257,9 +254,6 @@ implements
if (else_ != null)
ctx.formatSeparator()
.visit(K_ELSE).sql(' ').visit(else_);
else if (TRUE.equals(ctx.data(DATA_FORCE_CASE_ELSE_NULL)))
ctx.formatSeparator()
.visit(K_ELSE).sql(' ').visit(K_NULL);
ctx.formatIndentEnd()
.formatSeparator()

View File

@ -37,17 +37,14 @@
*/
package org.jooq.impl;
import static java.lang.Boolean.TRUE;
import static org.jooq.impl.Keywords.K_CASE;
import static org.jooq.impl.Keywords.K_ELSE;
import static org.jooq.impl.Keywords.K_END;
import static org.jooq.impl.Keywords.K_NULL;
import static org.jooq.impl.Keywords.K_SWITCH;
import static org.jooq.impl.Keywords.K_THEN;
import static org.jooq.impl.Keywords.K_TRUE;
import static org.jooq.impl.Keywords.K_WHEN;
import static org.jooq.impl.Names.NQ_CASE;
import static org.jooq.impl.Tools.BooleanDataKey.DATA_FORCE_CASE_ELSE_NULL;
import java.util.Map;
@ -201,9 +198,6 @@ implements
ctx.formatSeparator()
.visit(K_ELSE).sql(' ')
.visit(else_);
else if (TRUE.equals(ctx.data(DATA_FORCE_CASE_ELSE_NULL)))
ctx.formatSeparator()
.visit(K_ELSE).sql(' ').visit(K_NULL);
ctx.formatIndentEnd()
.formatSeparator()

View File

@ -80,7 +80,6 @@ import static org.jooq.impl.SQLDataType.INTEGER;
import static org.jooq.impl.SQLDataType.JSON;
import static org.jooq.impl.SQLDataType.JSONB;
import static org.jooq.impl.SQLDataType.VARCHAR;
import static org.jooq.impl.Tools.BooleanDataKey.DATA_FORCE_CASE_ELSE_NULL;
import java.util.Collection;
import java.util.Set;
@ -369,8 +368,6 @@ implements
private final void acceptStandard(Context<?> ctx) {
acceptStandard(ctx, null, onNull);
}
@ -378,15 +375,7 @@ implements
private final void acceptStandard(Context<?> ctx, Function<? super Field<?>, ? extends Field<?>> mapper, JSONOnNull onNull0) {
ctx.visit(N_JSON_ARRAYAGG).sql('(');
acceptDistinct(ctx);
QueryPartListView<Field<?>> arguments0 = mapper == null ? arguments : wrap(arguments).map(mapper);
acceptArguments3(ctx, arguments0, jsonCastMapper(ctx));
acceptArguments3(ctx, mapper == null ? arguments : wrap(arguments).map(mapper), jsonCastMapper(ctx));
acceptOrderBy(ctx);
JSONNull jsonNull = new JSONNull(onNull0);