Skip to content

Commit d6b4e4d

Browse files
committed
fixes #845
1 parent 56ddc2d commit d6b4e4d

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,8 @@ PlainSelect PlainSelect() #PlainSelect:
13071307
[LOOKAHEAD(<K_ORDER> <K_BY>) orderByElements = OrderByElements() { plainSelect.setOrderByElements(orderByElements); } ]
13081308
[LOOKAHEAD(<K_LIMIT>) limit = LimitWithOffset() { plainSelect.setLimit(limit); } ]
13091309
[LOOKAHEAD(<K_OFFSET>) offset = Offset() { plainSelect.setOffset(offset); } ]
1310+
[LOOKAHEAD(<K_LIMIT>, { limit==null }) limit = LimitWithOffset() { plainSelect.setLimit(limit); } ]
1311+
13101312
[LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch); } ]
13111313

13121314
[ LOOKAHEAD(2) <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); }

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3839,4 +3839,16 @@ public void testMultiColumnAliasIssue849() throws JSQLParserException {
38393839
public void testMultiColumnAliasIssue849_2() throws JSQLParserException {
38403840
assertSqlCanBeParsedAndDeparsed("SELECT * FROM crosstab('select rowid, attribute, value from ct where attribute = ''att2'' or attribute = ''att3'' order by 1,2') AS ct(row_name text, category_1 text, category_2 text, category_3 text)");
38413841
}
3842+
3843+
@Test
3844+
public void testLimitClauseDroppedIssue845() throws JSQLParserException {
3845+
assertEquals(
3846+
"SELECT * FROM employee ORDER BY emp_id LIMIT 10 OFFSET 2",
3847+
CCJSqlParserUtil.parse("SELECT * FROM employee ORDER BY emp_id OFFSET 2 LIMIT 10").toString());
3848+
}
3849+
3850+
@Test
3851+
public void testLimitClauseDroppedIssue845_2() throws JSQLParserException {
3852+
assertSqlCanBeParsedAndDeparsed("SELECT * FROM employee ORDER BY emp_id LIMIT 10 OFFSET 2");
3853+
}
38423854
}

0 commit comments

Comments
 (0)