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

[jOOQ/jOOQ#7262] Improve formatting of dual emulations

Browse Source
This commit is contained in:
Lukas Eder 2020-05-07 10:47:18 +02:00
parent f65384c67a
commit 5cc7164c76
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jOOQ/src/main/java/org/jooq/impl/Dual.java
View File

@ -40,7 +40,14 @@ package org.jooq.impl;
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.Keywords.K_AS;
import static org.jooq.impl.Keywords.K_FROM;
import static org.jooq.impl.Keywords.K_LIMIT;
import static org.jooq.impl.Keywords.K_SELECT;
import static org.jooq.impl.Keywords.K_WHERE;
import static org.jooq.impl.Names.N_COUNT;
import static org.jooq.impl.Names.N_DUAL;
import static org.jooq.impl.SQLDataType.INTEGER;
import org.jooq.Context;
import org.jooq.Field;
@ -66,17 +73,13 @@ final class Dual extends AbstractTable<Record> {
static final String DUAL_HSQLDB = "select 1 as dual from information_schema.system_users limit 1";
static final Name DUAL_FIREBIRD = DSL.unquotedName("RDB$DATABASE");
static final Name DUAL_CUBRID = DSL.unquotedName("db_root");
static final Name DUAL_DERBY = DSL.unquotedName("SYSIBM", "SYSDUMMY1");
private static final Name DUAL_FIREBIRD = DSL.unquotedName("RDB$DATABASE");
private static final Name DUAL_CUBRID = DSL.unquotedName("db_root");
private static final Name DUAL_DERBY = DSL.unquotedName("SYSIBM", "SYSDUMMY1");
private static final Name DUAL_HSQLDB = DSL.unquotedName("INFORMATION_SCHEMA", "SYSTEM_USERS");
private final boolean force;
@ -142,7 +145,12 @@ final class Dual extends AbstractTable<Record> {
break;
case HSQLDB:
ctx.sql('(').sql(DUAL_HSQLDB).sql(") as dual");
ctx.sql('(').formatIndentStart().formatNewLine()
.visit(K_SELECT).sql(" 1 ").visit(K_AS).sql(' ').visit(N_DUAL).formatSeparator()
.visit(K_FROM).sql(' ').visit(DUAL_HSQLDB).formatSeparator()
.visit(K_LIMIT).sql(" 1").formatIndentEnd().formatNewLine()
.sql(") ").visit(K_AS).sql(' ').visit(N_DUAL);
break;
case CUBRID:
@ -168,6 +176,15 @@ final class Dual extends AbstractTable<Record> {
@ -191,8 +208,7 @@ final class Dual extends AbstractTable<Record> {
default:
// [#7421] must not use N_DUAL as quoting doesn't work in e.g. MySQL
ctx.sql("dual");
ctx.visit(N_DUAL);
break;
}
}

1
jOOQ/src/main/java/org/jooq/impl/Names.java
View File

@ -78,6 +78,7 @@ final class Names {
static final Name N_CONVERT = unquotedName("convert");
static final Name N_COSH = unquotedName("cosh");
static final Name N_COT = unquotedName("cot");
static final Name N_COUNT = unquotedName("count");
static final Name N_COUNTSET = unquotedName("countset");
static final Name N_CURRENT_BIGDATETIME = unquotedName("current_bigdatetime");
static final Name N_CURRENT_DATE = unquotedName("current_date");