Skip to content

Commit 6264801

Browse files
committed
fixes #927
1 parent aba6f3a commit 6264801

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ String RelObjectName() :
11521152
{ Token tk = null; String result = null; }
11531153
{
11541154
(result = RelObjectNameWithoutValue() | tk=<K_TOP> | tk=<K_VALUE> | tk=<K_VALUES>
1155-
| tk=<K_INTERVAL> | tk=<K_START>)
1155+
| tk=<K_INTERVAL> | tk=<K_START> | tk=<K_ON>)
11561156

11571157
{
11581158
if (tk!=null) result=tk.image;
@@ -1182,7 +1182,7 @@ String RelObjectNameExt():
11821182
{
11831183
( result=RelObjectName() | tk=<K_LEFT> | tk=<K_RIGHT> | tk=<K_SET>
11841184
| tk=<K_DOUBLE> | tk=<K_IF> | <K_OPTIMIZE> | tk=<K_LIMIT>
1185-
| tk=<K_OFFSET>)
1185+
| tk=<K_OFFSET> )
11861186
{
11871187
if (tk!=null) result=tk.image;
11881188
return result;
@@ -1296,7 +1296,7 @@ PlainSelect PlainSelect() #PlainSelect:
12961296
|
12971297
(
12981298
<K_DISTINCT> { Distinct distinct = new Distinct(); plainSelect.setDistinct(distinct); }
1299-
[ "ON" "(" distinctOn=SelectItemsList() { plainSelect.getDistinct().setOnSelectItems(distinctOn); } ")" ]
1299+
[ LOOKAHEAD(2) "ON" "(" distinctOn=SelectItemsList() { plainSelect.getDistinct().setOnSelectItems(distinctOn); } ")" ]
13001300
)
13011301
|
13021302
(

src/test/java/net/sf/jsqlparser/statement/SetStatementTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,9 @@ public void testIssue373_2() throws JSQLParserException {
3838
public void testMultiValue() throws JSQLParserException {
3939
assertSqlCanBeParsedAndDeparsed("SET v = 1, c = 3");
4040
}
41+
42+
@Test
43+
public void testValueOnIssue927() throws JSQLParserException {
44+
assertSqlCanBeParsedAndDeparsed("SET standard_conforming_strings = on");
45+
}
4146
}

0 commit comments

Comments
 (0)