Skip to content

Commit 782dce8

Browse files
committed
fixes #941 again :)
1 parent ce392b3 commit 782dce8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ List<String> RelObjectNameList() : {
10951095
List<String> data = new ArrayList<String>();
10961096
} {
10971097
token = RelObjectName() { data.add(token); }
1098-
( LOOKAHEAD (2) "." ("." { data.add(null); })* token = RelObjectName() { data.add(token); } ) *
1098+
( LOOKAHEAD (2) "." ("." { data.add(null); })* token = RelObjectNameExt2() { data.add(token); } ) *
10991099

11001100
{ return data; }
11011101
}
@@ -1104,8 +1104,6 @@ List<String> RelObjectNameList() : {
11041104

11051105
Column Column() #Column :
11061106
{
1107-
//String databaseName = null, schemaName = null, tableName = null, columnName = null;
1108-
//String token = null;
11091107
List<String> data = new ArrayList<String>();
11101108
}
11111109
{
@@ -1189,14 +1187,14 @@ String RelObjectNameExt():
11891187
}
11901188

11911189
/*
1192-
Extended usage of object names - part 2.
1190+
Extended usage of object names - part 2. Using within multipart names as following parts.
11931191
*/
11941192
String RelObjectNameExt2():
11951193
{ Token tk = null;
11961194
String result=null;
11971195
}
11981196
{
1199-
( result=RelObjectNameExt() | tk=<K_FROM> )
1197+
( result=RelObjectNameExt() | tk=<K_FROM> | tk=<K_SELECT> )
12001198
{
12011199
if (tk!=null) result=tk.image;
12021200
return result;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4053,4 +4053,10 @@ public void testTableFunctionInExprIssue923_6() throws JSQLParserException {
40534053
public void testKeyWordCreateIssue941() throws JSQLParserException {
40544054
assertSqlCanBeParsedAndDeparsed("SELECT b.create FROM table b WHERE b.id = 1");
40554055
}
4056+
4057+
4058+
@Test
4059+
public void testKeyWordCreateIssue941_2() throws JSQLParserException {
4060+
assertSqlCanBeParsedAndDeparsed("select f.select from `from` f", true);
4061+
}
40564062
}

0 commit comments

Comments
 (0)