From b4e498a014223d9f0a41bbca06b3fd57c51372ec Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 22 Dec 2020 13:11:31 +0100 Subject: [PATCH] [jOOQ/jOOQ#11157] Add support for COVAR_SAMP and COVAR_POP aggregate and window functions --- .../java/org/jooq/impl/AlterDatabaseImpl.java | 2 +- .../java/org/jooq/impl/AlterDomainImpl.java | 2 +- .../java/org/jooq/impl/AlterSchemaImpl.java | 2 +- .../java/org/jooq/impl/AlterViewImpl.java | 2 +- .../java/org/jooq/impl/CommentOnImpl.java | 2 +- .../src/main/java/org/jooq/impl/CovarPop.java | 87 +++++++++++++++++++ .../main/java/org/jooq/impl/CovarSamp.java | 87 +++++++++++++++++++ .../org/jooq/impl/CreateDatabaseImpl.java | 2 +- .../java/org/jooq/impl/CreateDomainImpl.java | 2 +- .../java/org/jooq/impl/CreateSchemaImpl.java | 2 +- .../org/jooq/impl/CreateSequenceImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DSL.java | 18 ++++ .../java/org/jooq/impl/DropDatabaseImpl.java | 2 +- .../java/org/jooq/impl/DropDomainImpl.java | 2 +- .../java/org/jooq/impl/DropSchemaImpl.java | 2 +- .../java/org/jooq/impl/DropSequenceImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Log.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Names.java | 3 +- .../main/java/org/jooq/impl/RevokeImpl.java | 2 +- 19 files changed, 209 insertions(+), 16 deletions(-) create mode 100644 jOOQ/src/main/java/org/jooq/impl/CovarPop.java create mode 100644 jOOQ/src/main/java/org/jooq/impl/CovarSamp.java diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java index 96cb9ff29e..605aa5781e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The ALTER DATABASE IF EXISTS statement. + * The ALTER DATABASE statement. */ @SuppressWarnings({ "hiding", "unused" }) final class AlterDatabaseImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java index eecb5b0d36..7e076c36d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The ALTER DOMAIN IF EXISTS statement. + * The ALTER DOMAIN statement. */ @SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" }) final class AlterDomainImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java index 43f490885d..3abcf1db18 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The ALTER SCHEMA IF EXISTS statement. + * The ALTER SCHEMA statement. */ @SuppressWarnings({ "hiding", "unused" }) final class AlterSchemaImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java index d27ee856b6..46289d48a2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The ALTER VIEW IF EXISTS statement. + * The ALTER VIEW statement. */ @SuppressWarnings({ "hiding", "rawtypes", "unused" }) final class AlterViewImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index a625a5af58..bd37a69a20 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The COMMENT ON COLUMN statement. + * The COMMENT ON TABLE statement. */ @SuppressWarnings({ "hiding", "rawtypes", "unused" }) final class CommentOnImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java new file mode 100644 index 0000000000..4530a64369 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java @@ -0,0 +1,87 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: http://www.jooq.org/licenses + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq.impl; + +import static org.jooq.impl.DSL.*; +import static org.jooq.impl.Internal.*; +import static org.jooq.impl.Keywords.*; +import static org.jooq.impl.Names.*; +import static org.jooq.impl.SQLDataType.*; +import static org.jooq.impl.Tools.*; +import static org.jooq.impl.Tools.BooleanDataKey.*; +import static org.jooq.SQLDialect.*; + +import org.jooq.*; +import org.jooq.impl.*; +import org.jooq.tools.*; + +import java.util.*; +import java.math.BigDecimal; + + +/** + * The COVAR POP statement. + */ +@SuppressWarnings({ "rawtypes", "unchecked", "unused" }) +final class CovarPop +extends + DefaultAggregateFunction +{ + + private static final long serialVersionUID = 1L; + + CovarPop( + Field y, + Field x + ) { + super( + false, + N_COVAR_POP, + NUMERIC, + nullSafeNotNull(y, INTEGER), + nullSafeNotNull(x, INTEGER) + ); + } + + // ------------------------------------------------------------------------- + // XXX: QueryPart API + // ------------------------------------------------------------------------- + + + +} diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java new file mode 100644 index 0000000000..d1bec84c31 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java @@ -0,0 +1,87 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: http://www.jooq.org/licenses + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq.impl; + +import static org.jooq.impl.DSL.*; +import static org.jooq.impl.Internal.*; +import static org.jooq.impl.Keywords.*; +import static org.jooq.impl.Names.*; +import static org.jooq.impl.SQLDataType.*; +import static org.jooq.impl.Tools.*; +import static org.jooq.impl.Tools.BooleanDataKey.*; +import static org.jooq.SQLDialect.*; + +import org.jooq.*; +import org.jooq.impl.*; +import org.jooq.tools.*; + +import java.util.*; +import java.math.BigDecimal; + + +/** + * The COVAR SAMP statement. + */ +@SuppressWarnings({ "rawtypes", "unchecked", "unused" }) +final class CovarSamp +extends + DefaultAggregateFunction +{ + + private static final long serialVersionUID = 1L; + + CovarSamp( + Field y, + Field x + ) { + super( + false, + N_COVAR_SAMP, + NUMERIC, + nullSafeNotNull(y, INTEGER), + nullSafeNotNull(x, INTEGER) + ); + } + + // ------------------------------------------------------------------------- + // XXX: QueryPart API + // ------------------------------------------------------------------------- + + + +} diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java index 501082f573..3582233d21 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The CREATE DATABASE IF NOT EXISTS statement. + * The CREATE DATABASE statement. */ @SuppressWarnings({ "unused" }) final class CreateDatabaseImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java index 2ee40c3afb..34206c5f5b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The CREATE DOMAIN IF NOT EXISTS statement. + * The CREATE DOMAIN statement. */ @SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" }) final class CreateDomainImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java index 4a50d68d7d..499bd1d96c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The CREATE SCHEMA IF NOT EXISTS statement. + * The CREATE SCHEMA statement. */ @SuppressWarnings({ "unused" }) final class CreateSchemaImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java index 6e652236e7..2945c21f2f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The CREATE SEQUENCE IF NOT EXISTS statement. + * The CREATE SEQUENCE statement. */ @SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" }) final class CreateSequenceImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index a8bd134634..9cdc8796e4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -17292,6 +17292,24 @@ public class DSL { return new Xmlforest(fields); } + /** + * The COVAR_SAMP function. + */ + @NotNull + @Support({ FIREBIRD, POSTGRES }) + public static AggregateFunction covarSamp(Field y, Field x) { + return new CovarSamp(y, x); + } + + /** + * The COVAR_POP function. + */ + @NotNull + @Support({ FIREBIRD, POSTGRES }) + public static AggregateFunction covarPop(Field y, Field x) { + return new CovarPop(y, x); + } + /** * The MEDIAN function. */ diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java index cf09936650..2e59b6237e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The DROP DATABASE IF EXISTS statement. + * The DROP DATABASE statement. */ @SuppressWarnings({ "unused" }) final class DropDatabaseImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java index ce5ddddb2d..d66c75204e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The DROP DOMAIN IF EXISTS statement. + * The DROP DOMAIN statement. */ @SuppressWarnings({ "rawtypes", "unused" }) final class DropDomainImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java index dd69867347..37729f960b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The DROP SCHEMA IF EXISTS statement. + * The DROP SCHEMA statement. */ @SuppressWarnings({ "unused" }) final class DropSchemaImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java index 422f39e2a1..5b534eeab1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The DROP SEQUENCE IF EXISTS statement. + * The DROP SEQUENCE statement. */ @SuppressWarnings({ "rawtypes", "unused" }) final class DropSequenceImpl diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java index c139219e51..9c4385739e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log.java @@ -55,7 +55,7 @@ import java.math.BigDecimal; /** - * The LOG statement. + * The LN statement. */ @SuppressWarnings({ "rawtypes", "unchecked", "unused" }) final class Log diff --git a/jOOQ/src/main/java/org/jooq/impl/Names.java b/jOOQ/src/main/java/org/jooq/impl/Names.java index d2d4243b08..2422ea9e7c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Names.java +++ b/jOOQ/src/main/java/org/jooq/impl/Names.java @@ -41,7 +41,6 @@ import static org.jooq.impl.DSL.name; import static org.jooq.impl.DSL.unquotedName; import org.jooq.Name; -import org.jooq.SQLDialect; /** * An internal {@link Name} cache. @@ -99,6 +98,8 @@ final class Names { static final Name N_COTH = unquotedName("coth"); static final Name N_COUNT = unquotedName("count"); static final Name N_COUNTSET = unquotedName("countset"); + static final Name N_COVAR_POP = unquotedName("covar_pop"); + static final Name N_COVAR_SAMP = unquotedName("covar_samp"); static final Name N_CURRENTUSER = unquotedName("currentuser"); static final Name N_CURRENT_BIGDATETIME = unquotedName("current_bigdatetime"); static final Name N_CURRENT_CATALOG = unquotedName("current_catalog"); diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java index e98d7b59ad..3ecd8bef9e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java @@ -54,7 +54,7 @@ import java.util.*; /** - * The REVOKE GRANT OPTION FOR statement. + * The REVOKE statement. */ @SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" }) final class RevokeImpl