- insertet toString in Update

- modified Update deparser to deliver better results

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/update/Update.java

@@ -28,6 +28,8 @@
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
+import net.sf.jsqlparser.statement.select.FromItem;
+import net.sf.jsqlparser.statement.select.Join;
 
 /**
  * The update statement.
@@ -38,6 +40,8 @@ public class Update implements Statement {
 	private Expression where;
 	private List<Column> columns;
 	private List<Expression> expressions;
+	private FromItem fromItem;
+	private List<Join> joins;
 
 	@Override
 	public void accept(StatementVisitor statementVisitor) {
@@ -87,4 +91,39 @@ public void setColumns(List<Column> list) {
 	public void setExpressions(List<Expression> list) {
 		expressions = list;
 	}
+
+	public FromItem getFromItem() {
+		return fromItem;
+	}
+
+	public void setFromItem(FromItem fromItem) {
+		this.fromItem = fromItem;
+	}
+
+	public List<Join> getJoins() {
+		return joins;
+	}
+
+	public void setJoins(List<Join> joins) {
+		this.joins = joins;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder b = new StringBuilder("UPDATE ");
+		b.append(getTable()).append(" SET ");
+		for (int i = 0; i < getColumns().size(); i++) {
+			if (i !=0 ) {
+				b.append(", ");
+			}
+			b.append(columns.get(i)).append(" = ");
+			b.append(expressions.get(i));
+		}
+
+		if (where != null) {
+			b.append(" WHERE ");
+			b.append(where);
+		}
+		return b.toString();
+	}
 }

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

@@ -58,10 +58,10 @@ public void setBuffer(StringBuilder buffer) {
 	}
 
 	public void deParse(Update update) {
-		buffer.append("UPDATE ").append(update.getTable().getWholeTableName()).append(" SET ");
+		buffer.append("UPDATE ").append(update.getTable()).append(" SET ");
 		for (int i = 0; i < update.getColumns().size(); i++) {
 			Column column = (Column) update.getColumns().get(i);
-			buffer.append(column.getWholeColumnName()).append("=");
+			buffer.append(column.getWholeColumnName()).append(" = ");
 
 			Expression expression = (Expression) update.getExpressions().get(i);
 			expression.accept(expressionVisitor);

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

@@ -319,18 +319,25 @@ Update Update():
 	List<Expression> expList = new ArrayList<Expression>();
 	List<Column> columns = new ArrayList<Column>(); 
 	Expression value = null;
-	
+	FromItem fromItem = null;
+	List<Join> joins = null;
 }
 {
     <K_UPDATE> table=TableWithAlias()
     <K_SET> tableColumn=Column() "=" value=SimpleExpression() { columns.add(tableColumn); expList.add(value); }
 		  ("," tableColumn=Column() "=" value=SimpleExpression()  { columns.add(tableColumn); expList.add(value); } )*
 
+   [ <K_FROM>
+      fromItem=FromItem()
+      joins=JoinsList() ]
+
    [ where=WhereClause() { update.setWhere(where); } ]
    { 
    		update.setColumns(columns);
    		update.setExpressions(expList);
    		update.setTable(table);
+		update.setFromItem(fromItem);
+		update.setJoins(joins);
 		return update;
    }
 }

src/test/java/net/sf/jsqlparser/test/update/UpdateTest.java

@@ -1,6 +1,7 @@
 package net.sf.jsqlparser.test.update;
 
 import java.io.StringReader;
+import static junit.framework.Assert.assertEquals;
 
 import junit.framework.TestCase;
 import net.sf.jsqlparser.JSQLParserException;
@@ -10,7 +11,9 @@
 import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.update.Update;
+import net.sf.jsqlparser.util.deparser.StatementDeParser;
 
 public class UpdateTest extends TestCase {
 
@@ -39,4 +42,21 @@ public void testUpdateWAlias() throws JSQLParserException {
 		String statement = "UPDATE table1 A SET A.column = 'XXX' WHERE A.cod_table = 'YYY'";
 		Update update = (Update) parserManager.parse(new StringReader(statement));
 	}
+	
+	public void testUpdateWithDeparser() throws JSQLParserException {
+		assertSqlCanBeParsedAndDeparsed("UPDATE table1 AS A SET A.column = 'XXX' WHERE A.cod_table = 'YYY'");
+	}
+	
+	private void assertSqlCanBeParsedAndDeparsed(String statement) throws JSQLParserException {
+		Statement parsed = parserManager.parse(new StringReader(statement));
+		assertStatementCanBeDeparsedAs(parsed, statement);
+	}
+
+	private void assertStatementCanBeDeparsedAs(Statement parsed, String statement) {
+		assertEquals(statement, parsed.toString());
+
+		StatementDeParser deParser = new StatementDeParser(new StringBuilder());
+		parsed.accept(deParser);
+		assertEquals(statement, deParser.getBuffer().toString());
+	}
 }