diff --git a/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java b/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java
index fb5a16931..5d6aa794c 100644
--- a/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java
+++ b/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java
@@ -15,7 +15,6 @@
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 public class JsonExpression extends ASTNodeAccessImpl implements Expression {
-
     private Expression expr;
 
     private List<String> idents = new ArrayList<String>();
@@ -34,26 +33,19 @@ public void setExpression(Expression expr) {
         this.expr = expr;
     }
 
-//    public List<String> getIdents() {
-//        return idents;
-//    }
-//
-//    public void setIdents(List<String> idents) {
-//        this.idents = idents;
-//        operators = new ArrayList<String>();
-//        for (String ident : idents) {
-//            operators.add("->");
-//        }
-//    }
-//
-//    public void addIdent(String ident) {
-//        addIdent(ident, "->");
-//    }
     public void addIdent(String ident, String operator) {
         idents.add(ident);
         operators.add(operator);
     }
 
+    public List<String> getIdents() {
+        return idents;
+    }
+
+    public List<String> getOperators() {
+        return operators;
+    }
+
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
diff --git a/src/main/java/net/sf/jsqlparser/expression/SpannerInterleaveIn.java b/src/main/java/net/sf/jsqlparser/expression/SpannerInterleaveIn.java
new file mode 100644
index 000000000..59a8ec856
--- /dev/null
+++ b/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;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/sf/jsqlparser/statement/Block.java b/src/main/java/net/sf/jsqlparser/statement/Block.java
index 6ee605518..cbbbb3c87 100644
--- a/src/main/java/net/sf/jsqlparser/statement/Block.java
+++ b/src/main/java/net/sf/jsqlparser/statement/Block.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 public class Block implements Statement {
+    private boolean hasSemicolonAfterEnd = false;
 
     private Statements statements;
 
@@ -21,14 +22,34 @@ public void setStatements(Statements statements) {
         this.statements = statements;
     }
 
+    public boolean hasSemicolonAfterEnd() {
+        return hasSemicolonAfterEnd;
+    }
+
+    public void setSemicolonAfterEnd(boolean hasSemicolonAfterEnd) {
+        this.hasSemicolonAfterEnd = hasSemicolonAfterEnd;
+    }
+
     @Override
     public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
     }
 
+    public StringBuilder appendTo(StringBuilder builder) {
+        builder.append("BEGIN\n");
+        if (statements != null) {
+            builder.append(statements);
+        }
+        builder.append("END");
+        if (hasSemicolonAfterEnd) {
+            builder.append(";");
+        }
+        return builder;
+    }
+
     @Override
     public String toString() {
-        return "BEGIN\n" + (statements != null ? statements.toString() : "") + "END";
+        return appendTo(new StringBuilder()).toString();
     }
 
     public Block withStatements(Statements statements) {
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
index 1035ac4f7..849cdd440 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
@@ -23,11 +23,11 @@ public SetStatement() {
         // empty constructor
     }
 
-    public SetStatement(String name, List<Expression> value) {
+    public SetStatement(Object name, List<Expression> value) {
         add(name, value, true);
     }
 
-    public void add(String name, List<Expression> value, boolean useEqual) {
+    public void add(Object name, List<Expression> value, boolean useEqual) {
         values.add(new NameExpr(name, value, useEqual));
     }
 
@@ -66,11 +66,11 @@ public SetStatement setUseEqual(boolean useEqual) {
         return setUseEqual(0, useEqual);
     }
 
-    public String getName() {
+    public Object getName() {
         return getName(0);
     }
 
-    public String getName(int idx) {
+    public Object getName(int idx) {
         return values.get(idx).name;
     }
 
@@ -129,11 +129,11 @@ public void accept(StatementVisitor statementVisitor) {
 
     static class NameExpr {
 
-        private String name;
+        private Object name;
         private List<Expression> expressions;
         private boolean useEqual;
 
-        public NameExpr(String name, List<Expression> expressions, boolean useEqual) {
+        public NameExpr(Object name, List<Expression> expressions, boolean useEqual) {
             this.name = name;
             this.expressions = expressions;
             this.useEqual = useEqual;
diff --git a/src/main/java/net/sf/jsqlparser/statement/Statements.java b/src/main/java/net/sf/jsqlparser/statement/Statements.java
index 21c130842..363db0795 100644
--- a/src/main/java/net/sf/jsqlparser/statement/Statements.java
+++ b/src/main/java/net/sf/jsqlparser/statement/Statements.java
@@ -35,8 +35,8 @@ public void accept(StatementVisitor statementVisitor) {
     public String toString() {
         StringBuilder b = new StringBuilder();
         for (Statement stmt : statements) {
-            if (stmt instanceof IfElseStatement) {
-                // IfElseStatements print the Semicolons by themselves
+            // IfElseStatements and Blocks control the Semicolons by themselves
+            if (stmt instanceof IfElseStatement || stmt instanceof Block) {
                 b.append(stmt).append("\n");
             } else {
                 b.append(stmt).append(";\n");
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java b/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
index 8fb5b4cc1..d3793589e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
+++ b/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;
@@ -38,6 +39,8 @@ public class CreateTable implements Statement {
 
     private RowMovement rowMovement;
 
+    private SpannerInterleaveIn interleaveIn = null;
+
     @Override
     public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
@@ -199,6 +202,9 @@ public String toString() {
         if (likeTable != null) {
             sql += " LIKE " + (selectParenthesis ? "(" : "") + likeTable.toString() + (selectParenthesis ? ")" : "");
         }
+        if (interleaveIn != null) {
+            sql += ", " + interleaveIn;
+        }
         return sql;
     }
 
@@ -299,4 +305,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;
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Join.java b/src/main/java/net/sf/jsqlparser/statement/select/Join.java
index 7c4200bef..e56b37cee 100644
--- a/src/main/java/net/sf/jsqlparser/statement/select/Join.java
+++ b/src/main/java/net/sf/jsqlparser/statement/select/Join.java
@@ -21,6 +21,7 @@ public class Join extends ASTNodeAccessImpl {
     private boolean right = false;
     private boolean left = false;
     private boolean natural = false;
+    private boolean global = false;
     private boolean full = false;
     private boolean inner = false;
     private boolean simple = false;
@@ -166,6 +167,10 @@ public boolean isNatural() {
         return natural;
     }
 
+    public boolean isGlobal() {
+        return global;
+    }
+
     public Join withNatural(boolean b) {
         this.setNatural(b);
         return this;
@@ -175,6 +180,10 @@ public void setNatural(boolean b) {
         natural = b;
     }
 
+    public void setGlobal(boolean b) {
+        global = b;
+    }
+
     /**
      * Whether is a "FULL" join
      *
@@ -299,6 +308,10 @@ public void setJoinWindow(KSQLJoinWindow joinWindow) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
 
+        if ( isGlobal() ) {
+            builder.append("GLOBAL ");
+        }
+
         if (isSimple() && isOuter()) {
             builder.append("OUTER ").append(rightItem);
         } else if (isSimple()) {
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
index 4036d9ad0..d930e944c 100644
--- a/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
+++ b/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());
+        }
     }
 
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
index cd268143e..3e2c18e83 100644
--- a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
+++ b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -401,6 +401,10 @@ public void visit(SubJoin subjoin) {
 
     @SuppressWarnings({"PMD.CyclomaticComplexity"})
     public void deparseJoin(Join join) {
+        if ( join.isGlobal() ) {
+            buffer.append(" GLOBAL ");
+        }
+
         if (join.isSimple() && join.isOuter()) {
             buffer.append(", OUTER ");
         } else if (join.isSimple()) {
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
index f10651f22..4b8b6da68 100644
--- a/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
+++ b/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
@@ -294,6 +294,9 @@ public void visit(Block block) {
             }
         }
         buffer.append("END");
+        if (block.hasSemicolonAfterEnd()) {
+            buffer.append(";");
+        }
     }
 
     @Override
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index aeb0ae341..567bcd9ed 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -155,6 +155,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_BIT:"BIT">
 |   <K_BOTH:"BOTH">
 |   <K_BY:"BY">
+|   <K_BYTES: "BYTES">
 |   <K_CACHE: "CACHE">
 |   <K_BUFFERS: "BUFFERS">
 |   <K_BYTE: "BYTE">
@@ -163,8 +164,6 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_CASE:"CASE">
 |   <K_CASEWHEN:"CASEWHEN">  /* H2 casewhen function */
 |   <K_CAST: "CAST">
-|   <K_TRY_CAST: "TRY_CAST">
-|   <K_SAFE_CAST: "SAFE_CAST">
 |   <K_CHARACTER:"CHARACTER">
 |   <K_CHANGE:"CHANGE">
 |   <K_CHANGES:"CHANGES">
@@ -258,6 +257,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_INNER:"INNER">
 |   <K_STRAIGHT:"STRAIGHT_JOIN">
 |   <K_INSERT:"INSERT">
+|   <K_INTERLEAVE: "INTERLEAVE">
 |   <K_INTERSECT:"INTERSECT">
 |   <K_INTERVAL:"INTERVAL">
 |   <K_INTO:"INTO">
@@ -325,6 +325,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_OVERLAPS:"OVERLAPS">
 |   <K_OPTIMIZE: "OPTIMIZE" >
 |   <K_PARALLEL:"PARALLEL">
+|   <K_PARENT:"PARENT">
 |   <K_PARTITION:"PARTITION">
 |   <K_PATH:"PATH">
 |   <K_PERCENT:"PERCENT">
@@ -350,6 +351,8 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_REGISTER: "REGISTER">
 |   <K_RENAME:"RENAME">
 |   <K_REPLACE:"REPLACE">
+|   <K_RESET:"RESET">
+|   <K_RESTART:"RESTART">
 |   <K_RESUMABLE: "RESUMABLE">
 |   <K_RESUME: "RESUME">
 |   <K_RESTRICT: "RESTRICT">
@@ -359,6 +362,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_ROLLBACK:"ROLLBACK">
 |   <K_ROW: "ROW">
 |   <K_ROWS: "ROWS">
+|   <K_SAFE_CAST: "SAFE_CAST">
 |   <K_SAVEPOINT: "SAVEPOINT">
 |   <K_SCHEMA: "SCHEMA">
 |   <K_SELECT: ("SELECT" | "SEL")>
@@ -367,8 +371,6 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_SEPARATOR:"SEPARATOR">
 |   <K_SESSION:"SESSION">
 |   <K_SET:"SET">
-|   <K_RESET:"RESET">
-|   <K_RESTART:"RESTART">
 |   <K_SETS:"SETS">
 |   <K_SHOW : "SHOW">
 |   <K_SHUTDOWN : "SHUTDOWN">
@@ -378,6 +380,8 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_SKIP: "SKIP">
 |   <K_SOME:"SOME">
 |   <K_START:"START">
+|   <K_STORED: "STORED">
+|   <K_STRING: "STRING">
 |   <K_SUSPEND:"SUSPEND">
 |   <K_SWITCH: "SWITCH">
 |   <K_SYNONYM:"SYNONYM">
@@ -399,6 +403,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_TRAILING:"TRAILING">
 |   <K_TRUNCATE:"TRUNCATE">
 |   <K_TRUE:"TRUE">
+|   <K_TRY_CAST: "TRY_CAST">
 |   <K_TUMBLING:"TUMBLING">
 |   <K_TYPE:"TYPE">
 |   <K_UNBOUNDED: "UNBOUNDED">
@@ -513,17 +518,17 @@ Statement Statement() #Statement:
     try {
         (
             <K_IF> condition=Condition() 
-            stm = SingleStatement() {  ifElseStatement = new IfElseStatement(condition, stm); }
+            ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
             [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
             [ LOOKAHEAD(2) 
-                <K_ELSE> stm2 = SingleStatement() {  ifElseStatement.setElseStatement(stm2);  }
+                <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2);  }
                 [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForElseStatement(true); }]
             ]
             <EOF>
         )
         |
         (
-            stm = SingleStatement()
+            ( stm = SingleStatement() | stm = Block() )
             [ <ST_SEMICOLON> ]
             <EOF>
         )
@@ -723,7 +728,7 @@ Block Block() #Block : {
         block.setStatements(stmts);
     }
 
-    <K_END> [LOOKAHEAD(2) <ST_SEMICOLON>]
+    <K_END> [LOOKAHEAD(2) <ST_SEMICOLON> { block.setSemicolonAfterEnd(true); } ]
     {
         return block;
     }
@@ -744,10 +749,10 @@ Statements Statements() #Statements : {
         (
             (
                  <K_IF> condition=Condition() 
-                 stm = SingleStatement() {  ifElseStatement = new IfElseStatement(condition, stm); }
+                 ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
                  [ LOOKAHEAD(2) 
                      [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                     <K_ELSE> stm2 = SingleStatement() {  ifElseStatement.setElseStatement(stm2);  } 
+                     <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2);  }
                  ]
 
                  { list.add( ifElseStatement ); }
@@ -772,10 +777,10 @@ Statements Statements() #Statements : {
             [
                 (
                     <K_IF> condition=Condition()
-                    stm = SingleStatement() {  ifElseStatement = new IfElseStatement(condition, stm); }
+                    ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
                     [ LOOKAHEAD(2)
                         [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                        <K_ELSE> stm2 = SingleStatement() {  ifElseStatement.setElseStatement(stm2);  }
+                        <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2);  }
                     ]
 
                     { list.add( ifElseStatement ); }
@@ -861,7 +866,7 @@ DeclareStatement Declare(): {
 
 
 SetStatement Set(): {
-    String name;
+    Object name;
     ArrayList<Expression> expList;
     boolean useEqual = false;
     SetStatement set;
@@ -876,10 +881,11 @@ SetStatement Set(): {
         [LOOKAHEAD(3) (tk = <K_LOCAL> | tk = <K_SESSION>) {effectParameter = tk.image; } ]
         ( LOOKAHEAD(2)
           <K_DATETIMELITERAL> <K_ZONE> { name = "Time Zone"; useEqual=false; }
+        | (name = UserVariable() ["=" { useEqual=true; } ])
         | (name = RelObjectNameExt() ["=" { useEqual=true; } ])
         )
     )
-    exp=SimpleExpression()
+    exp=Expression()
     {expList = new ArrayList<Expression>(); expList.add(exp); }
 
     { set = new SetStatement(name,expList).withUseEqual(useEqual).withEffectParameter(effectParameter); }
@@ -892,12 +898,12 @@ SetStatement Set(): {
                   <K_DATETIMELITERAL> <K_ZONE> { name = "Time Zone"; useEqual=false; }
                 | (name = RelObjectNameExt() ["=" { useEqual=true; } ])
               )
-              exp=SimpleExpression()
+              exp=Expression()
               {expList = new ArrayList<Expression>();
                 expList.add(exp);
                 set.add(name, expList, useEqual);}
             )
-            | exp=SimpleExpression() { expList.add(exp); }
+            | exp=Expression() { expList.add(exp); }
          ))*
     { return set; }
 }
@@ -1827,7 +1833,7 @@ String RelObjectNameWithoutValue() :
 {    Token tk = null; }
 {
     ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> |  tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> 
-       | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNQUIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
+       | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNQUIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
     { return tk.image; }
 }
 
@@ -2686,6 +2692,7 @@ Join JoinerExpression() #JoinerExpression:
 
 }
 {
+    [ <K_GLOBAL> { join.setGlobal(true); } ]
     [ <K_NATURAL> { join.setNatural(true); } ]
 
     [
@@ -3944,11 +3951,11 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(3, {!interrupted}) retval=CaseWhenExpression()
 
-        | retval = SimpleJdbcParameter()
+        | LOOKAHEAD(3) retval = SimpleJdbcParameter()
 
-        | LOOKAHEAD(2, {!interrupted}) retval=JdbcNamedParameter()
+        | LOOKAHEAD(2) retval=JdbcNamedParameter()
 
-        | retval=UserVariable()
+        | LOOKAHEAD(3) retval=UserVariable()
 
         | LOOKAHEAD(2, {!interrupted}) retval=NumericBind()
 
@@ -4171,7 +4178,33 @@ JsonExpression JsonExpression() : {
   CastExpression castExpr = null;
 }
 {
-    expr=Column()
+    (
+        LOOKAHEAD(3, {!interrupted}) expr=CaseWhenExpression()
+        |
+        expr = SimpleJdbcParameter()
+        |
+        LOOKAHEAD(2, {!interrupted}) expr=JdbcNamedParameter()
+        |
+        expr=UserVariable()
+        |
+        LOOKAHEAD(JsonFunction(), {!interrupted}) expr = JsonFunction()
+        |
+        LOOKAHEAD(JsonAggregateFunction(), {!interrupted}) expr = JsonAggregateFunction()
+        |
+        LOOKAHEAD(FullTextSearch(), {!interrupted}) expr = FullTextSearch()
+        /* Do not parse Functions as this will result in a major performance loss
+           The Performance related tests will fail.
+        |
+        LOOKAHEAD(Function(), {!interrupted}) expr=Function()
+        */
+        |
+        LOOKAHEAD(2, {!interrupted}) expr=Column()
+        |
+        token=<S_CHAR_LITERAL> { expr = new StringValue(token.image); }
+        |
+        LOOKAHEAD("(" expr=SubSelect() ")", {!interrupted} ) "(" expr=SubSelect() ")"
+    )
+
     ( "::" type=ColDataType() {
             castExpr = new CastExpression();
             castExpr.setUseCastKeyword(false);
@@ -5162,6 +5195,7 @@ CreateTable CreateTable():
     List<String> parameter = new ArrayList<String>();
     List<String> idxSpec = new ArrayList<String>();
     Table fkTable = null;
+    SpannerInterleaveIn interleaveIn = null;
     Select select = null;
     Table likeTable = null;
     CheckConstraint checkCs = null;
@@ -5334,6 +5368,7 @@ CreateTable CreateTable():
     <K_LIKE> ( LOOKAHEAD("(" Table() ")") "(" likeTable=Table() { createTable.setLikeTable(likeTable, true); } ")"
                  | likeTable=Table() { createTable.setLikeTable(likeTable, false); } )
     ]
+    [ <K_COMMA> interleaveIn = SpannerInterleaveIn( ) { createTable.setSpannerInterleaveIn(interleaveIn); } ]
     {
         createTable.setTable(table);
         if (indexes.size() > 0)
@@ -5350,6 +5385,25 @@ CreateTable CreateTable():
     }
 }
 
+SpannerInterleaveIn SpannerInterleaveIn():
+{
+    Table table = null;
+    SpannerInterleaveIn.OnDelete action = null;
+}
+{
+    <K_INTERLEAVE> <K_IN> <K_PARENT> table = Table()
+    [
+        <K_ON> <K_DELETE>
+            (
+                    <K_NO> <K_ACTION> { action = SpannerInterleaveIn.OnDelete.NO_ACTION; }
+                    | <K_CASCADE> { action = SpannerInterleaveIn.OnDelete.CASCADE; }
+            )
+    ]
+    {
+        return new SpannerInterleaveIn(table, action);
+    }
+}
+
 ColDataType ColDataType():
 {
     ColDataType colDataType = new ColDataType();
@@ -5358,13 +5412,25 @@ ColDataType ColDataType():
     List<String> argumentsStringList = new ArrayList<String>();
     List<Integer> array = new ArrayList<Integer>();
     List<String> name;
+    ColDataType arrayType;
 }
 {
     (
-		(tk=<K_CHARACTER> | tk=<K_BIT>) [tk2=<K_VARYING>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
-		| tk=<K_DOUBLE> [LOOKAHEAD(2) tk2=<K_PRECISION>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
+		tk=<K_ARRAY_LITERAL> (
+            ("<" arrayType = ColDataType() ">") {
+                 colDataType.setDataType("ARRAY<" + arrayType.getDataType() + ">");
+            }
+        )
+        |
+        LOOKAHEAD(2) (
+            tk=<K_BYTES> "(" (tk2=<S_LONG> | tk2=<S_IDENTIFIER>) ")"
+            | tk=<K_STRING> "(" (tk2=<S_LONG> | tk2=<S_IDENTIFIER>) ")"
+            | tk=<K_JSON> "(" (tk2=<S_LONG> | tk2=<S_IDENTIFIER>) ")"
+        ) { colDataType.setDataType(tk.image + " (" + tk2.image + ")"); }
+        | (tk=<K_CHARACTER> | tk=<K_BIT>) [tk2=<K_VARYING>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
+        | tk=<K_DOUBLE> [LOOKAHEAD(2) tk2=<K_PRECISION>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
 		| ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATETIMELITERAL> | tk=<K_DATE_LITERAL> | tk=<K_XML> | tk=<K_INTERVAL>
-			| tk=<DT_ZONE> | tk=<K_CHAR> | tk=<K_SET> | tk=<K_BINARY> | tk=<K_JSON> )
+			| tk=<DT_ZONE> | tk=<K_CHAR> | tk=<K_SET> | tk=<K_BINARY> | tk=<K_JSON> | tk=<K_STRING> )
                         [ "." (tk2=<S_IDENTIFIER> | tk2=<S_QUOTED_IDENTIFIER>) ]
 		    { if (tk2!=null) colDataType.setDataType(tk.image + "." + tk2.image); else colDataType.setDataType(tk.image); }
 		| tk=<K_UNSIGNED>  [LOOKAHEAD(2) tk2=<S_IDENTIFIER>] 
@@ -5503,7 +5569,13 @@ List<String> CreateParameter():
               )
               { param.add(retval); }
             |
-            tk=<K_AS> { param.add(tk.image); }
+            tk=<K_AS>  (
+                ("(" exp = Expression() ")") { param.add("AS"); param.add("(" + exp.toString() + ")");}
+                |
+                { param.add(tk.image);}
+            )
+            |
+            tk=<K_STORED> { param.add(tk.image); }
             |
             tk=<K_ON> { param.add(tk.image); }
             |
diff --git a/src/test/java/net/sf/jsqlparser/statement/BlockTest.java b/src/test/java/net/sf/jsqlparser/statement/BlockTest.java
index bd0bdd3dc..e0d46acf7 100644
--- a/src/test/java/net/sf/jsqlparser/statement/BlockTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/BlockTest.java
@@ -11,12 +11,13 @@
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.junit.jupiter.api.Test;
 
 /**
- *
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
 public class BlockTest {
@@ -26,24 +27,19 @@ public class BlockTest {
      */
     @Test
     public void testGetStatements() throws JSQLParserException {
-        Statements stmts = CCJSqlParserUtil.parseStatements("begin\nselect * from feature;\nend");
-        assertEquals("BEGIN\n"
-                + "SELECT * FROM feature;\n"
-                + "END;\n", stmts.toString());
+        String sqlStr = "begin\n"
+                        + "select * from feature;\n"
+                        + "end;";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
 
     @Test
     public void testBlock2() throws JSQLParserException {
-        Statements stmts = CCJSqlParserUtil.parseStatements("begin\n"
-                + "update table1 set a = 'xx' where b = 'condition1';\n"
-                + "update table1 set a = 'xx' where b = 'condition2';\n"
-                + "end;");
-        assertEquals("BEGIN\n"
-                + "UPDATE table1 SET a = 'xx' WHERE b = 'condition1';\n"
-                + "UPDATE table1 SET a = 'xx' WHERE b = 'condition2';\n"
-                + "END;\n"
-                + "", stmts.toString());
-
+        String sqlStr="begin\n"
+                      + "update table1 set a = 'xx' where b = 'condition1';\n"
+                      + "update table1 set a = 'xx' where b = 'condition2';\n"
+                      + "end;";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
 
     @Test
@@ -58,7 +54,31 @@ public void testBlockToStringIsNullSafe() throws JSQLParserException {
         Block block = new Block();
         block.setStatements(null);
         assertEquals("BEGIN\n"
-                + "END", block.toString());
+                     + "END", block.toString());
+    }
+
+    @Test
+    public void testIfElseBlock() throws JSQLParserException {
+        String sqlStr = "if (a=b) begin\n"
+                        + "update table1 set a = 'xx' where b = 'condition1';\n"
+                        + "update table1 set a = 'xx' where b = 'condition2';\n"
+                        + "end";
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        String sqlStr2 = "if (a=b) begin\n"
+                         + "update table1 set a = 'xx' where b = 'condition1';\n"
+                         + "update table1 set a = 'xx' where b = 'condition2';\n"
+                         + "end;\n"
+                         + "else begin\n"
+                         + "update table1 set a = 'xx' where b = 'condition1';\n"
+                         + "update table1 set a = 'xx' where b = 'condition2';\n"
+                         + "end;";
+
+        Statements statements = CCJSqlParserUtil.parseStatements(sqlStr2);
+        for (Statement stm : statements.getStatements()) {
+            TestUtils.assertDeparse(stm, sqlStr2, true);
+        }
     }
 
 }
diff --git a/src/test/java/net/sf/jsqlparser/statement/SetStatementTest.java b/src/test/java/net/sf/jsqlparser/statement/SetStatementTest.java
index 605d0af5e..b838f2224 100644
--- a/src/test/java/net/sf/jsqlparser/statement/SetStatementTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/SetStatementTest.java
@@ -70,4 +70,14 @@ public void testObject() {
 
         assertEquals(0, setStatement.getCount());
     }
+
+    @Test
+    public void testSettingUserVariable() throws JSQLParserException {
+        String sqlStr="set @Flag = 1";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        // issue #1237
+        sqlStr="SET @@global.time_zone = '01:00'";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }
diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
index 544fe253b..0bc241766 100644
--- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
@@ -31,6 +32,7 @@
 import net.sf.jsqlparser.statement.create.table.NamedConstraint;
 import static net.sf.jsqlparser.test.TestUtils.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -287,7 +289,7 @@ public void testAlterTableAddColumn5() throws JSQLParserException {
         assertEquals("col1", col1DataTypes.get(0).getColumnName());
         assertEquals("timestamp (3)", col1DataTypes.get(0).getColDataType().toString());
 
-        assertEquals(col1Exp.hasColumn(), false);
+        assertFalse(col1Exp.hasColumn());
     }
 
     @Test
@@ -301,7 +303,7 @@ public void testAlterTableAddColumn6() throws JSQLParserException {
         assertEquals("not", col1Exp.getColDataTypeList().get(0).getColumnSpecs().get(0));
         assertEquals("null", col1Exp.getColDataTypeList().get(0).getColumnSpecs().get(1));
 
-        assertEquals(col1Exp.hasColumn(), true);
+        assertTrue(col1Exp.hasColumn());
     }
 
     @Test
@@ -319,7 +321,7 @@ public void testAlterTableModifyColumn2() throws JSQLParserException {
 
         assertEquals(AlterOperation.MODIFY, alterExpression.getOperation());
 
-        assertEquals(alterExpression.hasColumn(), false);
+        assertFalse(alterExpression.hasColumn());
     }
 
     @Test
@@ -333,7 +335,7 @@ public void testAlterTableAlterColumn() throws JSQLParserException {
 
         assertEquals(AlterOperation.ALTER, alterExpression.getOperation());
 
-        assertEquals(alterExpression.hasColumn(), true);
+        assertTrue(alterExpression.hasColumn());
     }
 
     @Test
@@ -425,7 +427,7 @@ public void testAddConstraintKeyIssue320() throws JSQLParserException {
     }
 
     @Test
-    public void testIssue633() throws JSQLParserException, JSQLParserException, JSQLParserException {
+    public void testIssue633() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE team_phases ADD CONSTRAINT team_phases_id_key UNIQUE (id)");
     }
 
@@ -469,8 +471,9 @@ public void testAlterOnlyIssue928() throws JSQLParserException {
         Statement parsed = assertSqlCanBeParsedAndDeparsed(statement);
         Alter created = new Alter().withUseOnly(true).withTable(new Table("categories")).addAlterExpressions(
                 new AlterExpression().withOperation(AlterOperation.ADD).withIndex(new NamedConstraint()
-                        .withName(Arrays.asList("pk_categories")).withType("PRIMARY KEY")
-                        .addColumns(new ColumnParams("category_id"))));
+                                                                                          .withName(Collections.singletonList(
+                                                                                                  "pk_categories")).withType("PRIMARY KEY")
+                                                                                          .addColumns(new ColumnParams("category_id"))));
         assertDeparse(created, statement);
         assertEqualsObjectTree(parsed, created);
     }
@@ -480,6 +483,7 @@ public void testAlterConstraintWithoutFKSourceColumnsIssue929() throws JSQLParse
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE orders ADD CONSTRAINT fk_orders_customers FOREIGN KEY (customer_id) REFERENCES customers");
     }
 
+    @Test
     public void testAlterTableAlterColumnDropNotNullIssue918() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE \"user_table_t\" ALTER COLUMN name DROP NOT NULL");
     }
@@ -818,4 +822,52 @@ public void testAlterTableDropMultipleColumnsIfExists() throws JSQLParserExcepti
     public void testAlterTableDropMultipleColumnsIfExistsWithParams() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE test DROP COLUMN IF EXISTS name CASCADE, DROP COLUMN IF EXISTS surname CASCADE");
     }
+
+    @Test
+    public void testAlterTableAddColumnSpanner7() throws JSQLParserException {
+        final String sql = "ALTER TABLE ORDER_PATIENT ADD COLUMN FIRST_NAME_UPPERCASE STRING(MAX)" +
+                           " AS (UPPER(FIRST_NAME)) STORED";
+        Statement stmt = CCJSqlParserUtil.parse(sql);
+        assertStatementCanBeDeparsedAs(stmt, sql, true);
+        Alter alter = (Alter) stmt;
+        List<AlterExpression> alterExps = alter.getAlterExpressions();
+        AlterExpression col1Exp = alterExps.get(0);
+        assertTrue(col1Exp.getColDataTypeList().get(0).toString().endsWith(" STORED"));
+        assertTrue(col1Exp.hasColumn());
+    }
+
+    @Test
+    public void testAlterTableAddColumnSpanner8() throws JSQLParserException {
+        final String sql = "ALTER TABLE ORDER_PATIENT ADD COLUMN NAMES ARRAY<STRING(MAX)>";
+        Statement stmt = CCJSqlParserUtil.parse(sql);
+        assertStatementCanBeDeparsedAs(stmt, sql, true);
+        Alter alter = (Alter) stmt;
+        List<AlterExpression> alterExps = alter.getAlterExpressions();
+        AlterExpression col1Exp = alterExps.get(0);
+        assertTrue(col1Exp.hasColumn());
+        assertNotNull(col1Exp.getColDataTypeList());
+        assertEquals(1, col1Exp.getColDataTypeList().size());
+        ColumnDataType type = col1Exp.getColDataTypeList().get(0);
+        assertEquals("NAMES", type.getColumnName());
+        assertEquals("ARRAY<STRING (MAX)>", type.getColDataType().toString());
+    }
+
+    @Test
+    public void testAlterColumnSetCommitTimestamp1() throws JSQLParserException {
+        // @todo: properly implement SET OPTIONS, the current hack is terrible
+        //  final String sql = "ALTER TABLE FOCUS_PATIENT ALTER COLUMN UPDATE_DATE_TIME_GMT SET OPTIONS (allow_commit_timestamp=null)";
+
+        final String sql = "ALTER TABLE FOCUS_PATIENT ALTER COLUMN UPDATE_DATE_TIME_GMT SET OPTIONS (allow_commit_timestamp=true)";
+        Statement stmt = CCJSqlParserUtil.parse(sql);
+        assertStatementCanBeDeparsedAs(stmt, sql);
+        Alter alter = (Alter) stmt;
+        List<AlterExpression> alterExps = alter.getAlterExpressions();
+        AlterExpression col1Exp = alterExps.get(0);
+        assertTrue(col1Exp.hasColumn());
+        assertNotNull(col1Exp.getColDataTypeList());
+        assertEquals(1, col1Exp.getColDataTypeList().size());
+        ColumnDataType type = col1Exp.getColDataTypeList().get(0);
+        assertEquals("UPDATE_DATE_TIME_GMT", type.getColumnName());
+        assertEquals("UPDATE_DATE_TIME_GMT SET OPTIONS (allow_commit_timestamp=true)", type.toString());
+    }
 }
diff --git a/src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java b/src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java
index 6522f40d3..5ee5f9dbe 100644
--- a/src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java
@@ -64,7 +64,7 @@ public void testCreateTable3() throws JSQLParserException {
 
     @Test
     public void testCreateTableAsSelect()
-            throws JSQLParserException, JSQLParserException, JSQLParserException, JSQLParserException {
+            throws JSQLParserException {
         String statement = "CREATE TABLE a AS SELECT col1, col2 FROM b";
         assertSqlCanBeParsedAndDeparsed(statement);
     }
@@ -905,4 +905,38 @@ public void testCreateTableBinaryIssue1596() throws JSQLParserException {
                 + "INDEX name (name) USING BTREE"
                 + ") ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_bin");
     }
+
+    @Test
+    public void testCreateTableSpanner() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "CREATE TABLE COMMAND (\n" +
+                "   DATASET_ID      INT64       NOT NULL,\n" +
+                "   COMMAND_ID      STRING(MAX) NOT NULL,\n" +
+                "   VAL_BOOL        BOOL,\n" +
+                "   VAL_BYTES       BYTES(1024),\n" +
+                "   VAL_DATE        DATE,\n" +
+                "   VAL_TIMESTAMP   TIMESTAMP,\n" +
+                "   VAL_COMMIT_TIMESTAMP   TIMESTAMP NOT NULL OPTIONS (allow_commit_timestamp = true),\n" +
+                "   VAL_FLOAT64     FLOAT64,\n" +
+                "   VAL_JSON        JSON(2048),\n" +
+                "   VAL_NUMERIC     NUMERIC,\n" +
+                "   VAL_STRING      STRING(MAX),\n" +
+                "   VAL_TIMESTAMP   TIMESTAMP,\n" +
+                "   ARR_BOOL        ARRAY<BOOL>,\n" +
+                "   ARR_BYTES       ARRAY<BYTES(1024)>,\n" +
+                "   ARR_DATE        ARRAY<DATE>,\n" +
+                "   ARR_TIMESTAMP   ARRAY<TIMESTAMP>,\n" +
+                "   ARR_FLOAT64     ARRAY<FLOAT64>,\n" +
+                "   ARR_JSON        ARRAY<JSON(2048)>,\n" +
+                "   ARR_NUMERIC     ARRAY<NUMERIC>,\n" +
+                "   ARR_STRING      ARRAY<STRING(MAX)>,\n" +
+                "   ARR_TIMESTAMP   ARRAY<TIMESTAMP>,\n" +
+                "   PAYLOAD         STRING(MAX),\n" +
+                "   AUTHOR          STRING(MAX) NOT NULL,\n" +
+                "   SEARCH          STRING(MAX) AS (UPPER(AUTHOR)) STORED\n" +
+                " ) PRIMARY KEY ( DATASET_ID, COMMAND_ID )\n" +
+                ",   INTERLEAVE IN PARENT DATASET ON DELETE CASCADE", true);
+    }
+
+
 }
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/ClickHouseTest.java b/src/test/java/net/sf/jsqlparser/statement/select/ClickHouseTest.java
new file mode 100644
index 000000000..d7d97f627
--- /dev/null
+++ b/src/test/java/net/sf/jsqlparser/statement/select/ClickHouseTest.java
@@ -0,0 +1,23 @@
+/*-
+ * #%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.select;
+
+import org.junit.jupiter.api.Test;
+
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
+
+public class ClickHouseTest {
+
+    @Test
+    public void testGlobalJoin() throws Exception {
+        String sql = "SELECT a.*,b.* from lineorder_all as a  global left join supplier_all as b on a.LOLINENUMBER=b.SSUPPKEY";
+        assertSqlCanBeParsedAndDeparsed(sql, true);
+    }
+}
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/PostgresTest.java b/src/test/java/net/sf/jsqlparser/statement/select/PostgresTest.java
index 7eccca477..0751a5369 100644
--- a/src/test/java/net/sf/jsqlparser/statement/select/PostgresTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/select/PostgresTest.java
@@ -10,7 +10,9 @@
 package net.sf.jsqlparser.statement.select;
 
 import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.JsonExpression;
 import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class PostgresTest {
@@ -41,4 +43,14 @@ public void testExtractFunctionIssue1582() throws JSQLParserException {
                 "              as snijtijd_interval";
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @Test
+    public void testJSonExpressionIssue1696() throws JSQLParserException {
+        String sqlStr="SELECT '{\"key\": \"value\"}'::json -> 'key' AS X";
+        Select select = (Select) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        SelectExpressionItem selectExpressionItem = (SelectExpressionItem) plainSelect.getSelectItems().get(0);
+        Assertions.assertEquals("'key'", selectExpressionItem.getExpression(JsonExpression.class).getIdents().get(0));
+    }
 }
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/compound_statements03.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/compound_statements03.sql
index 12e993aad..d75c5a304 100644
--- a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/compound_statements03.sql
+++ b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/compound_statements03.sql
@@ -14,4 +14,5 @@ BEGIN
       example_table;
       END
 
---@FAILURE: Encountered unexpected token: "BEGIN" "BEGIN" recorded first on May 27, 2022, 10:29:48 PM
\ No newline at end of file
+--@FAILURE: Encountered unexpected token: "BEGIN" "BEGIN" recorded first on May 27, 2022, 10:29:48 PM
+--@FAILURE: Encountered unexpected token: ":" ":" recorded first on 9 Dec 2022, 14:03:29
\ No newline at end of file
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop01.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop01.sql
index c9d4dd3f1..409d8754d 100644
--- a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop01.sql
+++ b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop01.sql
@@ -16,4 +16,5 @@ begin
                  bulk collect into :empnos;
 end;
 
---@FAILURE: Encountered unexpected token: "begin" "BEGIN" recorded first on Aug 3, 2021, 7:20:08 AM
\ No newline at end of file
+--@FAILURE: Encountered unexpected token: "begin" "BEGIN" recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "forall" <S_IDENTIFIER> recorded first on 9 Dec 2022, 14:03:29
\ No newline at end of file
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop02.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop02.sql
index 06e0fac64..035af9ec2 100644
--- a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop02.sql
+++ b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/loop02.sql
@@ -21,4 +21,5 @@ BEGIN
   END LOOP outer_loop;
 END;
 
---@FAILURE: Encountered unexpected token: "BEGIN" "BEGIN" recorded first on Aug 3, 2021, 7:20:07 AM
\ No newline at end of file
+--@FAILURE: Encountered unexpected token: "BEGIN" "BEGIN" recorded first on Aug 3, 2021, 7:20:07 AM
+--@FAILURE: Encountered unexpected token: "<<" "<<" recorded first on 9 Dec 2022, 14:03:29
\ No newline at end of file