HHH-19260 - Move supportsJoinsInDelete() from AbstractSqlAstTranslator to Dialect

jrenaat · jrenaat · commit c8b72fcc7681 · 2025-03-18T21:45:09.000+01:00
Signed-off-by: Jan Schatteman &lt;jschatte@redhat.com&gt;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java
@@ -718,4 +718,9 @@ public String getFromDualForSelectOnly() {
 		return " from " + getDual();
 	}
 
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java
@@ -233,11 +233,6 @@ protected boolean supportsWithClauseInSubquery() {
 		return false;
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected boolean supportsSimpleQueryGrouping() {
 		return false;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
@@ -137,11 +137,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
@@ -1514,4 +1514,9 @@ public boolean supportsIntersect() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
@@ -147,11 +147,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java
@@ -1256,4 +1256,10 @@ private String getCheckConstraintOptions(CheckConstraint checkConstraint) {
 		}
 		return "";
 	}
+
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java
@@ -115,11 +115,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected void renderFromClauseAfterUpdateSet(UpdateStatement statement) {
 		if ( statement.getFromClause().getRoots().isEmpty() ) {
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java
@@ -1414,4 +1414,10 @@ public boolean isForUpdateLockingEnabled() {
 	public String getDual() {
 		return "dual";
 	}
+
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java
@@ -172,11 +172,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected void visitConflictClause(ConflictClause conflictClause) {
 		visitOnDuplicateKeyConflictClause( conflictClause );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java
@@ -736,4 +736,9 @@ public boolean supportsIntersect() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java
@@ -108,11 +108,6 @@ protected void renderUpdateClause(UpdateStatement updateStatement) {
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected void renderFromClauseAfterUpdateSet(UpdateStatement statement) {
 		if ( statement.getFromClause().getRoots().isEmpty() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -5922,4 +5922,8 @@ public boolean supportsJoinInMutationStatementSubquery() {
 		return true;
 	}
 
+	public boolean supportsJoinsInDelete() {
+		return false;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
@@ -150,11 +150,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
@@ -1608,4 +1608,9 @@ public boolean supportsIntersect() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
@@ -228,11 +228,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
@@ -1223,4 +1223,10 @@ private String getCheckConstraintOptions(CheckConstraint checkConstraint) {
 	public boolean supportsBindingNullForSetObject() {
 		return true;
 	}
+
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
@@ -115,11 +115,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected void renderFromClauseAfterUpdateSet(UpdateStatement statement) {
 		if ( statement.getFromClause().getRoots().isEmpty() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
@@ -766,4 +766,9 @@ public boolean supportsIntersect() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsJoinsInDelete() {
+		return true;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
@@ -94,11 +94,6 @@ protected void renderDeleteClause(DeleteStatement statement) {
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected void renderFromClauseAfterUpdateSet(UpdateStatement statement) {
 		if ( statement.getFromClause().getRoots().isEmpty() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java
@@ -152,11 +152,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected boolean supportsJoinsInDelete() {
-		return true;
-	}
-
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -1025,7 +1025,7 @@ public void visitInsertStatement(InsertSelectStatement statement) {
 
 	protected void visitDeleteStatementOnly(DeleteStatement statement) {
 		renderDeleteClause( statement );
-		if ( supportsJoinsInDelete() || !hasNonTrivialFromClause( statement.getFromClause() ) ) {
+		if ( dialect.supportsJoinsInDelete() || !hasNonTrivialFromClause( statement.getFromClause() ) ) {
 			visitWhereClause( statement.getRestriction() );
 		}
 		else {
@@ -1034,10 +1034,6 @@ protected void visitDeleteStatementOnly(DeleteStatement statement) {
 		visitReturningColumns( statement.getReturningColumns() );
 	}
 
-	protected boolean supportsJoinsInDelete() {
-		return false;
-	}
-
 	protected void renderDeleteClause(DeleteStatement statement) {
 		appendSql( "delete from " );
 		final Stack<Clause> clauseStack = getClauseStack();

Original file line number	Diff line number	Diff line change
`@@ -718,4 +718,9 @@ public String getFromDualForSelectOnly() {`
`718`	`718`	`return " from " + getDual();`
`719`	`719`	`}`
`720`	`720`
	`721`	`+ @Override`
	`722`	`+ public boolean supportsJoinsInDelete() {`
	`723`	`+ return true;`
	`724`	`+ }`
	`725`	`+`
`721`	`726`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- @Override`
`141`		`- protected boolean supportsJoinsInDelete() {`
`142`		`- return true;`
`143`		`- }`
`144`		`-`
`145`	`140`	`@Override`
`146`	`141`	`protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {`
`147`	`142`	`visitInsertStatement( sqlAst );`
Original file line number	Diff line number	Diff line change
`@@ -1514,4 +1514,9 @@ public boolean supportsIntersect() {`
`1514`	`1514`	`return false;`
`1515`	`1515`	`}`
`1516`	`1516`
	`1517`	`+ @Override`
	`1518`	`+ public boolean supportsJoinsInDelete() {`
	`1519`	`+ return true;`
	`1520`	`+ }`
	`1521`	`+`
`1517`	`1522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`- @Override`
`151`		`- protected boolean supportsJoinsInDelete() {`
`152`		`- return true;`
`153`		`- }`
`154`		`-`
`155`	`150`	`@Override`
`156`	`151`	`protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {`
`157`	`152`	`visitInsertStatement( sqlAst );`
Original file line number	Diff line number	Diff line change
`@@ -1256,4 +1256,10 @@ private String getCheckConstraintOptions(CheckConstraint checkConstraint) {`
`1256`	`1256`	`}`
`1257`	`1257`	`return "";`
`1258`	`1258`	`}`
	`1259`	`+`
	`1260`	`+ @Override`
	`1261`	`+ public boolean supportsJoinsInDelete() {`
	`1262`	`+ return true;`
	`1263`	`+ }`
	`1264`	`+`
`1259`	`1265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- @Override`
`119`		`- protected boolean supportsJoinsInDelete() {`
`120`		`- return true;`
`121`		`- }`
`122`		`-`
`123`	`118`	`@Override`
`124`	`119`	`protected void renderFromClauseAfterUpdateSet(UpdateStatement statement) {`
`125`	`120`	`if ( statement.getFromClause().getRoots().isEmpty() ) {`
Original file line number	Diff line number	Diff line change
`@@ -1414,4 +1414,10 @@ public boolean isForUpdateLockingEnabled() {`
`1414`	`1414`	`public String getDual() {`
`1415`	`1415`	`return "dual";`
`1416`	`1416`	`}`
	`1417`	`+`
	`1418`	`+ @Override`
	`1419`	`+ public boolean supportsJoinsInDelete() {`
	`1420`	`+ return true;`
	`1421`	`+ }`
	`1422`	`+`
`1417`	`1423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,11 +172,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`175`		`- @Override`
`176`		`- protected boolean supportsJoinsInDelete() {`
`177`		`- return true;`
`178`		`- }`
`179`		`-`
`180`	`175`	`@Override`
`181`	`176`	`protected void visitConflictClause(ConflictClause conflictClause) {`
`182`	`177`	`visitOnDuplicateKeyConflictClause( conflictClause );`
Original file line number	Diff line number	Diff line change
`@@ -736,4 +736,9 @@ public boolean supportsIntersect() {`
`736`	`736`	`return false;`
`737`	`737`	`}`
`738`	`738`
	`739`	`+ @Override`
	`740`	`+ public boolean supportsJoinsInDelete() {`
	`741`	`+ return true;`
	`742`	`+ }`
	`743`	`+`
`739`	`744`	`}`