From ba9b8d7a6f24274fe1d06009fc6d639be85afef4 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 10 Apr 2021 23:09:19 +0200 Subject: [PATCH] fixes #1136 --- src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt | 6 +++--- .../java/net/sf/jsqlparser/statement/select/SelectTest.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 3076b6d04..730014177 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -1342,7 +1342,7 @@ String RelObjectNameWithoutValue() : | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= - | tk= | tk= | tk= | tk= | tk= | tk= + | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= /*| tk= | tk= | tk= | tk= */ | tk= | tk= | tk= | tk= @@ -1503,9 +1503,9 @@ PlainSelect PlainSelect() #PlainSelect: { plainSelect.setOracleHint(getOracleHint()); } - [skip = Skip() { plainSelect.setSkip(skip); } ] + [ LOOKAHEAD(2) skip = Skip() { plainSelect.setSkip(skip); } ] - [LOOKAHEAD(2) first = First() { plainSelect.setFirst(first); } ] + [ LOOKAHEAD(2) first = First() { plainSelect.setFirst(first); } ] [ LOOKAHEAD(2) ( diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java index 2196ccab0..4fe1c4418 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java @@ -4480,4 +4480,9 @@ public void testColonDelimiterIssue1134() throws JSQLParserException { Statement stmt = CCJSqlParserUtil.parse("SELECT * FROM stores_demo:informix.accounts"); assertEquals("SELECT * FROM stores_demo.informix.accounts", stmt.toString()); } + + @Test + public void testKeywordSkipIssue1136() throws JSQLParserException { + assertSqlCanBeParsedAndDeparsed("SELECT skip"); + } }