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

ClarenceThreepwood · ClarenceThreepwood · commit 12a6e44f1104 · 2024-05-06T10:20:38.000-07:00
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();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public List<Node> getChildren()`
`85`	`85`	`@Override`
`86`	`86`	`public int hashCode()`
`87`	`87`	`{`
`88`		`- return Objects.hash(name, column);`
	`88`	`+ return Objects.hash(name, column, tableExists, columnNotExists);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`
`@@ -99,7 +99,9 @@ public boolean equals(Object obj)`
`99`	`99`	`}`
`100`	`100`	`AddColumn o = (AddColumn) obj;`
`101`	`101`	`return Objects.equals(name, o.name) &&`
`102`		`- Objects.equals(column, o.column);`
	`102`	`+ Objects.equals(column, o.column) &&`
	`103`	`+ Objects.equals(tableExists, o.tableExists) &&`
	`104`	`+ Objects.equals(columnNotExists, o.columnNotExists);`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`@Override`
`@@ -108,6 +110,8 @@ public String toString()`
`108`	`110`	`return toStringHelper(this)`
`109`	`111`	`.add("name", name)`
`110`	`112`	`.add("column", column)`
	`113`	`+ .add("tableExists", tableExists)`
	`114`	`+ .add("columnNotExists", columnNotExists)`
`111`	`115`	`.toString();`
`112`	`116`	`}`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public List<Node> getChildren()`
`77`	`77`	`@Override`
`78`	`78`	`public int hashCode()`
`79`	`79`	`{`
`80`		`- return Objects.hash(tableName, constraintSpecification);`
	`80`	`+ return Objects.hash(tableName, tableExists, constraintSpecification);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`@@ -91,6 +91,7 @@ public boolean equals(Object obj)`
`91`	`91`	`}`
`92`	`92`	`AddConstraint o = (AddConstraint) obj;`
`93`	`93`	`return Objects.equals(tableName, o.tableName) &&`
	`94`	`+ Objects.equals(tableExists, o.tableExists) &&`
`94`	`95`	`Objects.equals(constraintSpecification, o.constraintSpecification);`
`95`	`96`	`}`
`96`	`97`
`@@ -99,6 +100,7 @@ public String toString()`
`99`	`100`	`{`
`100`	`101`	`return toStringHelper(this)`
`101`	`102`	`.add("tableName", tableName)`
	`103`	`+ .add("tableExists", tableExists)`
`102`	`104`	`.add("constraintSpecification", constraintSpecification)`
`103`	`105`	`.toString();`
`104`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,13 +93,14 @@ public boolean equals(Object o)`
`93`	`93`	`AlterColumnNotNull that = (AlterColumnNotNull) o;`
`94`	`94`	`return Objects.equals(table, that.table) &&`
`95`	`95`	`Objects.equals(column, that.column) &&`
	`96`	`+ Objects.equals(tableExists, that.tableExists) &&`
`96`	`97`	`Objects.equals(dropConstraint, that.dropConstraint);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`@Override`
`100`	`101`	`public int hashCode()`
`101`	`102`	`{`
`102`		`- return Objects.hash(table, column, dropConstraint);`
	`103`	`+ return Objects.hash(table, column, tableExists, dropConstraint);`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`@Override`
`@@ -108,6 +109,7 @@ public String toString()`
`108`	`109`	`return toStringHelper(this)`
`109`	`110`	`.add("table", table)`
`110`	`111`	`.add("column", column)`
	`112`	`+ .add("tableExists", tableExists)`
`111`	`113`	`.add("dropConstraint", dropConstraint)`
`112`	`114`	`.toString();`
`113`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,15 @@ public boolean equals(Object o)`
`92`	`92`	`}`
`93`	`93`	`DropColumn that = (DropColumn) o;`
`94`	`94`	`return Objects.equals(table, that.table) &&`
`95`		`- Objects.equals(column, that.column);`
	`95`	`+ Objects.equals(column, that.column) &&`
	`96`	`+ Objects.equals(tableExists, that.tableExists) &&`
	`97`	`+ Objects.equals(columnExists, that.columnExists);`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`@Override`
`99`	`101`	`public int hashCode()`
`100`	`102`	`{`
`101`		`- return Objects.hash(table, column);`
	`103`	`+ return Objects.hash(table, column, tableExists, columnExists);`
`102`	`104`	`}`
`103`	`105`
`104`	`106`	`@Override`
`@@ -107,6 +109,8 @@ public String toString()`
`107`	`109`	`return toStringHelper(this)`
`108`	`110`	`.add("table", table)`
`109`	`111`	`.add("column", column)`
	`112`	`+ .add("tableExists", tableExists)`
	`113`	`+ .add("columnExists", columnExists)`
`110`	`114`	`.toString();`
`111`	`115`	`}`
`112`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public boolean equals(Object obj)`
`92`	`92`	`@Override`
`93`	`93`	`public int hashCode()`
`94`	`94`	`{`
`95`		`- return Objects.hash(schemaName, exists);`
	`95`	`+ return Objects.hash(schemaName, exists, cascade);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -100,13 +100,15 @@ public boolean equals(Object o)`
`100`	`100`	`RenameColumn that = (RenameColumn) o;`
`101`	`101`	`return Objects.equals(table, that.table) &&`
`102`	`102`	`Objects.equals(source, that.source) &&`
`103`		`- Objects.equals(target, that.target);`
	`103`	`+ Objects.equals(target, that.target) &&`
	`104`	`+ Objects.equals(tableExists, that.tableExists) &&`
	`105`	`+ Objects.equals(columnExists, that.columnExists);`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`@Override`
`107`	`109`	`public int hashCode()`
`108`	`110`	`{`
`109`		`- return Objects.hash(table, source, target);`
	`111`	`+ return Objects.hash(table, source, target, tableExists, columnExists);`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`@Override`
`@@ -116,6 +118,8 @@ public String toString()`
`116`	`118`	`.add("table", table)`
`117`	`119`	`.add("source", source)`
`118`	`120`	`.add("target", target)`
	`121`	`+ .add("tableExists", tableExists)`
	`122`	`+ .add("columnExists", columnExists)`
`119`	`123`	`.toString();`
`120`	`124`	`}`
`121`	`125`	`}`