Merge origin/master

Author: wumpz

README.md

@@ -38,6 +38,8 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 0.9.5
 
+* support for **insert ... on duplicate key update**
+* improved support for **alter table** statements
 * first Oracle hint support for **select** statements 
 * first **alter table foreign key** support
 * first **merge** support

src/main/java/net/sf/jsqlparser/statement/alter/Alter.java

@@ -42,6 +42,8 @@ public class Alter implements Statement {
     private List<String> ukColumns;
     private String ukName;
     private ForeignKeyIndex fkIndex = null;
+	private String operation;
+    private String constraintName;
 
     private boolean onDeleteCascade;
 
@@ -93,6 +95,14 @@ public void setFkSourceTable(String fkSourceTable) {
         this.fkSourceTable = fkSourceTable;
     }
 
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
     private List<String> fkSourceColumns;
 
     public List<String> getFkSourceColumns() {
@@ -119,6 +129,14 @@ public void setColumnName(String columnName) {
         this.columnName = columnName;
     }
 
+    public String getConstraintName() {
+        return this.constraintName;
+    }
+
+    public void setConstraintName(final String constraintName) {
+        this.constraintName = constraintName;
+    }
+
     public ColDataType getDataType() {
         return dataType;
     }
@@ -167,9 +185,14 @@ public void setFkIndex(ForeignKeyIndex fkIndex) {
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
-        b.append("ALTER TABLE ").append(table.getFullyQualifiedName()).append(" ADD ");
+        b.append("ALTER TABLE ").append(table.getFullyQualifiedName()).append(" ").append(operation).append(" ");
         if (columnName != null) {
-            b.append("COLUMN ").append(columnName).append(" ").append(dataType.toString());
+            b.append("COLUMN ").append(columnName);
+            if (dataType != null) {
+                b.append(" ").append(dataType.toString());
+            }
+        } else if (constraintName != null) {
+            b.append("CONSTRAINT ").append(constraintName);
         } else if (pkColumns != null) {
             b.append("PRIMARY KEY (").append(PlainSelect.getStringList(pkColumns)).append(")");
         } else if (ukColumns != null) {

src/main/java/net/sf/jsqlparser/statement/drop/Drop.java

@@ -33,6 +33,7 @@ public class Drop implements Statement {
 	private String type;
 	private Table name;
 	private List<String> parameters;
+    private boolean ifExists = false;
 
 	@Override
 	public void accept(StatementVisitor statementVisitor) {
@@ -63,9 +64,18 @@ public void setType(String string) {
 		type = string;
 	}
 
+    public boolean isIfExists() {
+        return ifExists;
+    }
+
+    public void setIfExists(boolean ifExists) {
+        this.ifExists = ifExists;
+    }
+
 	@Override
 	public String toString() {
-		String sql = "DROP " + type + " " + name.toString();
+		String sql = "DROP " + type + " "
+           + (ifExists?"IF EXISTS ":"") + name.toString();
 
 		if (parameters != null && parameters.size() > 0) {
 			sql += " " + PlainSelect.getStringList(parameters);

src/main/java/net/sf/jsqlparser/statement/insert/Insert.java

@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ItemsList;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
@@ -44,6 +45,9 @@ public class Insert implements Statement {
     private boolean useValues = true;
     private Select select;
     private boolean useSelectBrackets = true;
+    private boolean useDuplicate = false;
+    private List<Column> duplicateUpdateColumns;
+    private List<Expression> duplicateUpdateExpressionList;
 
     private boolean returningAllColumns = false;
 
@@ -128,6 +132,30 @@ public void setUseSelectBrackets(boolean useSelectBrackets) {
         this.useSelectBrackets = useSelectBrackets;
     }
 
+    public boolean isUseDuplicate() {
+        return useDuplicate;
+    }
+
+    public void setUseDuplicate(boolean useDuplicate) {
+        this.useDuplicate = useDuplicate;
+    }
+
+    public List<Column> getDuplicateUpdateColumns() {
+        return duplicateUpdateColumns;
+    }
+
+    public void setDuplicateUpdateColumns(List<Column> duplicateUpdateColumns) {
+        this.duplicateUpdateColumns = duplicateUpdateColumns;
+    }
+
+    public List<Expression> getDuplicateUpdateExpressionList() {
+        return duplicateUpdateExpressionList;
+    }
+
+    public void setDuplicateUpdateExpressionList(List<Expression> duplicateUpdateExpressionList) {
+        this.duplicateUpdateExpressionList = duplicateUpdateExpressionList;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
@@ -156,6 +184,17 @@ public String toString() {
             sql.append(")");
         }
 
+        if (useDuplicate){
+            sql.append(" ON DUPLICATE KEY UPDATE ");
+            for (int i = 0; i < getDuplicateUpdateColumns().size(); i++) {
+                if (i != 0) {
+                    sql.append(", ");
+                }
+                sql.append(duplicateUpdateColumns.get(i)).append(" = ");
+                sql.append(duplicateUpdateExpressionList.get(i));
+            }
+        }
+
         if (isReturningAllColumns()) {
             sql.append(" RETURNING *");
         } else if (getReturningExpressionList() != null) {

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -51,7 +51,7 @@
 /**
  * Find all used tables within an select statement.
  */
-public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, ExpressionVisitor, ItemsListVisitor, SelectItemVisitor, StatementVisitor  {
+public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, ExpressionVisitor, ItemsListVisitor, SelectItemVisitor, StatementVisitor {
 
     private List<String> tables;
     /**
@@ -136,7 +136,7 @@ public List<String> getTableList(CreateTable create) {
         create.accept(this);
         return tables;
     }
-    
+
     public List<String> getTableList(Expression expr) {
         init();
         expr.accept(this);
@@ -157,7 +157,9 @@ public void visit(PlainSelect plainSelect) {
             }
         }
 
-        plainSelect.getFromItem().accept(this);
+        if (plainSelect.getFromItem() != null) {
+            plainSelect.getFromItem().accept(this);
+        }
 
         if (plainSelect.getJoins() != null) {
             for (Join join : plainSelect.getJoins()) {
@@ -624,18 +626,18 @@ public void visit(RowConstructor rowConstructor) {
         }
     }
 
-	@Override
-	public void visit(HexValue hexValue) {
-		
-	}
+    @Override
+    public void visit(HexValue hexValue) {
+
+    }
 
     @Override
     public void visit(Merge merge) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-    
+
     @Override
     public void visit(OracleHint hint) {
     }
-    
+
 }

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

@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2015 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.util.deparser;
+
+
+import net.sf.jsqlparser.statement.drop.Drop;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+
+/**
+ * @author tw
+ */
+public class DropDeParser {
+
+    private StringBuilder buffer;
+
+	public DropDeParser(StringBuilder buffer) {
+		this.buffer = buffer;
+	}
+
+	public void deParse(Drop drop) {
+		buffer.append("DROP ");
+        buffer.append(drop.getType());
+        if (drop.isIfExists())
+            buffer.append(" IF EXISTS");
+
+		buffer.append(" ").append(drop.getName());
+        
+        if (drop.getParameters() != null && drop.getParameters().size() > 0) {
+			buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters()));
+		}
+	}
+
+	public StringBuilder getBuffer() {
+		return buffer;
+	}
+
+	public void setBuffer(StringBuilder buffer) {
+		this.buffer = buffer;
+	}
+
+}

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

@@ -110,6 +110,20 @@ public void deParse(Insert insert) {
             }
         }
 
+        if(insert.isUseDuplicate()){
+            buffer.append(" ON DUPLICATE KEY UPDATE ");
+            for (int i = 0; i < insert.getDuplicateUpdateColumns().size(); i++) {
+                Column column = insert.getDuplicateUpdateColumns().get(i);
+                buffer.append(column.getFullyQualifiedName()).append(" = ");
+
+                Expression expression = insert.getDuplicateUpdateExpressionList().get(i);
+                expression.accept(expressionVisitor);
+                if (i < insert.getDuplicateUpdateColumns().size() - 1) {
+                    buffer.append(", ");
+                }
+            }
+        }
+
         if (insert.isReturningAllColumns()) {
             buffer.append(" RETURNING *");
         } else if (insert.getReturningExpressionList() != null) {

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

@@ -106,11 +106,12 @@ public void deParse(Replace replace) {
 			// REPLACE mytab SELECT * FROM mytab2
 			// or VALUES ('as', ?, 565)
 
-			if (replace.isUseValues()) {
-				buffer.append(" VALUES");
-			}
-
-			buffer.append(replace.getItemsList());
+//			if (replace.isUseValues()) {
+//				buffer.append(" VALUES");
+//			}
+//
+//			buffer.append(replace.getItemsList());
+			replace.getItemsList().accept(this);
 		}
 	}
 

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

@@ -79,7 +79,8 @@ public void visit(Delete delete) {
 
     @Override
     public void visit(Drop drop) {
-        // TODO Auto-generated method stub
+        DropDeParser dropDeParser = new DropDeParser(buffer);
+        dropDeParser.deParse(drop);
     }
 
     @Override
@@ -90,7 +91,6 @@ public void visit(Insert insert) {
         selectDeParser.setExpressionVisitor(expressionDeParser);
         InsertDeParser insertDeParser = new InsertDeParser(expressionDeParser, selectDeParser, buffer);
         insertDeParser.deParse(insert);
-
     }
 
     @Override