fixes #57: brackets were not handled properly

Author: wumpz

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

@@ -34,6 +34,7 @@ public class SubSelect implements FromItem, Expression, ItemsList {
 
 	private SelectBody selectBody;
 	private Alias alias;
+    private boolean useBrackets = true;
 
     private Pivot pivot;
 
@@ -75,14 +76,22 @@ public void setPivot(Pivot pivot) {
         this.pivot = pivot;
     }
 
+    public boolean isUseBrackets() {
+        return useBrackets;
+    }
+
+    public void setUseBrackets(boolean useBrackets) {
+        this.useBrackets = useBrackets;
+    }
+
 	@Override
 	public void accept(ItemsListVisitor itemsListVisitor) {
 		itemsListVisitor.visit(this);
 	}
 
 	@Override
 	public String toString() {
-		return "(" + selectBody + ")" 
+		return (useBrackets?"(":"") + selectBody + (useBrackets?")":"") 
                 + ((pivot != null) ? " " + pivot : "")
                 + ((alias != null) ? alias.toString() : "");
 	}

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

@@ -102,6 +102,16 @@ public void deParse(Replace replace) {
 			}
 		}
 
+        if (replace.getItemsList() != null) {
+			// REPLACE mytab SELECT * FROM mytab2
+			// or VALUES ('as', ?, 565)
+
+			if (replace.isUseValues()) {
+				buffer.append(" VALUES");
+			}
+
+			buffer.append(replace.getItemsList());
+		}
 	}
 
 	@Override

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

@@ -355,6 +355,7 @@ Replace Replace():
 				|
 					{ replace.setUseValues(false); }
 				    itemsList=SubSelect()
+                    { ((SubSelect)itemsList).setUseBrackets(false); }
 			)
 		    {
 				replace.setItemsList(itemsList);

src/test/java/net/sf/jsqlparser/test/replace/ReplaceTest.java

@@ -2,7 +2,6 @@
 
 import java.io.StringReader;
 
-import junit.framework.TestCase;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.expression.LongValue;
@@ -12,15 +11,17 @@
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.replace.Replace;
 import net.sf.jsqlparser.statement.select.SubSelect;
+import net.sf.jsqlparser.test.TestUtils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
-public class ReplaceTest extends TestCase {
+public class ReplaceTest {
 
-	CCJSqlParserManager parserManager = new CCJSqlParserManager();
+	private static CCJSqlParserManager parserManager = new CCJSqlParserManager();
 
-	public ReplaceTest(String arg0) {
-		super(arg0);
-	}
 
+    @Test
 	public void testReplaceSyntax1() throws JSQLParserException {
 		String statement = "REPLACE mytable SET col1='as', col2=?, col3=565";
 		Replace replace = (Replace) parserManager.parse(new StringReader(statement));
@@ -36,6 +37,7 @@ public void testReplaceSyntax1() throws JSQLParserException {
 
 	}
 
+    @Test
 	public void testReplaceSyntax2() throws JSQLParserException {
 		String statement = "REPLACE mytable (col1, col2, col3) VALUES ('as', ?, 565)";
 		Replace replace = (Replace) parserManager.parse(new StringReader(statement));
@@ -50,6 +52,7 @@ public void testReplaceSyntax2() throws JSQLParserException {
 		assertEquals(statement, "" + replace);
 	}
 
+    @Test
 	public void testReplaceSyntax3() throws JSQLParserException {
 		String statement = "REPLACE mytable (col1, col2, col3) SELECT * FROM mytable3";
 		Replace replace = (Replace) parserManager.parse(new StringReader(statement));
@@ -62,4 +65,9 @@ public void testReplaceSyntax3() throws JSQLParserException {
 		// TODO:
 		// assertEquals(statement, ""+replace);
 	}
+    
+    @Test
+    public void testProblemReplaceParseDeparse() throws JSQLParserException {
+        TestUtils.assertSqlCanBeParsedAndDeparsed("REPLACE a_table (ID, A, B) SELECT A_ID, A, B FROM b_table", false);
+    }
 }