fixes #126 - allows brackets around select

Author: wumpz

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

@@ -52,6 +52,15 @@ public class PlainSelect implements SelectBody {
     private boolean oracleSiblings = false;
     private boolean forUpdate = false;
     private Table forUpdateTable = null;
+    private boolean useBrackets = false;
+
+    public boolean isUseBrackets() {
+        return useBrackets;
+    }
+
+    public void setUseBrackets(boolean useBrackets) {
+        this.useBrackets = useBrackets;
+    }
 
     /**
      * The {@link FromItem} in this query
@@ -232,7 +241,11 @@ public void setForUpdateTable(Table forUpdateTable) {
 
     @Override
     public String toString() {
-        StringBuilder sql = new StringBuilder("SELECT ");
+        StringBuilder sql = new StringBuilder();
+        if (useBrackets) {
+            sql.append("(");
+        }
+        sql.append("SELECT ");
         if (distinct != null) {
             sql.append(distinct).append(" ");
         }
@@ -293,6 +306,9 @@ public String toString() {
                 }
             }
         }
+        if (useBrackets) {
+            sql.append(")");
+        }
         return sql.toString();
     }
 

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

@@ -52,6 +52,9 @@ public SelectDeParser(ExpressionVisitor expressionVisitor, StringBuilder buffer)
 
     @Override
     public void visit(PlainSelect plainSelect) {
+        if (plainSelect.isUseBrackets()) {
+            buffer.append("(");
+        }
         buffer.append("SELECT ");
         if (plainSelect.getDistinct() != null) {
             buffer.append("DISTINCT ");
@@ -146,7 +149,9 @@ public void visit(PlainSelect plainSelect) {
                 buffer.append(" OF ").append(plainSelect.getForUpdateTable());
             }
         }
-
+        if (plainSelect.isUseBrackets()) {
+            buffer.append(")");
+        }
     }
 
     @Override

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

@@ -466,12 +466,15 @@ Insert Insert():
 
 		|
 
-		[LOOKAHEAD(2) "(" { useSelectBrackets = true; }]
 		(
-			{ insert.setUseValues(false); }
-			select = Select()
-		)
-		[ ")" ]        
+            LOOKAHEAD(2) "(" { useSelectBrackets = true; }
+                { insert.setUseValues(false); }
+                select = Select()
+            ")"
+            |
+            { insert.setUseValues(false); }
+            select = Select()
+        )
 	)
 
     [ <K_RETURNING> (
@@ -591,9 +594,9 @@ Select Select():
 	List<WithItem> with = null;
 }
 {
-	[ with=WithList() { select.setWithItemsList(with); } ]
-    selectBody = SelectBody()
+    [ with=WithList() {  } ] selectBody = SelectBody()
 	{
+        select.setWithItemsList(with);
 		select.setSelectBody(selectBody);
 		return select;
 	}
@@ -607,6 +610,8 @@ SelectBody SelectBody():
 		    selectBody = SetOperationList()
     	|
 	    selectBody = PlainSelect()
+        |
+        ( "(" selectBody = PlainSelect() { ((PlainSelect)selectBody).setUseBrackets(true); } ")" )
 	)
 	{ return selectBody; }
 }

src/test/java/net/sf/jsqlparser/test/create/CreateViewTest.java

@@ -51,7 +51,7 @@ public void testCreateViewWithColumnNames1() throws JSQLParserException {
 
 	public void testCreateView5() throws JSQLParserException {
 		String statement = "CREATE VIEW myview AS (SELECT * FROM mytab)";
-		String statement2 = "CREATE VIEW myview AS SELECT * FROM mytab";
+		String statement2 = "CREATE VIEW myview AS (SELECT * FROM mytab)";
 		CreateView createView = (CreateView) parserManager.parse(new StringReader(statement));
 		assertFalse(createView.isOrReplace());
 		assertEquals("myview", createView.getView().getName());

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

@@ -1712,4 +1712,12 @@ public void testSelectBrackets4() throws JSQLParserException {
     public void testSelectForUpdateOfTable() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT foo.*, bar.* FROM foo, bar WHERE foo.id = bar.foo_id FOR UPDATE OF foo");
     }
+    
+    public void testSelectWithBrackets() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("(SELECT 1 FROM mytable)");
+    }
+    
+    public void testSelectWithBrackets2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("(SELECT 1)");
+    }
 }

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>=121);
+        assertTrue(success>=122);
     }
 
     @Test