diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java index 3f0ecb9168..206d7c7618 100644 --- a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.CUBRID; // ... // ... import static org.jooq.SQLDialect.H2; +// ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java index 29af7336b7..08178fba7c 100644 --- a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java +++ b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.CUBRID; // ... // ... import static org.jooq.SQLDialect.H2; +// ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; // ... diff --git a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java index ec3d472678..e193f98289 100644 --- a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.CUBRID; // ... // ... import static org.jooq.SQLDialect.H2; +// ... import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java index f3a64f2dcf..809de68821 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java @@ -38,6 +38,7 @@ package org.jooq.impl; import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.Names.N_BITCOUNT; import static org.jooq.impl.Names.N_BIT_COUNT; import static org.jooq.impl.Names.N_COUNTSET; @@ -72,6 +73,10 @@ final class BitCount extends AbstractField { + + + + // [#3962] The databases listed here are the same ones that need to // emulate the SHR(a, b) function via a / POWER(2, b). BitCount is // expensive enough already, we shouldn't also introduce POWER() diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java index 91a9380c0f..1c5b3c9eb1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java @@ -313,6 +313,10 @@ package org.jooq.impl; + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java index 197d38cb14..887a52dc06 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java @@ -288,6 +288,14 @@ package org.jooq.impl; + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java index bccd490642..a7f171d42a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Expression.java +++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; +// ... import static org.jooq.SQLDialect.HSQLDB; // ... // ... diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java index 85dcf7a17e..c083618d61 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java +++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java @@ -389,6 +389,7 @@ final class Keywords { static final Keyword K_SQL = keyword("sql"); static final Keyword K_SQLCODE = keyword("sqlcode"); static final Keyword K_SQLSTATE = keyword("sqlstate"); + static final Keyword K_SQL_ERROR_CODE = keyword("sql_error_code"); static final Keyword K_START_AT = keyword("start at"); static final Keyword K_START_WITH = keyword("start with"); static final Keyword K_STATEMENT = keyword("statement"); diff --git a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java index c551979c2b..66b27a2d30 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java @@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.CUBRID; // ... // ... import static org.jooq.SQLDialect.H2; +// ... import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java index 88d217e83b..9d393c2b64 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java @@ -374,6 +374,16 @@ package org.jooq.impl; + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Names.java b/jOOQ/src/main/java/org/jooq/impl/Names.java index f4b8cdd161..5532271993 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Names.java +++ b/jOOQ/src/main/java/org/jooq/impl/Names.java @@ -91,6 +91,7 @@ final class Names { static final Name N_BITXOR = unquotedName("bitxor"); static final Name N_BIT_AND = unquotedName("bit_and"); static final Name N_BIT_AND_AGG = unquotedName("bit_and_agg"); + static final Name N_BITCOUNT = unquotedName("bitcount"); static final Name N_BIT_COUNT = unquotedName("bit_count"); static final Name N_BIT_LENGTH = unquotedName("bit_length"); static final Name N_BIT_OR = unquotedName("bit_or"); diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 739469c869..2d4a23f7ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -7192,7 +7192,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { if (N.is(type)) if (parseFunctionNameIf("BIT_LENGTH")) return bitLength((Field) parseFieldParenthesised(S)); - else if (parseFunctionNameIf("BIT_COUNT")) + else if (parseFunctionNameIf("BITCOUNT", "BIT_COUNT")) return bitCount((Field) parseFieldNumericOpParenthesised()); else if (parseFunctionNameIf("BYTE_LENGTH")) return octetLength((Field) parseFieldParenthesised(S)); diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java index a788bdb5ab..83d3dab8f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Return.java +++ b/jOOQ/src/main/java/org/jooq/impl/Return.java @@ -135,6 +135,11 @@ package org.jooq.impl; + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java b/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java index 6ef8eb70e9..31ef6d5a9e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java @@ -103,16 +103,6 @@ package org.jooq.impl; - - - - - - - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java index c79e5d0422..fc5ac558b3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java @@ -102,7 +102,6 @@ extends - default: super.acceptFunctionName(ctx); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java index 594913edc2..fb5dd538bb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java @@ -113,10 +113,6 @@ extends - - - - default: super.acceptFunctionName(ctx); break;