add support of a Google Spanner Interleaved table, commit timestamp options and array types

Author: s13o

pom.xml

@@ -193,7 +193,7 @@
                 <groupId>org.javacc.plugin</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
                 <version>3.0.3</version>
-                                
+
                 <executions>
                     <execution>
                         <id>javacc</id>
@@ -202,15 +202,15 @@
                             <goal>jjtree-javacc</goal>
                         </goals>
                     </execution>
-                    
+
                     <!-- execute JJTree explicitely in order to generate the *.jj file needed for JJDoc -->
                     <execution>
                         <id>jjtree</id>
                         <phase>generate-sources</phase>
                         <goals>
                             <goal>jjtree</goal>
                         </goals>
-                    </execution>    
+                    </execution>
                 </executions>
                 <dependencies>
                     <dependency>
@@ -394,7 +394,7 @@
                     <useStandardDocletOptions>true</useStandardDocletOptions>
                     <maxmemory>800m</maxmemory>
                     <doclint>none</doclint>
-                    
+
                     <!-- Doclint does not work on the Test Sources
                     <doclint>all,-missing</doclint>
                     <excludePackageNames>net.sf.jsqlparser.parser</excludePackageNames>
@@ -414,10 +414,10 @@
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>3.0.0</version>
             </plugin>
-            
+
             <!-- Cobertura is broken with Java 1.8 and there is not fix
             please refer to https://github.com/cobertura/cobertura/issues/248
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
@@ -428,13 +428,13 @@
                 </configuration>
             </plugin>
             -->
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>3.0.5</version>
             </plugin>
-            
+
             <!-- Obsolete or Unused
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -444,60 +444,60 @@
                 </configuration>
             </plugin>
             -->
-            
+
             <!-- JJDoc report generating the BNF documentation -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
-                    <!-- 
+                    <!--
                     /**
                     * A flag to specify the output format for the generated documentation. If set to <code>true</code>, JJDoc will
                     * generate a plain text description of the BNF. Some formatting is done via tab characters, but the intention is to
                     * leave it as plain as possible. Specifying <code>false</code> causes JJDoc to generate a hyperlinked HTML document
                     * unless the parameter {@link #bnf} has been set to <code>true</code>. Default value is <code>false</code>.
-                    * 
+                    *
                     * @parameter expression="${text}"
                     */
                     -->
                     <text>false</text>
-                    
+
                     <!--
                     /**
                     * A flag whether to generate a plain text document with the unformatted BNF. Note that setting this option to
                     * <code>true</code> is only effective if the parameter {@link #text} is <code>false</code>. Default value is
                     * <code>false</code>.
-                    * 
+                    *
                     * @parameter expression="${bnf}"
                     * @since 2.6
                     */
                     -->
                     <bnf>false</bnf>
-                    
+
                     <!--
                     /**
                     * This option controls the structure of the generated HTML output. If set to <code>true</code>, a single HTML
                     * table for the entire BNF is generated. Setting it to <code>false</code> will produce one table for every
                     * production in the grammar.
-                    * 
+                    *
                     * @parameter expression="${oneTable}" default-value=true
                     */
                     -->
                     <oneTable>false</oneTable>
-                    
+
                     <!--
                     /**
                     * The hypertext reference to an optional CSS file for the generated HTML documents. If specified, this CSS file
                     * will be included via a <code>&lt;link&gt;</code> element in the HTML documents. Otherwise, the default style will
                     * be used.
-                    * 
+                    *
                     * @parameter expression="${cssHref}"
                     * @since 2.5
-                    */            
+                    */
                     -->
                     <!-- <cssHref></cssHref> -->
-                    
+
                     <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
                 </configuration>
             </plugin>

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

@@ -375,7 +375,7 @@ public void visit(NamedExpressionList namedExpressionList) {
 
     @Override
     public void visit(MultiExpressionList multiExprList) {
-        for (ExpressionList list : multiExprList.getExprList()) {
+        for (ExpressionList list : multiExprList.getExpressionLists()) {
             visit(list);
         }
     }

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

@@ -0,0 +1,75 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2021 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.schema.Table;
+
+import java.util.Collections;
+import java.util.List;
+
+public class SpannerInterleaveIn {
+
+    public enum OnDelete {
+        CASCADE,
+        NO_ACTION
+    }
+
+    private Table table;
+    private OnDelete onDelete;
+
+    public SpannerInterleaveIn() {
+
+    }
+
+    public SpannerInterleaveIn(Table table, OnDelete action) {
+        setTable(table);
+        setOnDelete(action);
+    }
+
+    public SpannerInterleaveIn(List<String> nameParts) {
+        this(new Table(nameParts), null);
+    }
+
+    public SpannerInterleaveIn(String tableName) {
+        this(Collections.singletonList(tableName));
+    }
+
+    public Table getTable() {
+        return table;
+    }
+
+    public void setTable(Table table) {
+        this.table = table;
+    }
+
+    public OnDelete getOnDelete() {
+        return onDelete;
+    }
+
+    public void setOnDelete(OnDelete action) {
+        this.onDelete = action;
+    }
+
+    @Override
+    public String toString() {
+        return "INTERLEAVE IN PARENT " + getTable().getName() +
+                (getOnDelete() == null ? "" : " ON DELETE " + (getOnDelete() == OnDelete.CASCADE ? "CASCADE" : "NO ACTION"));
+    }
+
+    public SpannerInterleaveIn withTable(Table table) {
+        this.setTable(table);
+        return this;
+    }
+
+    public SpannerInterleaveIn withOnDelete(OnDelete action) {
+        this.setOnDelete(action);
+        return this;
+    }
+}

src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitorAdapter.java

@@ -31,7 +31,7 @@ public void visit(ExpressionList expressionList) {
 
     @Override
     public void visit(MultiExpressionList multiExprList) {
-        for (ExpressionList list : multiExprList.getExprList()) {
+        for (ExpressionList list : multiExprList.getExpressionLists()) {
             visit(list);
         }
     }

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

@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import net.sf.jsqlparser.expression.SpannerInterleaveIn;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -37,6 +38,7 @@ public class CreateTable implements Statement {
     private boolean orReplace = false;
 
     private RowMovement rowMovement;
+    private SpannerInterleaveIn interleaveIn = null;
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
@@ -186,18 +188,21 @@ public String toString() {
             sql += ")";
         }
         String options = PlainSelect.getStringList(tableOptionsStrings, false, false);
-        if (options != null && options.length() > 0) {
+        if (!options.isEmpty()) {
             sql += " " + options;
         }
 
         if (rowMovement != null) {
             sql += " " + rowMovement.getMode().toString() + " ROW MOVEMENT";
         }
         if (select != null) {
-            sql += " AS " + (selectParenthesis ? "(" : "") + select.toString() + (selectParenthesis ? ")" : "");
+            sql += " AS " + (selectParenthesis ? "(" : "") + select + (selectParenthesis ? ")" : "");
         }
         if (likeTable != null) {
-            sql += " LIKE " + (selectParenthesis ? "(" : "") + likeTable.toString() + (selectParenthesis ? ")" : "");
+            sql += " LIKE " + (selectParenthesis ? "(" : "") + likeTable + (selectParenthesis ? ")" : "");
+        }
+        if (interleaveIn != null) {
+            sql += ", " + interleaveIn;
         }
         return sql;
     }
@@ -299,4 +304,17 @@ public CreateTable addIndexes(Collection<? extends Index> indexes) {
         collection.addAll(indexes);
         return this.withIndexes(collection);
     }
+
+    public SpannerInterleaveIn getSpannerInterleaveIn() {
+        return interleaveIn;
+    }
+
+    public void setSpannerInterleaveIn(SpannerInterleaveIn spannerInterleaveIn) {
+        this.interleaveIn = spannerInterleaveIn;
+    }
+
+    public CreateTable withSpannerInterleaveIn(SpannerInterleaveIn spannerInterleaveIn) {
+        this.interleaveIn = spannerInterleaveIn;
+        return this;
+    }
 }

src/main/java/net/sf/jsqlparser/statement/select/ValuesList.java

@@ -88,7 +88,7 @@ public String toString() {
         StringBuilder b = new StringBuilder();
 
         b.append("(VALUES ");
-        for (Iterator<ExpressionList> it = getMultiExpressionList().getExprList().iterator(); it.
+        for (Iterator<ExpressionList> it = getMultiExpressionList().getExpressionLists().iterator(); it.
                 hasNext();) {
             b.append(PlainSelect.getStringList(it.next().getExpressions(), true, !isNoBrackets()));
             if (it.hasNext()) {

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

@@ -496,7 +496,7 @@ public void visit(LateralSubSelect lateralSubSelect) {
 
     @Override
     public void visit(MultiExpressionList multiExprList) {
-        for (ExpressionList exprList : multiExprList.getExprList()) {
+        for (ExpressionList exprList : multiExprList.getExpressionLists()) {
             exprList.accept(this);
         }
     }

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

@@ -44,7 +44,7 @@ public void deParse(CreateIndex createIndex) {
 
         if (index.getColumnsNames() != null) {
             buffer.append(" (");
-            buffer.append(index.getColumnWithParams().stream()
+            buffer.append(index.getColumns().stream()
                     .map(cp -> cp.columnName + (cp.getParams() != null ? " " + String.join(" ", cp.getParams()) : ""))
                     .collect(joining(", ")));
             buffer.append(")");

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

@@ -120,6 +120,9 @@ public void deParse(CreateTable createTable) {
                 buffer.append(")");
             }
         }
+        if (createTable.getSpannerInterleaveIn() != null) {
+            buffer.append(", ").append(createTable.getSpannerInterleaveIn());
+        }
     }
 
 }

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

@@ -31,13 +31,13 @@ public void deParse(DeclareStatement declare) {
             declare.getUserVariable().accept(expressionVisitor);
         }
 
-        if (declare.getType() == DeclareType.AS) {
+        if (declare.getDeclareType() == DeclareType.AS) {
             buffer.append(" AS ");
             buffer.append(declare.getTypeName());
             return;
         }
 
-        if (declare.getType() == DeclareType.TABLE) {
+        if (declare.getDeclareType() == DeclareType.TABLE) {
             buffer.append(" TABLE (");
             for (int i = 0; i < declare.getColumnDefinitions().size(); i++) {
                 if (i > 0) {