From 22f0b7e8d5b8828c1982b65bbd9cd08bd7fcf251 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 18 Mar 2021 17:50:35 +0100 Subject: [PATCH] [jOOQ/jOOQ#11367] Oracle triggers require DECLARE keyword --- jOOQ/src/main/java/org/jooq/impl/BlockImpl.java | 6 ++++++ jOOQ/src/main/java/org/jooq/impl/Call.java | 11 +++++++++++ .../main/java/org/jooq/impl/CreateTriggerImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java | 3 +++ jOOQ/src/main/java/org/jooq/impl/Tools.java | 6 ++++++ 5 files changed, 27 insertions(+) diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java index 5658d03be1..9d739251ec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java @@ -94,6 +94,8 @@ import org.jooq.conf.ParamType; import org.jooq.impl.ScopeMarker.ScopeContent; import org.jooq.impl.Tools.DataExtendedKey; +import org.jetbrains.annotations.Nullable; + /** * @author Lukas Eder */ @@ -272,6 +274,10 @@ final class BlockImpl extends AbstractRowCountQuery implements Block { + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Call.java b/jOOQ/src/main/java/org/jooq/impl/Call.java index 1f9ef36ac2..f8b34fa1f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Call.java +++ b/jOOQ/src/main/java/org/jooq/impl/Call.java @@ -136,6 +136,17 @@ package org.jooq.impl; + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java index f84207910d..aec9032b16 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java @@ -525,5 +525,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java b/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java index 7a527cb35a..bf9bf67185 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java +++ b/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +// ... // ... // ... import static org.jooq.impl.Keywords.K_DECLARE; @@ -48,6 +49,7 @@ import org.jooq.Clause; import org.jooq.Context; // ... import org.jooq.QueryPartInternal; +import org.jooq.SQLDialect; import org.jooq.Statement; import org.jooq.impl.AbstractContext.ScopeStackElement; import org.jooq.impl.Tools.DataExtendedKey; @@ -110,6 +112,7 @@ enum ScopeMarker { + TOP_LEVEL_CTE( diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 2b99eed911..ab51c8f813 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -687,6 +687,12 @@ final class Tools { + + + + + +