Fix toString() and hashCode() in relevant parse nodes

prestodb · May 6, 2024 · 12a6e44 · 12a6e44
1 parent feac167
commit 12a6e44
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 13 deletions.
diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java b/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java
@@ -1617,6 +1617,9 @@ protected Void visitDropConstraint(DropConstraint node, Integer indent)
         protected Void visitAddConstraint(AddConstraint node, Integer indent)
         {
             builder.append("ALTER TABLE ");
+            if (node.isTableExists()) {
+                builder.append("IF EXISTS ");
+            }
             builder.append(node.getTableName().toString());
             builder.append(" ADD ");
             builder.append(processConstraintDefinition(node.getConstraintSpecification()));

diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/AddColumn.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/AddColumn.java
@@ -85,7 +85,7 @@ public List<Node> getChildren()
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, column);
+        return Objects.hash(name, column, tableExists, columnNotExists);
     }
 
     @Override
@@ -99,7 +99,9 @@ public boolean equals(Object obj)
         }
         AddColumn o = (AddColumn) obj;
         return Objects.equals(name, o.name) &&
-                Objects.equals(column, o.column);
+                Objects.equals(column, o.column) &&
+                Objects.equals(tableExists, o.tableExists) &&
+                Objects.equals(columnNotExists, o.columnNotExists);
     }
 
     @Override
@@ -108,6 +110,8 @@ public String toString()
         return toStringHelper(this)
                 .add("name", name)
                 .add("column", column)
+                .add("tableExists", tableExists)
+                .add("columnNotExists", columnNotExists)
                 .toString();
     }
 }
diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/AddConstraint.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/AddConstraint.java
@@ -77,7 +77,7 @@ public List<Node> getChildren()
     @Override
     public int hashCode()
     {
-        return Objects.hash(tableName, constraintSpecification);
+        return Objects.hash(tableName, tableExists, constraintSpecification);
     }
 
     @Override
@@ -91,6 +91,7 @@ public boolean equals(Object obj)
         }
         AddConstraint o = (AddConstraint) obj;
         return Objects.equals(tableName, o.tableName) &&
+                Objects.equals(tableExists, o.tableExists) &&
                 Objects.equals(constraintSpecification, o.constraintSpecification);
     }
 
@@ -99,6 +100,7 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("tableName", tableName)
+                .add("tableExists", tableExists)
                 .add("constraintSpecification", constraintSpecification)
                 .toString();
     }

diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/AlterColumnNotNull.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/AlterColumnNotNull.java
@@ -93,13 +93,14 @@ public boolean equals(Object o)
         AlterColumnNotNull that = (AlterColumnNotNull) o;
         return Objects.equals(table, that.table) &&
                 Objects.equals(column, that.column) &&
+                Objects.equals(tableExists, that.tableExists) &&
                 Objects.equals(dropConstraint, that.dropConstraint);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(table, column, dropConstraint);
+        return Objects.hash(table, column, tableExists, dropConstraint);
     }
 
     @Override
@@ -108,6 +109,7 @@ public String toString()
         return toStringHelper(this)
                 .add("table", table)
                 .add("column", column)
+                .add("tableExists", tableExists)
                 .add("dropConstraint", dropConstraint)
                 .toString();
     }

diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/DropColumn.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/DropColumn.java
@@ -92,13 +92,15 @@ public boolean equals(Object o)
         }
         DropColumn that = (DropColumn) o;
         return Objects.equals(table, that.table) &&
-                Objects.equals(column, that.column);
+                Objects.equals(column, that.column) &&
+                Objects.equals(tableExists, that.tableExists) &&
+                Objects.equals(columnExists, that.columnExists);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(table, column);
+        return Objects.hash(table, column, tableExists, columnExists);
     }
 
     @Override
@@ -107,6 +109,8 @@ public String toString()
         return toStringHelper(this)
                 .add("table", table)
                 .add("column", column)
+                .add("tableExists", tableExists)
+                .add("columnExists", columnExists)
                 .toString();
     }
 }
diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/DropConstraint.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/DropConstraint.java
@@ -92,13 +92,15 @@ public boolean equals(Object o)
         }
         DropConstraint that = (DropConstraint) o;
         return Objects.equals(tableName, that.tableName) &&
-                Objects.equals(constraintName, that.constraintName);
+                Objects.equals(constraintName, that.constraintName) &&
+                Objects.equals(tableExists, that.tableExists) &&
+                Objects.equals(constraintExists, constraintExists);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(tableName, constraintName);
+        return Objects.hash(tableName, tableExists, constraintName);
     }
 
     @Override
@@ -107,6 +109,8 @@ public String toString()
         return toStringHelper(this)
                 .add("table", tableName)
                 .add("constraint", constraintName)
+                .add("tableExists", tableExists)
+                .add("constraintExists", constraintExists)
                 .toString();
     }
 }
diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/DropSchema.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/DropSchema.java
@@ -92,7 +92,7 @@ public boolean equals(Object obj)
     @Override
     public int hashCode()
     {
-        return Objects.hash(schemaName, exists);
+        return Objects.hash(schemaName, exists, cascade);
     }
 
     @Override

diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/RenameColumn.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/RenameColumn.java
@@ -100,13 +100,15 @@ public boolean equals(Object o)
         RenameColumn that = (RenameColumn) o;
         return Objects.equals(table, that.table) &&
                 Objects.equals(source, that.source) &&
-                Objects.equals(target, that.target);
+                Objects.equals(target, that.target) &&
+                Objects.equals(tableExists, that.tableExists) &&
+                Objects.equals(columnExists, that.columnExists);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(table, source, target);
+        return Objects.hash(table, source, target, tableExists, columnExists);
     }
 
     @Override
@@ -116,6 +118,8 @@ public String toString()
                 .add("table", table)
                 .add("source", source)
                 .add("target", target)
+                .add("tableExists", tableExists)
+                .add("columnExists", columnExists)
                 .toString();
     }
 }
diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/tree/RenameTable.java b/presto-parser/src/main/java/com/facebook/presto/sql/tree/RenameTable.java
@@ -77,7 +77,7 @@ public List<Node> getChildren()
     @Override
     public int hashCode()
     {
-        return Objects.hash(source, target);
+        return Objects.hash(source, target, exists);
     }
 
     @Override
@@ -91,7 +91,8 @@ public boolean equals(Object obj)
         }
         RenameTable o = (RenameTable) obj;
         return Objects.equals(source, o.source) &&
-                Objects.equals(target, o.target);
+                Objects.equals(target, o.target) &&
+                Objects.equals(exists, o.exists);
     }
 
     @Override
@@ -100,6 +101,7 @@ public String toString()
         return toStringHelper(this)
                 .add("source", source)
                 .add("target", target)
+                .add("exists", exists)
                 .toString();
     }
 }