Skip to content

Support columns named limit #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dgloeckner wants to merge 1 commit into from
Closed

Support columns named limit #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,16 @@ List<String> RelObjectNameList() : {
{ return data; }
}

List<String> ColumnNameList() : {
String token = null;
List<String> data = new ArrayList<String>();
} {
token = ColumnName() { data.add(token); }
( LOOKAHEAD (2) "." ("." { data.add(null); })* token = ColumnName() { data.add(token); } ) *

{ return data; }
}

// See: http://technet.microsoft.com/en-us/library/ms187879%28v=sql.105%29.aspx

Column Column() #Column :
Expand All @@ -1022,7 +1032,7 @@ Column Column() #Column :
List<String> data = new ArrayList<String>();
}
{
data = RelObjectNameList()
data = ColumnNameList()

{
Column col = new Column(data);
Expand Down Expand Up @@ -1070,6 +1080,20 @@ String RelObjectName() :
}
}

/*
Column names.
*/
String ColumnName() :
{ Token tk = null; String result = null; }
{
(result = RelObjectNameWithoutValue() | tk=<K_TOP> | tk=<K_VALUE> | tk=<K_VALUES> | tk=<K_INTERVAL> | tk = "LIMIT")

{
if (tk!=null) result=tk.image;
return result;
}
}

/*
Extended version of object names.
*/
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,6 +1586,20 @@ public void testWeirdSelect() throws JSQLParserException {
parserManager.parse(new StringReader(sql));
}

@Test
public void testLimitColumnNameForOracle() throws JSQLParserException {
// 'limit' is not a restricted keyword in Oracle.
String sql = "SELECT limit FROM (SELECT * FROM table2 WHERE col1 = 'val')";

@AnEmortalKid AnEmortalKid Feb 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we verify that the parsed Select has a column named limit ?

assertSqlCanBeParsedAndDeparsed(sql);
}

@Test
public void testLimitColumnInWhereClauseForOracle() throws JSQLParserException {
// 'limit' is not a restricted keyword in Oracle.
String sql = "SELECT * FROM table2 WHERE limit > 200";
assertSqlCanBeParsedAndDeparsed(sql);
}

@Test
public void testCast() throws JSQLParserException {
String stmt = "SELECT CAST(a AS varchar) FROM tabelle1";
Expand Down