support for some keywords as objectnames

Author: wumpz

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -2,7 +2,7 @@
  * #%L
  * JSQLParser library
  * %%
- * Copyright (C) 2004 - 2013 JSQLParser
+ * Copyright (C) 2004 - 2014 JSQLParser
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -35,7 +35,7 @@ PARSER_BEGIN(CCJSqlParser)
  * #%L
  * JSQLParser library
  * %%
- * Copyright (C) 2004 - 2013 JSQLParser
+ * Copyright (C) 2004 - 2014 JSQLParser
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -455,11 +455,8 @@ Column Column():
 String RelObjectName():
 {	Token tk = null; }
 {
-	(
-	    tk=<S_IDENTIFIER>
-	|
-	    tk=<S_QUOTED_IDENTIFIER>
-	)
+	(tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>
+      | tk=<K_CAST> | tk=<K_DO> | tk=<K_EXTRACT> | tk=<K_FIRST> | tk=<K_FOLLOWING> | tk=<K_LAST> | tk=<K_MATERIALIZED> | tk=<K_NULLS> | tk=<K_PARTITION> | tk=<K_RANGE> | tk=<K_ROW> | tk=<K_ROWS> | tk=<K_SIBLINGS> | tk=<K_VALUE> | tk=<K_XML>)
 
     { return tk.image; }
 }
@@ -660,18 +657,16 @@ SelectExpressionItem SelectExpressionItem():
 SelectItem SelectItem():
 {
 	SelectItem selectItem = null;
-	SelectExpressionItem selectExpressionItem = null;
 }
 {   ("*" { selectItem = new AllColumns(); }
     |
 	LOOKAHEAD(AllTableColumns()) selectItem=AllTableColumns()
 	|
-	 selectExpressionItem=SelectExpressionItem() {selectItem = selectExpressionItem; }
+	LOOKAHEAD(SelectExpressionItem()) selectItem=SelectExpressionItem() 
 	)
 	{
 		return selectItem;
 	}
-
 }
 
 AllTableColumns AllTableColumns():

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

@@ -1415,6 +1415,12 @@ public void testPostgreSQLRegExpCaseSensitiveMatch4() throws JSQLParserException
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+     public void testReservedKeyword() throws JSQLParserException {
+        final String statement = "SELECT cast, do, extract, first, following, last, materialized, nulls, partition, range, row, rows, siblings, value, xml FROM tableName"; // all of these are legal in SQL server; 'row' and 'rows' are not legal on Oracle, though;
+        final Select select = (Select) parserManager.parse(new StringReader(statement));
+        assertStatementCanBeDeparsedAs(select, statement);
+    }
+    
     public void testCharacterSetClause() throws JSQLParserException {
         String stmt="SELECT DISTINCT CAST(`view0`.`nick2` AS CHAR (8000) CHARACTER SET utf8) AS `v0` FROM people `view0` WHERE `view0`.`nick2` IS NOT NULL";
         assertSqlCanBeParsedAndDeparsed(stmt);