Merge origin/master

Author: wumpz

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

@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.statement.alter.Alter;
+import net.sf.jsqlparser.statement.alter.sequence.AlterSequence;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.schema.CreateSchema;
@@ -91,4 +92,6 @@ public interface StatementVisitor {
     void visit(Grant grant);
 
     void visit(CreateSequence createSequence);
+
+    void visit(AlterSequence alterSequence);
 }

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

@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.statement.alter.Alter;
+import net.sf.jsqlparser.statement.alter.sequence.AlterSequence;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.schema.CreateSchema;
@@ -170,4 +171,8 @@ public void visit(Grant grant) {
     @Override
     public void visit(CreateSequence createSequence) {
     }
+
+    @Override
+    public void visit(AlterSequence alterSequence) {
+    }
 }

src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java

@@ -0,0 +1,42 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.alter.sequence;
+
+import net.sf.jsqlparser.schema.Sequence;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.StatementVisitor;
+
+/**
+ * An {@code ALTER SEQUENCE} statement
+ */
+public class AlterSequence implements Statement {
+
+    public Sequence sequence;
+
+    public void setSequence(Sequence sequence) {
+        this.sequence = sequence;
+    }
+
+    public Sequence getSequence() {
+        return sequence;
+    }
+
+    @Override
+    public void accept(StatementVisitor statementVisitor) {
+        statementVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        String sql;
+        sql = "ALTER SEQUENCE " + sequence;
+        return sql;
+    }
+}

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

@@ -69,6 +69,7 @@
 import net.sf.jsqlparser.statement.Statements;
 import net.sf.jsqlparser.statement.UseStatement;
 import net.sf.jsqlparser.statement.alter.Alter;
+import net.sf.jsqlparser.statement.alter.sequence.AlterSequence;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.schema.CreateSchema;
@@ -877,6 +878,11 @@ public void visit(ArrayExpression array) {
 
     @Override
     public void visit(CreateSequence createSequence) {
+        throw new UnsupportedOperationException("Finding tables from CreateSequence is not supported");
+    }
 
+    @Override
+    public void visit(AlterSequence alterSequence) {
+        throw new UnsupportedOperationException("Finding tables from AlterSequence is not supported");
     }
 }

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

@@ -0,0 +1,28 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.util.deparser;
+
+/**
+ * A base for a Statement DeParser
+ * @param <S> the type of statement this DeParser supports
+ */
+abstract class AbstractDeParser<S> {
+    protected StringBuilder buffer;
+
+    protected AbstractDeParser(StringBuilder buffer) {
+        this.buffer = buffer;
+    }
+
+    /**
+     * DeParses the given statement into the buffer
+     * @param statement the statement to deparse
+     */
+    abstract void deParse(S statement);
+}

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

@@ -0,0 +1,32 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.util.deparser;
+
+import net.sf.jsqlparser.statement.alter.sequence.AlterSequence;
+
+/**
+ * A class to de-parse (that is, transform from JSqlParser hierarchy into a string) a
+ * {@link net.sf.jsqlparser.statement.alter.sequence.AlterSequence}
+ */
+public class AlterSequenceDeParser extends AbstractDeParser<AlterSequence> {
+
+    /**
+     * @param buffer the buffer that will be filled with the AlterSequence
+     */
+    public AlterSequenceDeParser(StringBuilder buffer) {
+        super(buffer);
+    }
+
+    @Override
+    public void deParse(AlterSequence statement) {
+        buffer.append("ALTER SEQUENCE ");
+        buffer.append(statement.getSequence());
+    }
+}

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

@@ -15,19 +15,18 @@
  * A class to de-parse (that is, transform from JSqlParser hierarchy into a string) a
  * {@link net.sf.jsqlparser.statement.create.sequence.CreateSequence}
  */
-public class CreateSequenceDeParser {
-
-    private StringBuilder buffer;
+public class CreateSequenceDeParser extends AbstractDeParser<CreateSequence>{
 
     /**
-     * @param buffer the buffer that will be filled with the select
+     * @param buffer the buffer that will be filled with the CreatSequence
      */
     public CreateSequenceDeParser(StringBuilder buffer) {
-        this.buffer = buffer;
+        super(buffer);
     }
 
-    public void deParse(CreateSequence createSequence) {
+    @Override
+    public void deParse(CreateSequence statement) {
         buffer.append("CREATE SEQUENCE ");
-        buffer.append(createSequence.getSequence());
+        buffer.append(statement.getSequence());
     }
 }

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

@@ -23,6 +23,7 @@
 import net.sf.jsqlparser.statement.Statements;
 import net.sf.jsqlparser.statement.UseStatement;
 import net.sf.jsqlparser.statement.alter.Alter;
+import net.sf.jsqlparser.statement.alter.sequence.AlterSequence;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.schema.CreateSchema;
@@ -293,4 +294,9 @@ public void visit(CreateSchema aThis) {
     public void visit(CreateSequence createSequence) {
         new CreateSequenceDeParser(buffer).deParse(createSequence);
     }
+
+    @Override
+    public void visit(AlterSequence alterSequence) {
+        new AlterSequenceDeParser(buffer).deParse(alterSequence);
+    }
 }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -37,6 +37,7 @@ import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.*;
 import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.alter.*;
+import net.sf.jsqlparser.statement.alter.sequence.*;
 import net.sf.jsqlparser.statement.comment.*;
 import net.sf.jsqlparser.statement.create.index.*;
 import net.sf.jsqlparser.statement.create.schema.*;
@@ -464,8 +465,12 @@ Statement SingleStatement() :
         LOOKAHEAD(CreateView())
         stm = CreateView()
         |
+        LOOKAHEAD(AlterView())
         stm = AlterView()
         |
+        LOOKAHEAD(AlterSequence())
+        stm = AlterSequence()
+        |
         stm = Drop()
         |
         stm = Truncate()
@@ -4699,26 +4704,21 @@ Sequence Sequence() #Sequence :
 }
 {
     data = RelObjectNameList()
-
     {
         Sequence sequence = new Sequence(data);
 		linkAST(sequence,jjtThis);
         return sequence;
     }
 }
 
-CreateSequence CreateSequence():
+List<Sequence.Parameter> SequenceParameters():
 {
-  CreateSequence createSequence = new CreateSequence();
-  Sequence sequence;
   List<Sequence.Parameter> sequenceParameters = new ArrayList<Sequence.Parameter>();
   Sequence.Parameter parameter = null;
   Token token = null;
 }
 {
-  <K_CREATE>
-  <K_SEQUENCE> sequence=Sequence() { createSequence.setSequence(sequence); }
-  (
+(
    (<K_INCREMENT> <K_BY> token=<S_LONG>
     {
         parameter = new Sequence.Parameter(Sequence.ParameterType.INCREMENT_BY);
@@ -4791,7 +4791,36 @@ CreateSequence CreateSequence():
    )
   )* //zero or many times those productions
   {
-    sequence.setParameters(sequenceParameters);
+    return sequenceParameters;
+  }
+}
+
+CreateSequence CreateSequence():
+{
+  CreateSequence createSequence = new CreateSequence();
+  Sequence sequence;
+  List<Sequence.Parameter> sequenceParameters;
+}
+{
+  <K_CREATE>
+  <K_SEQUENCE> sequence=Sequence() { createSequence.setSequence(sequence); }
+  sequenceParameters = SequenceParameters() { sequence.setParameters(sequenceParameters); }
+  {
     return createSequence;
   }
 }
+
+AlterSequence AlterSequence():
+{
+  AlterSequence alterSequence = new AlterSequence();
+  Sequence sequence;
+  List<Sequence.Parameter> sequenceParameters;
+}
+{
+  <K_ALTER>
+  <K_SEQUENCE> sequence=Sequence() { alterSequence.setSequence(sequence); }
+  sequenceParameters = SequenceParameters() { sequence.setParameters(sequenceParameters); }
+  {
+    return alterSequence;
+  }
+}