Merge pull request #78 from CeeKayGit/master

Add support for DB2 specials: Updates with Select clause & "$" as standard #LETTER.

Author: wumpz

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

@@ -31,6 +31,7 @@
 import net.sf.jsqlparser.statement.select.FromItem;
 import net.sf.jsqlparser.statement.select.Join;
 import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
 
 /**
  * The update statement.
@@ -43,6 +44,9 @@ public class Update implements Statement {
 	private List<Expression> expressions;
 	private FromItem fromItem;
 	private List<Join> joins;
+	private Select select;
+	private boolean useColumnsBrackets = true;
+	private boolean useSelect = false;
 
 	@Override
 	public void accept(StatementVisitor statementVisitor) {
@@ -109,16 +113,58 @@ public void setJoins(List<Join> joins) {
 		this.joins = joins;
 	}
 
+	public Select getSelect() {
+	        return select;
+    	}
+	
+    	public void setSelect(Select select) {
+	        this.select = select;
+    	}
+		
+	public boolean isUseColumnsBrackets() {
+	        return useColumnsBrackets;
+    	}
+	
+    	public void setUseColumnsBrackets(boolean useColumnsBrackets) {
+	        this.useColumnsBrackets = useColumnsBrackets;
+    	}
+		
+	public boolean isUseSelect() {
+	        return useSelect;
+    	}
+	
+    	public void setUseSelect(boolean useSelect) {
+	        this.useSelect = useSelect;
+    	}
+
 	@Override
 	public String toString() {
 		StringBuilder b = new StringBuilder("UPDATE ");
 		b.append(PlainSelect.getStringList(getTables(), true, false)).append(" SET ");
-		for (int i = 0; i < getColumns().size(); i++) {
-			if (i != 0) {
-				b.append(", ");
+		
+		if (!useSelect) {
+			for (int i = 0; i < getColumns().size(); i++) {
+				if (i != 0) {
+					b.append(", ");
+				}
+				b.append(columns.get(i)).append(" = ");
+				b.append(expressions.get(i));
+			}
+		} else {
+			if (useColumnsBrackets) {
+				b.append("(");
+			}
+			for (int i = 0; i < getColumns().size(); i++) {
+				if (i != 0) {
+					b.append(", ");
+				}
+				b.append(columns.get(i));
+			}
+			if (useColumnsBrackets) {
+				b.append(")");
 			}
-			b.append(columns.get(i)).append(" = ");
-			b.append(expressions.get(i));
+			b.append(" = ");
+			b.append("(").append(select).append(")");
 		}
 
 		if (fromItem != null) {

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

@@ -224,7 +224,7 @@ SPECIAL_TOKEN:
 TOKEN:
 {
 	< S_IDENTIFIER: ( <LETTER> | <ADDITIONAL_LETTERS> )+ ( <DIGIT> | <LETTER> | <ADDITIONAL_LETTERS> | <SPECIAL_CHARS>)* >
-| 	< #LETTER: ["a"-"z", "A"-"Z", "_"] >
+| 	< #LETTER: ["a"-"z", "A"-"Z", "_", "$"] >
 |   < #SPECIAL_CHARS: "$" | "_" | "#" | "@">
 |   < S_CHAR_LITERAL: "'" (~["'"])* "'" ("'" (~["'"])* "'")*>
 |   < S_QUOTED_IDENTIFIER: "\"" (~["\n","\r","\""])* "\"" | ("`" (~["\n","\r","`"])* "`") | ("[" (~["\n","\r","]"])* "]") >
@@ -311,12 +311,27 @@ Update Update():
 	Expression value = null;
 	FromItem fromItem = null;
 	List<Join> joins = null;
+	Select select = null;
+	boolean useColumnsBrackets = false;
 }
 {
     <K_UPDATE> table=TableWithAlias() { tables.add(table); } 
           ("," table=TableWithAlias() { tables.add(table); } )*
-    <K_SET> tableColumn=Column() "=" value=SimpleExpression() { columns.add(tableColumn); expList.add(value); }
-		  ("," tableColumn=Column() "=" value=SimpleExpression()  { columns.add(tableColumn); expList.add(value); } )*
+    <K_SET> 
+    (
+	tableColumn=Column() "=" value=SimpleExpression() { columns.add(tableColumn); expList.add(value); }
+		("," tableColumn=Column() "=" value=SimpleExpression() { columns.add(tableColumn); expList.add(value); } )*
+
+	|
+
+	[LOOKAHEAD(2) "(" { useColumnsBrackets = true; }] tableColumn=Column() { columns.add(tableColumn); } ("," tableColumn=Column() { columns.add(tableColumn); } )* [ ")" ] "="
+		"("
+		(
+			{ update.setUseSelect(true); }
+			select = Select()
+		)
+		")"
+   )
 
    [ <K_FROM>
       fromItem=FromItem()
@@ -329,6 +344,8 @@ Update Update():
    		update.setTables(tables);
 		update.setFromItem(fromItem);
 		update.setJoins(joins);
+		update.setSelect(select);
+		update.setUseColumnsBrackets(useColumnsBrackets);
 		return update;
    }
 }
@@ -2369,4 +2386,4 @@ Alter Alter():
 		alter.setDataType(dataType);
 		return alter;
 	}
-}
+}

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

@@ -55,4 +55,9 @@ public void testUpdateWithFrom() throws JSQLParserException {
     public void testUpdateMultiTable() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("UPDATE T1, T2 SET T1.C2 = T2.C2, T2.C3 = 'UPDATED' WHERE T1.C1 = T2.C1 AND T1.C2 < 10");
     }
+    
+    @Test
+    public void testUpdateWithSelect() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("UPDATE NATION SET (N_NATIONKEY) = (SELECT ? FROM SYSIBM.SYSDUMMY1)");
+    }
 }