Merge remote-tracking branch 'origin/master' into feat/mysql-index-options

Author: minleejae

src/main/java/net/sf/jsqlparser/parser/feature/Feature.java

@@ -643,7 +643,7 @@ public enum Feature {
     /**
      * @see Grant
      */
-    grant,
+    grant, revoke, createRole, alterRole, alterDefaultPrivileges,
     /**
      * @see Function
      */

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

@@ -9,6 +9,11 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.statement.role.CreateRole;
+import net.sf.jsqlparser.statement.role.AlterRole;
+import net.sf.jsqlparser.statement.grant.Revoke;
+import net.sf.jsqlparser.statement.grant.AlterDefaultPrivileges;
+import net.sf.jsqlparser.statement.create.trigger.CreateTrigger;
 import net.sf.jsqlparser.statement.create.type.CreateType;
 import net.sf.jsqlparser.statement.alter.AlterType;
 import net.sf.jsqlparser.statement.create.domain.CreateDomain;
@@ -859,6 +864,31 @@ public <S> Void visit(TableFunction tableFunction, S context) {
         }
     }
 
+    @Override
+    public <S> Void visit(CreateRole statement, S context) {
+        return schemaOnly();
+    }
+
+    @Override
+    public <S> Void visit(AlterRole statement, S context) {
+        return schemaOnly();
+    }
+
+    @Override
+    public <S> Void visit(Revoke statement, S context) {
+        return schemaOnly();
+    }
+
+    @Override
+    public <S> Void visit(AlterDefaultPrivileges statement, S context) {
+        return schemaOnly();
+    }
+
+    @Override
+    public <S> Void visit(CreateTrigger statement, S context) {
+        return schemaOnly();
+    }
+
     @Override
     public <S> Void visit(CreateType statement, S context) {
         analysis.claimTopLevel();

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

@@ -9,6 +9,10 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.statement.role.CreateRole;
+import net.sf.jsqlparser.statement.role.AlterRole;
+import net.sf.jsqlparser.statement.grant.Revoke;
+import net.sf.jsqlparser.statement.grant.AlterDefaultPrivileges;
 import net.sf.jsqlparser.statement.create.type.CreateType;
 import net.sf.jsqlparser.statement.alter.AlterType;
 import net.sf.jsqlparser.statement.create.domain.CreateDomain;
@@ -404,6 +408,39 @@ default void visit(CreatePolicy createPolicy) {
         this.visit(createPolicy, null);
     }
 
+
+    default <S> T visit(CreateRole statement, S context) {
+        return null;
+    }
+
+    default void visit(CreateRole statement) {
+        visit(statement, null);
+    }
+
+    default <S> T visit(AlterRole statement, S context) {
+        return null;
+    }
+
+    default void visit(AlterRole statement) {
+        visit(statement, null);
+    }
+
+    default <S> T visit(Revoke statement, S context) {
+        return null;
+    }
+
+    default void visit(Revoke statement) {
+        visit(statement, null);
+    }
+
+    default <S> T visit(AlterDefaultPrivileges statement, S context) {
+        return null;
+    }
+
+    default void visit(AlterDefaultPrivileges statement) {
+        visit(statement, null);
+    }
+
     default <S> T visit(CreateType statement, S context) {
         return null;
     }

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

@@ -9,6 +9,11 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.statement.role.CreateRole;
+import net.sf.jsqlparser.statement.role.AlterRole;
+import net.sf.jsqlparser.statement.role.RoleOption;
+import net.sf.jsqlparser.statement.grant.Revoke;
+import net.sf.jsqlparser.statement.grant.AlterDefaultPrivileges;
 import net.sf.jsqlparser.statement.create.type.CreateType;
 import net.sf.jsqlparser.statement.alter.AlterType;
 import net.sf.jsqlparser.statement.create.domain.CreateDomain;
@@ -363,6 +368,11 @@ public <S> T visit(CreateTable createTable, S context) {
 
     @Override
     public <S> T visit(CreateTrigger createTrigger, S context) {
+        createTrigger.visit(t -> t.accept(fromItemVisitor, context),
+                e -> e.accept(expressionVisitor, context));
+        if (createTrigger.getBody() != null) {
+            createTrigger.getBody().accept(this, context);
+        }
         return null;
     }
 
@@ -507,6 +517,8 @@ public <S> T visit(DeclareStatement declareStatement, S context) {
 
     @Override
     public <S> T visit(Grant grant, S context) {
+        grant.getClause().visit(t -> t.accept(fromItemVisitor, context),
+                e -> e.accept(expressionVisitor, context));
         return null;
     }
 
@@ -609,6 +621,47 @@ public <S> T visit(Export export, S context) {
         return null;
     }
 
+    @Override
+    public <S> T visit(CreateRole statement, S context) {
+        for (RoleOption option : statement.getOptions()) {
+            if (option.getValue() != null) {
+                option.getValue().accept(expressionVisitor, context);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public <S> T visit(AlterRole statement, S context) {
+        for (RoleOption option : statement.getOptions()) {
+            if (option.getValue() != null) {
+                option.getValue().accept(expressionVisitor, context);
+            }
+        }
+        if (statement.getValues() != null) {
+            statement.getValues().forEach(e -> e.accept(expressionVisitor, context));
+        }
+        return null;
+    }
+
+    @Override
+    public <S> T visit(Revoke statement, S context) {
+        statement.getClause().visit(t -> t.accept(fromItemVisitor, context),
+                e -> e.accept(expressionVisitor, context));
+        return null;
+    }
+
+    @Override
+    public <S> T visit(AlterDefaultPrivileges statement, S context) {
+        if (statement.getGrant() != null) {
+            statement.getGrant().accept(this, context);
+        }
+        if (statement.getRevoke() != null) {
+            statement.getRevoke().accept(this, context);
+        }
+        return null;
+    }
+
     @Override
     public <S> T visit(CreateType statement, S context) {
 

src/main/java/net/sf/jsqlparser/statement/comment/Comment.java

@@ -69,7 +69,8 @@ public String toString() {
         } else if (view != null) {
             sql += "VIEW " + view + " ";
         }
-        sql += "IS " + comment;
+        // a null comment stands for PostgreSQL's COMMENT ON ... IS NULL, which removes the comment
+        sql += "IS " + (comment != null ? comment : "NULL");
         return sql;
     }