Skip to content

Commit d7b468a

Browse files
committed
fixes #995
1 parent ea31a04 commit d7b468a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ String RelObjectNameWithoutValue() :
13311331
(tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_BYTE> | tk=<K_CHAR> | tk=<K_CHANGE> | tk=<K_CHARACTER>
13321332
| tk=<K_CAST> | tk=<K_COMMENT> | tk=<K_DISABLE> | tk=<K_DESC>
13331333
| tk=<K_DO> | tk=<K_EXTRACT> | tk=<K_FIRST> | tk=<K_FOLLOWING>
1334-
| tk=<K_LAST> | tk=<K_MATERIALIZED> | tk=<K_NULLS> | tk=<K_PARTITION> | tk=<K_RANGE>
1334+
| tk=<K_LAST> | tk=<K_LEADING> | tk=<K_MATERIALIZED> | tk=<K_NULLS> | tk=<K_PARTITION> | tk=<K_RANGE>
13351335
| tk=<K_ROW> | tk=<K_ROWS> | tk=<K_SIBLINGS> | tk=<K_XML>
13361336
| tk=<K_COLUMN> | tk=<K_REPLACE> | tk=<K_TRUNCATE> | tk=<K_KEY> | tk=<K_ANY>
13371337
| tk=<K_OPEN> | tk=<K_OVER> | tk=<K_PERCENT> | tk=<K_PRIOR>
@@ -3826,13 +3826,13 @@ Function InternalFunction(Function retval) :
38263826
( LOOKAHEAD(4)
38273827
"*" { retval.setAllColumns(true); }
38283828
|
3829-
namedExpressionList=NamedExpressionList1()
3830-
|
3831-
LOOKAHEAD(NamedExpressionListExprFirst()) namedExpressionList = NamedExpressionListExprFirst()
3832-
|
3829+
LOOKAHEAD(3) namedExpressionList=NamedExpressionList1()
3830+
|
3831+
LOOKAHEAD(NamedExpressionListExprFirst()) namedExpressionList = NamedExpressionListExprFirst()
3832+
|
38333833
LOOKAHEAD(3) expressionList=SimpleExpressionList()
3834-
|
3835-
expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr); }
3834+
|
3835+
expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr); }
38363836
)]
38373837
[ <K_IGNORE> <K_NULLS> {retval.setIgnoreNulls(true); }]
38383838
")"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4436,4 +4436,9 @@ public void testSetOperationWithParenthesisIssue1094_4() throws JSQLParserExcept
44364436
public void testSignedKeywordIssue1100() throws JSQLParserException {
44374437
assertSqlCanBeParsedAndDeparsed("SELECT signed, unsigned FROM mytable");
44384438
}
4439+
4440+
@Test
4441+
public void testSignedKeywordIssue995() throws JSQLParserException {
4442+
assertSqlCanBeParsedAndDeparsed("SELECT leading FROM prd_reprint");
4443+
}
44394444
}

0 commit comments

Comments
 (0)