solved some oracle test sql parsings

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

@@ -51,6 +51,7 @@ public class PlainSelect implements SelectBody {
     private OracleHierarchicalExpression oracleHierarchical = null;
     private boolean oracleSiblings = false;
     private boolean forUpdate = false;
+    private Table forUpdateTable = null;
 
     /**
      * The {@link FromItem} in this query
@@ -221,6 +222,14 @@ public void setForUpdate(boolean forUpdate) {
         this.forUpdate = forUpdate;
     }
 
+    public Table getForUpdateTable() {
+        return forUpdateTable;
+    }
+
+    public void setForUpdateTable(Table forUpdateTable) {
+        this.forUpdateTable = forUpdateTable;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder("SELECT ");
@@ -278,6 +287,10 @@ public String toString() {
             }
             if (isForUpdate()) {
                 sql.append(" FOR UPDATE");
+
+                if (forUpdateTable != null) {
+                    sql.append(" OF ").append(forUpdateTable);
+                }
             }
         }
         return sql.toString();

src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java

@@ -142,6 +142,9 @@ public void visit(PlainSelect plainSelect) {
         }
         if (plainSelect.isForUpdate()) {
             buffer.append(" FOR UPDATE");
+            if (plainSelect.getForUpdateTable() != null) {
+                buffer.append(" OF ").append(plainSelect.getForUpdateTable());
+            }
         }
 
     }

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

@@ -210,6 +210,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_WITHIN:"WITHIN">
 |   <K_IF:"IF">
 |   <K_RECURSIVE:"RECURSIVE">
+|   <K_OF:"OF">
 }
 
 TOKEN : /* Numeric Constants */
@@ -614,6 +615,7 @@ PlainSelect PlainSelect():
 	Top top = null;
 	OracleHierarchicalExpression oracleHierarchicalQueryClause = null;
     List<Table> intoTables = null;
+    Table updateTable = null;
 }
 {
     <K_SELECT>
@@ -647,7 +649,8 @@ PlainSelect PlainSelect():
 	[LOOKAHEAD(<K_OFFSET>) offset = Offset() { plainSelect.setOffset(offset);	} ]
 	[LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch);	} ]
 
-    [ <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); } ]
+    [ <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); } 
+        [ <K_OF> updateTable = Table() { plainSelect.setForUpdateTable(updateTable); } ] ]
 
 	{
 		plainSelect.setSelectItems(selectItems);
@@ -946,7 +949,7 @@ FromItem FromItem():
 				)
 				|
 				fromItem=Table()
-				|
+                |
 				fromItem=LateralSubSelect()
 			)
 			[(LOOKAHEAD(2) pivot=PivotXml()|pivot=Pivot()) { fromItem.setPivot(pivot); } ]

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

@@ -1708,4 +1708,8 @@ public void testSelectBrackets3() throws JSQLParserException {
     public void testSelectBrackets4() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT (1 / 2)::numeric");
     }
+    
+    public void testSelectForUpdateOfTable() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT foo.*, bar.* FROM foo, bar WHERE foo.id = bar.foo_id FOR UPDATE OF foo");
+    }
 }

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

@@ -68,7 +68,7 @@ public void testAllSqlsParseDeparse() throws IOException {
         }
 
         LOG.log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success});
-        assertTrue(success>=116);
+        assertTrue(success>=121);
     }
 
     @Test

src/test/resources/net/sf/jsqlparser/test/oracle-tests/columns01.sql

@@ -2,6 +2,6 @@ select a, b,
 a d,
 ddd as ddd,
 ddd as "dfdf",
-x as
+x as x
 from dual