From 70e737a607fa548514bdd29fa139e6425ecece44 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 13 Nov 2021 14:25:39 +0100 Subject: [PATCH] [jOOQ/jOOQ#982] Add support for GIS extensions - Support ST_Disjoint --- jOOQ/src/main/java/org/jooq/impl/DSL.java | 55 ++++++ jOOQ/src/main/java/org/jooq/impl/Names.java | 1 + .../main/java/org/jooq/impl/ParserImpl.java | 10 +- jOOQ/src/main/java/org/jooq/impl/QOM.java | 13 ++ .../main/java/org/jooq/impl/StDisjoint.java | 187 ++++++++++++++++++ 5 files changed, 265 insertions(+), 1 deletion(-) create mode 100644 jOOQ/src/main/java/org/jooq/impl/StDisjoint.java diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 6c48f35aa0..3a15d7c2c0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -21358,6 +21358,61 @@ public class DSL { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Names.java b/jOOQ/src/main/java/org/jooq/impl/Names.java index bcf84b5fed..9bcc66fe9c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Names.java +++ b/jOOQ/src/main/java/org/jooq/impl/Names.java @@ -430,6 +430,7 @@ final class Names { static final Name N_ST_ASTEXT = unquotedName("st_astext"); static final Name N_ST_CONTAINS = unquotedName("st_contains"); static final Name N_ST_CROSSES = unquotedName("st_crosses"); + static final Name N_ST_DISJOINT = unquotedName("st_disjoint"); static final Name N_ST_DISTANCE = unquotedName("st_distance"); static final Name N_ST_ENDPOINT = unquotedName("st_endpoint"); static final Name N_ST_EQUALS = unquotedName("st_equals"); diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index cc4e4791da..8fb13db4c1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -323,6 +323,7 @@ import static org.jooq.impl.DSL.square; // ... // ... // ... +// ... import static org.jooq.impl.DSL.stddevPop; import static org.jooq.impl.DSL.stddevSamp; import static org.jooq.impl.DSL.sum; @@ -6209,7 +6210,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { } - else if (parseFunctionNameIf("ST_INTERSECTS") && requireProEdition()) { + else if (parseFunctionNameIf("ST_DISJOINT") && requireProEdition()) { @@ -6218,6 +6219,11 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { + } + else if (parseFunctionNameIf("ST_INTERSECTS") && requireProEdition()) { + + + } else if (parseFunctionNameIf("ST_ISCLOSED") && requireProEdition()) { @@ -7760,6 +7766,8 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { + + diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java index e207eebf3c..273a7449bf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QOM.java +++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java @@ -3703,6 +3703,19 @@ public final class QOM { + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java new file mode 100644 index 0000000000..91b38ac18a --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java @@ -0,0 +1,187 @@ +/* + * 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; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +