Merge master into token-action

Author: wumpz

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Example SQL
+2. Parsing this SQL using JSqlParser with this statements
+3. Exception
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**System**
+ - Database you are using
+- Java Version
+- JSqlParser version

ISSUE_TEMPLATE.md

@@ -23,6 +23,7 @@ Please provide feedback on:
 * Is there any need for a Java 7 JSqlParser build, or can we move on to at least Java 8? (https://github.com/JSQLParser/JSqlParser/issues/814)
 
 ## News
+* due to an API change the version will be 3.0
 * JSqlParser uses now Java 8 at the minimum
 * Released version **2.1** of JSqlParser
 * Released version **2.0** of JSqlParser
@@ -60,8 +61,10 @@ To help JSqlParser's development you are encouraged to provide
 
 Also I would like to know about needed examples or documentation stuff.
 
-## Extensions in the latest SNAPSHOT version 2.2
+## Extensions in the latest SNAPSHOT version 3.0
 
+* support for **update table1 inner join table2 ...** (API change)
+* support for **declare** statement
 * allow empty double quotes
 * allow **year**, **month** ... as column data type for **create table**
 * allow **duplicate** as object name

README.md

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.jsqlparser</groupId>
     <artifactId>jsqlparser</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <name>JSQLParser library</name> 
     <inceptionYear>2004</inceptionYear>
     <organization>

pom.xml

@@ -0,0 +1,132 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.UserVariable;
+import net.sf.jsqlparser.statement.create.table.ColDataType;
+import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
+
+public final class DeclareStatement implements Statement {
+
+    private UserVariable userVariable = null;
+    private DeclareType type = DeclareType.TYPE;
+    private String typeName;
+    private List<TypeDefExpr> typeDefExprList = new ArrayList<>();
+    private List<ColumnDefinition> colDefs = new ArrayList<>();
+
+    public DeclareStatement() {
+    }
+
+    public void setUserVariable(UserVariable userVariable) {
+        this.userVariable = userVariable;
+    }
+
+    public UserVariable getUserVariable() {
+        return userVariable;
+    }
+
+    public DeclareType getType() {
+        return type;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setDeclareType(DeclareType type) {
+        this.type = type;
+    }
+
+    public void addType(ColDataType colDataType, Expression defaultExpr) {
+        typeDefExprList.add(new TypeDefExpr(colDataType, defaultExpr));
+    }
+
+    public void addType(UserVariable userVariable, ColDataType colDataType, Expression defaultExpr) {
+        typeDefExprList.add(new TypeDefExpr(userVariable, colDataType, defaultExpr));
+    }
+
+    public void addColumnDefinition(ColumnDefinition colDef) {
+        colDefs.add(colDef);
+    }
+
+    public List<ColumnDefinition> getColumnDefinitions() {
+        return colDefs;
+    }
+
+    public List<TypeDefExpr> getTypeDefinitions() {
+        return typeDefExprList;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder("DECLARE ");
+        if (type == DeclareType.AS) {
+            b.append(userVariable.toString());
+            b.append(" AS ").append(typeName);
+        } else {
+            if (type == DeclareType.TABLE) {
+                b.append(userVariable.toString());
+                b.append(" TABLE (");
+                for (int i = 0; i < colDefs.size(); i++) {
+                    if (i > 0) {
+                        b.append(", ");
+                    }
+                    b.append(colDefs.get(i).toString());
+                }
+                b.append(")");
+            } else {
+                for (int i = 0; i < typeDefExprList.size(); i++) {
+                    if (i > 0) {
+                        b.append(", ");
+                    }
+                    final TypeDefExpr type = typeDefExprList.get(i);
+                    if (type.userVariable != null) {
+                        b.append(type.userVariable.toString()).append(" ");
+                    }
+                    b.append(type.colDataType.toString());
+                    if (type.defaultExpr != null) {
+                        b.append(" = ").append(type.defaultExpr.toString());
+                    }
+                }
+            }
+        }
+        return b.toString();
+    }
+
+    @Override
+    public void accept(StatementVisitor statementVisitor
+    ) {
+        statementVisitor.visit(this);
+    }
+
+    public static class TypeDefExpr {
+
+        public final UserVariable userVariable;
+        public final ColDataType colDataType;
+        public final Expression defaultExpr;
+
+        public TypeDefExpr(ColDataType colDataType, Expression defaultExpr) {
+            this(null, colDataType, defaultExpr);
+        }
+
+        public TypeDefExpr(UserVariable userVariable, ColDataType colDataType, Expression defaultExpr) {
+            this.userVariable = userVariable;
+            this.colDataType = colDataType;
+            this.defaultExpr = defaultExpr;
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement;
+
+/**
+ *
+ * @author tobens
+ */
+public enum DeclareType {
+    TABLE, AS, TYPE
+}

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

@@ -80,4 +80,6 @@ public interface StatementVisitor {
     public void visit(ExplainStatement aThis);
 
     public void visit(ShowStatement aThis);
+
+    public void visit(DeclareStatement aThis);
 }

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

@@ -151,4 +151,8 @@ public void visit(ExplainStatement aThis) {
     @Override
     public void visit(ShowStatement aThis) {
     }
+
+    @Override
+    public void visit(DeclareStatement aThis) {
+    }
 }

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

@@ -25,6 +25,7 @@ public class CreateView implements Statement {
     private boolean materialized = false;
     private ForceOption force = ForceOption.NONE;
     private TemporaryOption temp = TemporaryOption.NONE;
+    private boolean withReadOnly = false;
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
@@ -90,6 +91,14 @@ public void setTemporary(TemporaryOption temp) {
         this.temp = temp;
     }
 
+    public boolean isWithReadOnly() {
+        return withReadOnly;
+    }
+
+    public void setWithReadOnly(boolean withReadOnly) {
+        this.withReadOnly = withReadOnly;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder("CREATE ");
@@ -104,11 +113,11 @@ public String toString() {
                 sql.append("NO FORCE ");
                 break;
         }
-        
+
         if (temp != TemporaryOption.NONE) {
             sql.append(temp.name()).append(" ");
         }
-        
+
         if (isMaterialized()) {
             sql.append("MATERIALIZED ");
         }
@@ -118,6 +127,9 @@ public String toString() {
             sql.append(PlainSelect.getStringList(columnNames, true, true));
         }
         sql.append(" AS ").append(select);
+        if (isWithReadOnly()) {
+            sql.append(" WITH READ ONLY");
+        }
         return sql.toString();
     }
 }

src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java

@@ -65,7 +65,11 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(").append(left);
         for (Join j : joinList) {
-            sb.append(" ").append(j);
+            if (j.isSimple()) {
+                sb.append(", ").append(j);
+            } else {
+                sb.append(" ").append(j);
+            }
         }
 
         sb.append(")").append((alias != null) ? (" " + alias.toString()) : "").append((pivot != null) ? " " + pivot : "");