From fccac91ca4bcb2cc56bc235f26ac30349ec88add Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 9 Mar 2018 12:23:57 +0100 Subject: [PATCH] [#7171] Support SQL Server style hints for aliased tables --- .../resources/org/jooq/web/grammar-3.11.txt | 2 +- .../main/java/org/jooq/impl/ParserImpl.java | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt index 04be7e5c67..03a8d79738 100644 --- a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt +++ b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt @@ -431,7 +431,7 @@ tableFactor = 'LATERAL' '(' select ')' [ correlationName ] | '(' select ')' [ correlationName ] | values [ correlationName ] -| tableName [ tableHints ] [ versions ] [ correlationName ] +| tableName [ versions ] [ correlationName ] [ tableHints ] | '(' table ')' [ correlationName ] ; diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 8fc68345cd..2b063f6d33 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -3060,15 +3060,6 @@ final class ParserImpl implements Parser { else { result = parseTableName(ctx); - if (parseKeywordIf(ctx, "WITH") && ctx.requireProEdition()) { - - - - - - - - } // TODO Sample clause } @@ -3186,6 +3177,16 @@ final class ParserImpl implements Parser { result = result.as(alias, columnAliases.toArray(EMPTY_NAME)); else result = result.as(alias); + } + + if (parseKeywordIf(ctx, "WITH") && ctx.requireProEdition()) { + + + + + + + } return result;