diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java
index fabb110f87..0ffeae9469 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowGrantsStatement.java
@@ -47,7 +47,7 @@ public class SQLShowGrantsStatement extends SQLStatementImpl implements SQLShowS
     }
 
     public void setOn(SQLExpr x) {
-        if (x == null) {
+        if (x != null) {
             x.setParent(this);
         }
         this.on = x;
diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
index 0c5f93ebb1..f24fdde2dd 100644
--- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
@@ -3190,10 +3190,9 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
         SQLExprTableSource table = x.getTable();
         if (table != null) {
             table.accept(this);
-        }
-
-        for (SQLName column : x.getColumns()) {
-            addColumn(table.getName(), column.getSimpleName());
+            for (SQLName column : x.getColumns()) {
+                addColumn(table.getName(), column.getSimpleName());
+            }
         }
 
         return false;