Merge origin/master

Author: wumpz

README.md

@@ -47,6 +47,7 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 1.1
 
+* support for **UPSERT** syntax
 * absolute token positions in addition to column/line
 * common normal form transformer for expressions (https://en.wikipedia.org/wiki/Conjunctive_normal_form) 
 * checkstyle integration to force first souce code conventions

src/main/java/net/sf/jsqlparser/expression/Function.java

@@ -22,11 +22,12 @@
 package net.sf.jsqlparser.expression;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * A function as MAX,COUNT...
  */
-public class Function implements Expression {
+public class Function extends ASTNodeAccessImpl implements Expression {
 
     private String name;
     private ExpressionList parameters;

src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java

@@ -19,24 +19,6 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
- /*
- * Copyright (C) 2015 JSQLParser.
- *
- * This library 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 library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
- */
 package net.sf.jsqlparser.parser;
 
 /**

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -35,6 +35,7 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
+import net.sf.jsqlparser.statement.upsert.Upsert;
 
 public interface StatementVisitor {
 
@@ -71,4 +72,7 @@ public interface StatementVisitor {
     void visit(Merge merge);
 
     void visit(Select select);
+
+    void visit(Upsert upsert);
+
 }

src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java

@@ -35,6 +35,7 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
+import net.sf.jsqlparser.statement.upsert.Upsert;
 
 public class StatementVisitorAdapter implements StatementVisitor {
     @Override
@@ -122,4 +123,9 @@ public void visit(Merge merge) {
     @Override
     public void visit(AlterView alterView) {
     }
+
+    @Override
+    public void visit(Upsert upsert) {
+        
+    }
 }

src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java

@@ -0,0 +1,180 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2017 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.statement.upsert;
+
+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;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.StatementVisitor;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+
+/**
+ * The UPSERT INTO statement. This statement is basically the combination of
+ * "insert" and "update". That means it will operate inserts if not present
+ * and updates otherwise the value in the table. Note the values modified
+ * will be either a list of values or a select statement.
+ * 
+ * 
+ * Here is the documentation of the grammar of this operation:
+ * http://phoenix.apache.org/language/#upsert_values
+ * http://phoenix.apache.org/language/#upsert_select
+ * 
+ * @author messfish
+ *
+ */
+public class Upsert implements Statement {
+
+    private Table table;
+    private List<Column> columns;
+    private ItemsList itemsList;
+    private boolean useValues = true;
+    private Select select;
+    private boolean useSelectBrackets = true;
+    private boolean useDuplicate = false;
+    private List<Column> duplicateUpdateColumns;
+    private List<Expression> duplicateUpdateExpressionList;
+
+    @Override
+    public void accept(StatementVisitor statementVisitor) {
+        statementVisitor.visit(this); 
+    }
+    
+    public void setTable(Table name) {
+        table = name;
+    }
+    
+    public Table getTable() {
+        return table;
+    }
+    
+    public void setColumns(List<Column> list) {
+        columns = list;
+    }
+    
+    public List<Column> getColumns() {
+        return columns;
+    }
+    
+    public void setItemsList(ItemsList list) {
+        itemsList = list;
+    }
+    
+    public ItemsList getItemsList() {
+        return itemsList;
+    }
+    
+    public void setUseValues(boolean useValues) {
+        this.useValues = useValues;
+    }
+    
+    public boolean isUseValues() {
+        return useValues;
+    }
+    
+    public void setSelect(Select select) {
+        this.select = select;
+    }
+    
+    public Select getSelect() {
+        return select;
+    }
+    
+    public void setUseSelectBrackets(boolean useSelectBrackets) {
+        this.useSelectBrackets = useSelectBrackets;
+    }
+    
+    public boolean isUseSelectBrackets() {
+        return useSelectBrackets;
+    }
+    
+    public void setUseDuplicate(boolean useDuplicate) {
+        this.useDuplicate = useDuplicate;
+    }
+    
+    public boolean isUseDuplicate() {
+        return useDuplicate;
+    }
+    
+    public void setDuplicateUpdateColumns(List<Column> duplicateUpdateColumns) {
+        this.duplicateUpdateColumns = duplicateUpdateColumns;
+    }
+    
+    public List<Column> getDuplicateUpdateColumns() {
+        return duplicateUpdateColumns;
+    }
+    
+    public void setDuplicateUpdateExpressionList(List<Expression> duplicateUpdateExpressionList) {
+        this.duplicateUpdateExpressionList = duplicateUpdateExpressionList;
+    }
+    
+    public List<Expression> getDuplicateUpdateExpressionList() {
+        return duplicateUpdateExpressionList;
+    }
+    
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append("UPSERT INTO ");
+        sb.append(table).append(" ");
+        if (columns != null) {
+            sb.append(PlainSelect.getStringList(columns, true, true)).append(" ");
+        }
+        if (useValues) {
+            sb.append("VALUES ");
+        }
+        
+        if (itemsList != null) {
+            sb.append(itemsList);
+        } else {
+            if (useSelectBrackets) {
+                sb.append("(");
+            }
+            if (select != null) {
+                sb.append(select);
+            }
+            if (useSelectBrackets) {
+                sb.append(")");
+            }
+        }
+
+        if (useDuplicate) {
+            sb.append(" ON DUPLICATE KEY UPDATE ");
+            for (int i = 0; i < getDuplicateUpdateColumns().size(); i++) {
+                if (i != 0) {
+                    sb.append(", ");
+                }
+                sb.append(duplicateUpdateColumns.get(i)).append(" = ");
+                sb.append(duplicateUpdateExpressionList.get(i));
+            }
+        }
+        
+        return sb.toString();
+    }
+
+}
+

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

@@ -127,6 +127,7 @@
 import net.sf.jsqlparser.statement.select.WithItem;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
+import net.sf.jsqlparser.statement.upsert.Upsert;
 
 /**
  * Find all used tables within an select statement.
@@ -720,4 +721,15 @@ public void visit(DateTimeLiteralExpression literal) {
     public void visit(Commit commit) {
 
     }
+
+    @Override
+    public void visit(Upsert upsert) {
+        tables.add(upsert.getTable().getName());
+        if (upsert.getItemsList() != null) {
+            upsert.getItemsList().accept(this);
+        }
+        if (upsert.getSelect() != null) {
+            visit(upsert.getSelect());
+        }
+    }
 }

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

@@ -42,6 +42,7 @@
 import net.sf.jsqlparser.statement.select.WithItem;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
+import net.sf.jsqlparser.statement.upsert.Upsert;
 
 public class StatementDeParser implements StatementVisitor {
     private ExpressionDeParser expressionDeParser;
@@ -204,4 +205,14 @@ public void visit(Merge merge) {
     public void visit(Commit commit) {
         buffer.append(commit.toString());
     }
+
+    @Override
+    public void visit(Upsert upsert) {
+        selectDeParser.setBuffer(buffer);
+        expressionDeParser.setSelectVisitor(selectDeParser);
+        expressionDeParser.setBuffer(buffer);
+        selectDeParser.setExpressionVisitor(expressionDeParser);
+        UpsertDeParser upsertDeParser = new UpsertDeParser(expressionDeParser, selectDeParser, buffer);
+        upsertDeParser.deParse(upsert);
+    }
 }