From c0dcc1bdeef11d9746a690cc866b32966d152c76 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 30 Jul 2014 11:22:07 +0200 Subject: [PATCH] [#561] Add support for the Informix database - Various fixes --- .../test/java/org/jooq/test/InformixTest.java | 328 +++++++++--------- .../AggregateWindowFunctionTests.java | 11 +- .../all/testcases/SchemaAndMappingTests.java | 1 + .../java/org/jooq/test/jOOQAbstractTest.java | 9 +- jOOQ/src/main/java/org/jooq/impl/DSL.java | 1 + jOOQ/src/main/java/org/jooq/impl/Limit.java | 13 + jOOQ/src/main/java/org/jooq/impl/Repeat.java | 1 + .../main/java/org/jooq/impl/RowCondition.java | 1 - jOOQ/src/main/java/org/jooq/impl/RowImpl.java | 14 +- .../java/org/jooq/impl/SelectQueryImpl.java | 27 +- .../main/java/org/jooq/impl/Substring.java | 1 + jOOQ/src/main/java/org/jooq/impl/Term.java | 8 + jOOQ/src/main/java/org/jooq/impl/Val.java | 1 + 13 files changed, 224 insertions(+), 192 deletions(-) diff --git a/jOOQ-test/src/test/java/org/jooq/test/InformixTest.java b/jOOQ-test/src/test/java/org/jooq/test/InformixTest.java index d8bd6cd686..f0b53b164c 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/InformixTest.java +++ b/jOOQ-test/src/test/java/org/jooq/test/InformixTest.java @@ -43,14 +43,22 @@ package org.jooq.test; /* [pro] xx -xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxx @@ -68,7 +76,6 @@ xxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -77,48 +84,35 @@ xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxx -xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx x xxxxxxxxxxx xxxx xxxx xxxxxxx xxxxxx xxx xxxxxxxx xxxxxxx xxx xxxxxxxxxxx x - x xxxxxxx xxxxx xxxxxxxxx + x xxxxxxx xxxxx xxxx xx xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx @@ -144,8 +138,6 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx x @@ -156,32 +148,32 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxxx x xxxxxx xxxxxxxxxxxxxxxxxxx x + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxx + x + xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxx x - xxxxxx xxxxxxxxxxx + xxxxxx xxxxxxxxxxxx x xxxxxxxxx @@ -191,37 +183,37 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxx x - xxxxxx xxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxx x - xxxxxx xxxxxxxxx + xxxxxx xxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -236,37 +228,37 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx xxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx xxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -276,67 +268,67 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxx x xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxxxx x + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxx x xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx x + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxx x xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxx + x + xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxx xxxxxx x - xxxxxx xxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxx x xxxxxxxxx @@ -391,12 +383,12 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -411,57 +403,57 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x xxxxxx xxxxxxxxxxxxxxxxxxxx x + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxx + x + xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxx x + xxxxxx xxxxxxxxxxxxxxxxxxxxxx + x + + xxxxxxxxx + xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxx x xxxxxx xxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -516,22 +508,22 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -541,27 +533,27 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -601,22 +593,22 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxxx x xxxxxxxxx @@ -626,12 +618,12 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxx x xxxxxxxxx @@ -641,45 +633,45 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxxxxxxxxxxxxxxx x xxxxxxxxx xxxxxxxxx xxxxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxx xxxxx x xxxxxxxxx xxxxxxxxx xxxxxxx xxxxxxx xxxxxxx xxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxx + xxxxxx xxxxx x xxxxxxxxx xxxxxxxxx xxxxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxx xx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxx + xxxxxx xxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx + xxxxxx xxxxx x xxxxxxxxx xxxxxxxxx xxxxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxx xxx xxxxxx xxx xxxxxx xxx xxxxxx xxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xxx xxxxxxxxx xxx xxxxxxxxx xxxx + xxxxxx xxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxxxxx xxxxxxx xxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxxxxxxxxx xxx xxxxxxxxxxxxxxxx xxx xxxxxxxxxxxxxxxx xxxx + xxxxxx xxxxx x xxxxxxxxx @@ -729,7 +721,7 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxx xxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxx + xxxxxx xxxxx x xxxxxxxxx @@ -760,26 +752,20 @@ xxxxxx xxxxx xxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx x xxxxxx xxx xxxxxxxxxxxxx x - xxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxx + + xx xxxxx xxx xxx xxxxx xxx xxxxx xxxxxx xx x x diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AggregateWindowFunctionTests.java index 50be9e5918..99f13aeb63 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AggregateWindowFunctionTests.java +++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AggregateWindowFunctionTests.java @@ -205,7 +205,7 @@ extends BaseTest { final Field getFunction0(Configuration configuration) { switch (configuration.dialect().family()) { /* [pro] xx + xxxx xxxxxxxxx xxxx xxxxxxx xxxx xxxxxxx xx [/pro] */ diff --git a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java index bede4b7c66..7c75564e6b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java @@ -57,7 +57,6 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; // ... // ... -// ... import static org.jooq.SQLDialect.SQLITE; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java index 58e0c904d0..5f3bbd1ba4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java @@ -41,6 +41,7 @@ package org.jooq.impl; import static org.jooq.Clause.FIELD_ROW; +// ... import static org.jooq.impl.DSL.row; import java.util.Arrays; @@ -71,7 +72,6 @@ import org.jooq.BetweenAndStep19; import org.jooq.BetweenAndStep20; import org.jooq.BetweenAndStep21; import org.jooq.BetweenAndStep22; -import org.jooq.BindContext; import org.jooq.Clause; import org.jooq.Comparator; import org.jooq.Condition; @@ -190,7 +190,12 @@ implements // ------------------------------------------------------------------------ @Override - public final void toSQL(RenderContext context) { + public final void accept(Context context) { + /* [pro] xx + xx xxxxxxxxxxxxxxxxx xx xxxxxxxxx + xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx + + xx [/pro] */ context.sql("("); String separator = ""; @@ -204,11 +209,6 @@ implements context.sql(")"); } - @Override - public final void bind(BindContext context) { - context.visit(fields); - } - @Override public final Clause[] clauses(Context ctx) { return CLAUSES; diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 7c989699e6..6836d5932e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -64,6 +64,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... +// ... import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; // ... @@ -226,7 +227,9 @@ class SelectQueryImpl extends AbstractSelect implements Sel // If a limit applies if (getLimit().isApplicable()) { - switch (context.configuration().dialect()) { + SQLDialect dialect = context.configuration().dialect(); + + switch (dialect) { /* [pro] xx xx xxxxxx xxxxx xxx xxxxxx xxxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx @@ -277,11 +280,11 @@ class SelectQueryImpl extends AbstractSelect implements Sel x xx xxxxxx xxx xxx xx xxxxx xx xxxxxxx xxx xxxx xxxxxxx - xx xxxxxxxx xxx xxxxx xx xxxx xxxxxxx xxx xxxx xxxxxxx + xxxx xxxxxxxxx xxxx xxxxxxx x xx xxxxxx xxx xxxxxxxx xxxxxxx xxxxxx xxx xxxxxxx xxxx xxxxxx - xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x + xx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xx xxxxxxx xx xxxxxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxx x @@ -552,7 +555,8 @@ class SelectQueryImpl extends AbstractSelect implements Sel * This part is common to any type of limited query */ private final void toSQLReference0(Context context, Field[] alternativeFields) { - SQLDialect dialect = context.configuration().dialect(); + SQLDialect dialect = context.dialect(); + SQLDialect family = dialect.family(); // SELECT clause // ------------- @@ -565,13 +569,20 @@ class SelectQueryImpl extends AbstractSelect implements Sel context.sql(hint).sql(" "); } + /* [pro] xx + xx xxxxxxxx xxxxxxxx xxxx xx xxxxx xx xx xx xxxxxx xxxxxx xxxxxxxx + xx xxxxxxxx xx xxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxx x + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx + x + xx [/pro] */ + if (distinct) { context.keyword("distinct").sql(" "); } /* [pro] xx xx xxxxxx xxx xxx xxxxxx xxxx xxxxxxx xxx xxxxxxx - xxxxxx xxxxxxxxxxxxxxxxxx x + xxxxxx xxxxxxxx x xxxx xxxxxxx xxxx xxxx xxxx xxxxxxxxxx x @@ -586,7 +597,7 @@ class SelectQueryImpl extends AbstractSelect implements Sel x xx xxxxxx xxx xxxxxx xxxxx x xxx xxxxxx xx xxxxxxx xxxxxxxxxx - xxxx xx xxxxxxxxxxxxxxxxx xx xxxxxxxxx + xxxx xx xxxxxxx xx xxxxxxxxx xx xxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxx x @@ -658,7 +669,7 @@ class SelectQueryImpl extends AbstractSelect implements Sel if (actualInto != null && context.data(DATA_OMIT_INTO_CLAUSE) == null - && asList(HSQLDB, POSTGRES).contains(dialect.family())) { + && asList(HSQLDB, POSTGRES).contains(family)) { context.formatSeparator() .keyword("into") @@ -802,7 +813,7 @@ class SelectQueryImpl extends AbstractSelect implements Sel // ------------- context.start(SELECT_WINDOW); - if (!getWindow().isEmpty() && asList(POSTGRES).contains(dialect.family())) { + if (!getWindow().isEmpty() && asList(POSTGRES).contains(family)) { context.formatSeparator() .keyword("window") .sql(" ") diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java index 20dc44701d..66a1d86c8b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Substring.java +++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java @@ -113,6 +113,7 @@ class Substring extends AbstractFunction { xxxxxx xxxx xxxx + xxxx xxxxxxxxx xxxx xxxxxxx xx [/pro] */ case DERBY: diff --git a/jOOQ/src/main/java/org/jooq/impl/Term.java b/jOOQ/src/main/java/org/jooq/impl/Term.java index 10b7ed57b8..262cbbe625 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Term.java +++ b/jOOQ/src/main/java/org/jooq/impl/Term.java @@ -188,6 +188,9 @@ enum Term { xxxx xxxx xxxxxx xxxxxxxxx + xxxx xxxxxxxxx + xxxxxx xxxxxxxx + xxxx xxxxxxxxxx xxxxxx xxxxxxxxx x @@ -204,6 +207,9 @@ enum Term { xxxx xxxx xxxxxx xxxxxxxxx + xxxx xxxxxxxxx + xxxxxx xxxxxxxx + xxxx xxxxxxxxxx xxxxxx xxxxxxxx x @@ -218,6 +224,7 @@ enum Term { /* [pro] xx xxxxxx xxxxxxxxxxxxxxxxxx x xxxx xxxx + xxxx xxxxxxxxx xxxxxx xxxxxxxxxxx xxxx xxxxxxxxxx @@ -234,6 +241,7 @@ enum Term { /* [pro] xx xxxxxx xxxxxxxxxxxxxxxxxx x xxxx xxxx + xxxx xxxxxxxxx xxxxxx xxxxxxxxxxx xxxx xxxxxxxxxx diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java index 0821af4305..ba43840cc8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Val.java +++ b/jOOQ/src/main/java/org/jooq/impl/Val.java @@ -165,6 +165,7 @@ class Val extends AbstractParam { // These dialects can hardly detect the type of a bound constant. /* [pro] xx xxxx xxxx + xxxx xxxxxxxxx xx [/pro] */ case DERBY: case FIREBIRD: