From 76bf3566c36dd65a0d03f6bc5bf076c02b073b99 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 30 Jan 2021 15:41:44 +0100 Subject: [PATCH] [jOOQ/jOOQ#9190] WIP --- .../main/java/org/jooq/ContinueWhenStep.java | 1 + .../CreateFunctionCharacteristicsStep.java | 14 ++++++++ jOOQ/src/main/java/org/jooq/ExitWhenStep.java | 1 + jOOQ/src/main/java/org/jooq/ForByStep.java | 1 + jOOQ/src/main/java/org/jooq/ForInStep.java | 1 + jOOQ/src/main/java/org/jooq/Label.java | 1 + .../main/java/org/jooq/RepeatUntilStep.java | 1 + .../src/main/java/org/jooq/impl/Continue.java | 1 + .../org/jooq/impl/CreateFunctionImpl.java | 35 +++++++++++++++++++ .../org/jooq/impl/CreateProcedureImpl.java | 26 ++++++++++++++ jOOQ/src/main/java/org/jooq/impl/Exit.java | 1 + .../src/main/java/org/jooq/impl/Keywords.java | 2 ++ .../java/org/jooq/impl/LabelledStatement.java | 1 + .../main/java/org/jooq/impl/ParserImpl.java | 8 +++-- 14 files changed, 91 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java index 131f673a9c..19c66f5913 100644 --- a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java +++ b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java @@ -74,5 +74,6 @@ package org.jooq; + diff --git a/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java b/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java index 67156d36e4..851fa6b315 100644 --- a/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java @@ -85,6 +85,20 @@ package org.jooq; + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/ExitWhenStep.java b/jOOQ/src/main/java/org/jooq/ExitWhenStep.java index 19c66f5913..6312365c62 100644 --- a/jOOQ/src/main/java/org/jooq/ExitWhenStep.java +++ b/jOOQ/src/main/java/org/jooq/ExitWhenStep.java @@ -75,5 +75,6 @@ package org.jooq; + diff --git a/jOOQ/src/main/java/org/jooq/ForByStep.java b/jOOQ/src/main/java/org/jooq/ForByStep.java index 1d9bcb6a19..b363840211 100644 --- a/jOOQ/src/main/java/org/jooq/ForByStep.java +++ b/jOOQ/src/main/java/org/jooq/ForByStep.java @@ -76,5 +76,6 @@ import org.jetbrains.annotations.*; + diff --git a/jOOQ/src/main/java/org/jooq/ForInStep.java b/jOOQ/src/main/java/org/jooq/ForInStep.java index 779400e903..384d2125bd 100644 --- a/jOOQ/src/main/java/org/jooq/ForInStep.java +++ b/jOOQ/src/main/java/org/jooq/ForInStep.java @@ -114,5 +114,6 @@ import org.jetbrains.annotations.*; + diff --git a/jOOQ/src/main/java/org/jooq/Label.java b/jOOQ/src/main/java/org/jooq/Label.java index 4ae7154432..617c13d650 100644 --- a/jOOQ/src/main/java/org/jooq/Label.java +++ b/jOOQ/src/main/java/org/jooq/Label.java @@ -94,5 +94,6 @@ import org.jetbrains.annotations.*; + diff --git a/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java b/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java index cb43cae8ac..6362c4024f 100644 --- a/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java +++ b/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java @@ -68,5 +68,6 @@ import org.jetbrains.annotations.*; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Continue.java b/jOOQ/src/main/java/org/jooq/impl/Continue.java index 3e4b1a69bb..b64afcac6c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Continue.java +++ b/jOOQ/src/main/java/org/jooq/impl/Continue.java @@ -136,5 +136,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java index 1c595ce267..6b0b54bf19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java @@ -204,6 +204,41 @@ 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 2c47b7030c..9453047ee8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java @@ -236,6 +236,32 @@ package org.jooq.impl; + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Exit.java b/jOOQ/src/main/java/org/jooq/impl/Exit.java index 851a59738d..a788bdb5ab 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exit.java @@ -138,5 +138,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java index 719b250b0e..5810527e14 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java +++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java @@ -80,6 +80,7 @@ final class Keywords { static final Keyword K_BY = keyword("by"); static final Keyword K_CACHE = keyword("cache"); static final Keyword K_CALL = keyword("call"); + static final Keyword K_CALLED = keyword("called"); static final Keyword K_CASCADE = keyword("cascade"); static final Keyword K_CASE = keyword("case"); static final Keyword K_CAST = keyword("cast"); @@ -211,6 +212,7 @@ final class Keywords { static final Keyword K_INLINE = keyword("inline"); static final Keyword K_INNER_JOIN = keyword("inner join"); static final Keyword K_INOUT = keyword("inout"); + static final Keyword K_INPUT = keyword("input"); static final Keyword K_INSERT = keyword("insert"); static final Keyword K_INSTEAD = keyword("instead"); static final Keyword K_INT = keyword("int"); diff --git a/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java b/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java index 762c8fc6e5..cba147283f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java +++ b/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java @@ -89,5 +89,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 8a23f89003..219972d217 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -2525,7 +2525,7 @@ final class ParserContext { ; else if (parseKeywordIf("PACKAGE")) throw notImplemented("CREATE PACKAGE", "https://github.com/jOOQ/jOOQ/issues/9190"); - else if (parseKeywordIf("PROCEDURE") && requireProEdition()) + else if (parseKeywordIf("PROC", "PROCEDURE") && requireProEdition()) @@ -2539,7 +2539,7 @@ final class ParserContext { case 'P': if (parseKeywordIf("PACKAGE")) throw notImplemented("CREATE PACKAGE", "https://github.com/jOOQ/jOOQ/issues/9190"); - else if (parseKeywordIf("PROCEDURE") && requireProEdition()) + else if (parseKeywordIf("PROC", "PROCEDURE") && requireProEdition()) @@ -2744,7 +2744,7 @@ final class ParserContext { case 'P': if (parseKeywordIf("PACKAGE")) throw notImplemented("DROP PACKAGE", "https://github.com/jOOQ/jOOQ/issues/9190"); - else if (parseKeywordIf("PROCEDURE") && requireProEdition()) + else if (parseKeywordIf("PROC", "PROCEDURE") && requireProEdition()) @@ -5261,6 +5261,8 @@ final class ParserContext { + +