Merge origin/master

Conflicts:
	src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

Author: wumpz

README.md

@@ -42,6 +42,8 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 0.9.6
 
+* support for **UPDATE RETURNING**
+* support for scalar time function, like **CURRENT_TIMESTAMP**
 * support for **LEFT SEMI JOIN**
 * improved **top** expression
 

nbactions.xml

@@ -12,4 +12,12 @@
                 <skipTests>true</skipTests>
             </properties>
         </action>
+        <action>
+            <actionName>CUSTOM-clean deploy</actionName>
+            <displayName>clean deploy</displayName>
+            <goals>
+                <goal>clean</goal>
+                <goal>deploy</goal>
+            </goals>
+        </action>
     </actions>

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

@@ -164,5 +164,7 @@ public interface ExpressionVisitor {
     void visit(RowConstructor rowConstructor);
 
     void visit(OracleHint hint);
-    
+
+    void visit(TimeKeyExpression timeKeyExpression);
+
 }

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

@@ -455,5 +455,10 @@ public void visit(HexValue hexValue) {
     public void visit(OracleHint hint) {
 
     }
-        
+
+    @Override
+    public void visit(TimeKeyExpression timeKeyExpression) {
+
+    }
+
 }

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

@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2016 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.expression;
+
+public class TimeKeyExpression implements Expression {
+
+    private String stringValue;
+
+    public TimeKeyExpression(final String value) {
+        this.stringValue = value;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    public String getStringValue() {
+        return stringValue;
+    }
+
+    public void setStringValue(String string) {
+        stringValue = string;
+    }
+
+    @Override
+    public String toString() {
+        return getStringValue();
+    }
+}

src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java

@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 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.create.table;
+
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.schema.Table;
+
+/**
+ * Table Check Constraint
+ * Eg. ' CONSTRAINT less_than_ten CHECK (count < 10) '
+ * @author mw
+ */
+public class CheckConstraint extends NamedConstraint {
+    private Table table;
+    private Expression expression;
+
+
+	public Table getTable() {
+		return table;
+	}
+
+	public void setTable(Table table) {
+		this.table = table;
+	}
+
+    public Expression getExpression() {
+        return expression;
+    }
+
+    public void setExpression(Expression expression) {
+        this.expression = expression;
+    }
+
+    @Override
+    public String toString() {
+        return "CONSTRAINT " + getName() + " CHECK (" + expression + ")";
+    }
+}

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

@@ -34,6 +34,7 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.OrderByElement;
 import net.sf.jsqlparser.statement.select.Limit;
+import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 
 /**
  * The update statement.
@@ -51,6 +52,8 @@ public class Update implements Statement {
 	private boolean useSelect = false;
 	private List<OrderByElement> orderByElements;
 	private Limit limit;
+	private boolean returningAllColumns = false;
+	private List<SelectExpressionItem> returningExpressionList = null;
 
 	@Override
 	public void accept(StatementVisitor statementVisitor) {
@@ -157,6 +160,22 @@ public Limit getLimit() {
 		return limit;
 	}
 
+	public boolean isReturningAllColumns() {
+		return returningAllColumns;
+	}
+
+	public void setReturningAllColumns(boolean returningAllColumns) {
+		this.returningAllColumns = returningAllColumns;
+	}
+
+	public List<SelectExpressionItem> getReturningExpressionList() {
+		return returningExpressionList;
+	}
+
+	public void setReturningExpressionList(List<SelectExpressionItem> returningExpressionList) {
+		this.returningExpressionList = returningExpressionList;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder b = new StringBuilder("UPDATE ");
@@ -210,6 +229,13 @@ public String toString() {
 		if (limit != null) {
 			b.append(limit);
 		}
+
+		if (isReturningAllColumns()) {
+			b.append(" RETURNING *");
+		} else if (getReturningExpressionList() != null) {
+			b.append(" RETURNING ").append(PlainSelect.getStringList(getReturningExpressionList(), true, false));
+		}
+
 		return b.toString();
 	}
 }

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

@@ -56,7 +56,7 @@
 public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, ExpressionVisitor, ItemsListVisitor, SelectItemVisitor, StatementVisitor {
 
     private static final String NOT_SUPPORTED_YET = "Not supported yet.";
-	private List<String> tables;
+    private List<String> tables;
     /**
      * There are special names, that are not table names but are parsed as
      * tables. These names are collected here and are not included in the tables
@@ -228,6 +228,10 @@ public void visit(EqualsTo equalsTo) {
 
     @Override
     public void visit(Function function) {
+        ExpressionList exprList = function.getParameters();
+        if (exprList != null) {
+            visit(exprList);
+        }
     }
 
     @Override
@@ -326,7 +330,6 @@ public void visit(ExpressionList expressionList) {
         for (Expression expression : expressionList.getExpressions()) {
             expression.accept(this);
         }
-
     }
 
     @Override
@@ -576,17 +579,17 @@ public void visit(Replace replace) {
 
     @Override
     public void visit(Drop drop) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
     @Override
     public void visit(Truncate truncate) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
     @Override
     public void visit(CreateIndex createIndex) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
     @Override
@@ -599,12 +602,12 @@ public void visit(CreateTable create) {
 
     @Override
     public void visit(CreateView createView) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
     @Override
     public void visit(Alter alter) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
     @Override
@@ -619,7 +622,7 @@ public void visit(Execute execute) {
 
     @Override
     public void visit(SetStatement set) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
     @Override
@@ -649,7 +652,10 @@ public void visit(TableFunction valuesList) {
 
     @Override
     public void visit(AlterView alterView) {
-        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
 
+    @Override
+    public void visit(TimeKeyExpression timeKeyExpression) {
+    }
 }

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

@@ -575,5 +575,10 @@ public void visit(RowConstructor rowConstructor) {
     public void visit(OracleHint hint) {
         buffer.append(hint.toString());
     }
-    
+
+    @Override
+    public void visit(TimeKeyExpression timeKeyExpression) {
+        buffer.append(timeKeyExpression.toString());
+    }
+
 }

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

@@ -21,6 +21,8 @@
  */
 package net.sf.jsqlparser.util.deparser;
 
+import java.util.Iterator;
+
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.schema.Column;
@@ -31,7 +33,7 @@
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.OrderByVisitor;
 import net.sf.jsqlparser.statement.select.OrderByElement;
-
+import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 /**
  * A class to de-parse (that is, tranform from JSqlParser hierarchy into a
  * string) an {@link net.sf.jsqlparser.statement.update.Update}
@@ -125,6 +127,17 @@ public void deParse(Update update) {
             new LimitDeparser(buffer).deParse(update.getLimit());
         }
 
+        if (update.isReturningAllColumns()) {
+            buffer.append(" RETURNING *");
+        } else if (update.getReturningExpressionList() != null) {
+            buffer.append(" RETURNING ");
+            for (Iterator<SelectExpressionItem> iter = update.getReturningExpressionList().iterator(); iter.hasNext();) {
+                buffer.append(iter.next().toString());
+                if (iter.hasNext()) {
+                    buffer.append(", ");
+                }
+            }
+        }
     }
 
     public ExpressionVisitor getExpressionVisitor() {