From 9cb042dcaa3c84a47382673f505fa2e1088cebef Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 18 Jun 2024 11:27:04 +0200 Subject: [PATCH] [jOOQ/jOOQ#12736] More spatial support - ST_COVEREDBY - ST_COVERS --- jOOQ/src/main/java/org/jooq/impl/DSL.java | 120 +++++++++++ jOOQ/src/main/java/org/jooq/impl/Names.java | 2 + .../main/java/org/jooq/impl/ParserImpl.java | 10 + jOOQ/src/main/java/org/jooq/impl/QOM.java | 30 +++ .../main/java/org/jooq/impl/StContains.java | 7 - .../main/java/org/jooq/impl/StCoveredBy.java | 179 +++++++++++++++++ .../src/main/java/org/jooq/impl/StCovers.java | 186 ++++++++++++++++++ 7 files changed, 527 insertions(+), 7 deletions(-) create mode 100644 jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java create mode 100644 jOOQ/src/main/java/org/jooq/impl/StCovers.java diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index e585a2df9a..9f1417166f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -26986,6 +26986,126 @@ 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 378018c55f..adb4ae8d6c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Names.java +++ b/jOOQ/src/main/java/org/jooq/impl/Names.java @@ -604,6 +604,8 @@ final class Names { static final Name N_ST_ASWKB = systemName("st_aswkb"); static final Name N_ST_CENTROID = systemName("st_centroid"); static final Name N_ST_CONTAINS = systemName("st_contains"); + static final Name N_ST_COVEREDBY = systemName("st_coveredby"); + static final Name N_ST_COVERS = systemName("st_covers"); static final Name N_ST_CROSSES = systemName("st_crosses"); static final Name N_ST_DIFFERENCE = systemName("st_difference"); static final Name N_ST_DISJOINT = systemName("st_disjoint"); diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 4f72d73917..bcb326d29c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -6855,6 +6855,16 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { + } + else if (parseProFunctionNameIf("ST_COVEREDBY", "SDO_COVEREDBY")) { + + + + } + else if (parseProFunctionNameIf("ST_COVERS", "SDO_COVERS")) { + + + } else if (parseProFunctionNameIf("ST_CROSSES")) { diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java index 0fbe860dd1..86aa8115f0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QOM.java +++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java @@ -9476,6 +9476,36 @@ public final class QOM { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/StContains.java b/jOOQ/src/main/java/org/jooq/impl/StContains.java index 7ca316e578..0b331f3eba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StContains.java +++ b/jOOQ/src/main/java/org/jooq/impl/StContains.java @@ -169,13 +169,6 @@ package org.jooq.impl; - - - - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java b/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java new file mode 100644 index 0000000000..0b331f3eba --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java @@ -0,0 +1,179 @@ +/* + * 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 + * + * https://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: https://www.jooq.org/legal/licensing + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq.impl; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/StCovers.java b/jOOQ/src/main/java/org/jooq/impl/StCovers.java new file mode 100644 index 0000000000..7ca316e578 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/StCovers.java @@ -0,0 +1,186 @@ +/* + * 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 + * + * https://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: https://www.jooq.org/legal/licensing + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq.impl; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +