get rid of some typecasts

gavinking · gavinking · commit 72b432b2b07b · 2025-04-17T21:46:00.000+02:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java
@@ -184,7 +184,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
 			@Override
 			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 					SessionFactoryImplementor sessionFactory, Statement statement) {
-				return new MariaDBLegacySqlAstTranslator<>( sessionFactory, statement );
+				return new MariaDBLegacySqlAstTranslator<>( sessionFactory, statement, MariaDBLegacyDialect.this );
 			}
 		};
 	}
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
@@ -46,11 +46,11 @@
  */
 public class MariaDBLegacySqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
 
-	private MariaDBLegacyDialect dialect;
+	private final MariaDBLegacyDialect dialect;
 
-	public MariaDBLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+	public MariaDBLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MariaDBLegacyDialect dialect) {
 		super( sessionFactory, statement );
-		this.dialect = (MariaDBLegacyDialect)super.getDialect();
+		this.dialect = dialect;
 	}
 
 	@Override
@@ -373,7 +373,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
 
 	@Override
 	public MariaDBLegacyDialect getDialect() {
-		return this.dialect;
+		return dialect;
 	}
 
 	private boolean supportsWindowFunctions() {
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
@@ -742,7 +742,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
 			@Override
 			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 					SessionFactoryImplementor sessionFactory, Statement statement) {
-				return new MySQLLegacySqlAstTranslator<>( sessionFactory, statement );
+				return new MySQLLegacySqlAstTranslator<>( sessionFactory, statement, MySQLLegacyDialect.this );
 			}
 		};
 	}
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
@@ -47,8 +47,11 @@
  */
 public class MySQLLegacySqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
 
-	public MySQLLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+	private final MySQLLegacyDialect dialect;
+
+	public MySQLLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MySQLLegacyDialect dialect) {
 		super( sessionFactory, statement );
+		this.dialect = dialect;
 	}
 
 	@Override
@@ -365,7 +368,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
 
 	@Override
 	public MySQLLegacyDialect getDialect() {
-		return (MySQLLegacyDialect) super.getDialect();
+		return dialect;
 	}
 
 	@Override
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
@@ -772,7 +772,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
 			@Override
 			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 					SessionFactoryImplementor sessionFactory, Statement statement) {
-				return new SingleStoreSqlAstTranslator<>( sessionFactory, statement );
+				return new SingleStoreSqlAstTranslator<>( sessionFactory, statement, SingleStoreDialect.this );
 			}
 		};
 	}
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
@@ -51,9 +51,9 @@ public class SingleStoreSqlAstTranslator<T extends JdbcOperation> extends Abstra
 
 	private final SingleStoreDialect dialect;
 
-	public SingleStoreSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+	public SingleStoreSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, SingleStoreDialect dialect) {
 		super( sessionFactory, statement );
-		this.dialect = (SingleStoreDialect) super.getDialect();
+		this.dialect = dialect;
 	}
 
 	@Override
@@ -396,7 +396,7 @@ protected void renderBackslashEscapedLikePattern(
 
 	@Override
 	public SingleStoreDialect getDialect() {
-		return this.dialect;
+		return dialect;
 	}
 
 	private boolean supportsWindowFunctions() {
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java
@@ -114,7 +114,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
 			@Override
 			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 					SessionFactoryImplementor sessionFactory, Statement statement) {
-				return new TiDBSqlAstTranslator<>( sessionFactory, statement );
+				return new TiDBSqlAstTranslator<>( sessionFactory, statement, TiDBDialect.this );
 			}
 		};
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java
@@ -51,9 +51,9 @@ public class TiDBSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAs
 
 	private final TiDBDialect dialect;
 
-	public TiDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+	public TiDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, TiDBDialect dialect) {
 		super( sessionFactory, statement );
-		this.dialect = (TiDBDialect) super.getDialect();
+		this.dialect = dialect;
 	}
 
 	@Override
@@ -327,7 +327,7 @@ protected String getForShare(int timeoutMillis) {
 
 	@Override
 	public TiDBDialect getDialect() {
-		return this.dialect;
+		return dialect;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
@@ -212,7 +212,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
 			@Override
 			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 					SessionFactoryImplementor sessionFactory, Statement statement) {
-				return new MariaDBSqlAstTranslator<>( sessionFactory, statement );
+				return new MariaDBSqlAstTranslator<>( sessionFactory, statement, MariaDBDialect.this );
 			}
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
@@ -731,7 +731,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
 			@Override
 			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 					SessionFactoryImplementor sessionFactory, Statement statement) {
-				return new MySQLSqlAstTranslator<>( sessionFactory, statement );
+				return new MySQLSqlAstTranslator<>( sessionFactory, statement, MySQLDialect.this );
 			}
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java
@@ -48,9 +48,9 @@ public class MariaDBSqlAstTranslator<T extends JdbcOperation> extends AbstractSq
 
 	private final MariaDBDialect dialect;
 
-	public MariaDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+	public MariaDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MariaDBDialect dialect) {
 		super( sessionFactory, statement );
-		this.dialect = (MariaDBDialect) super.getDialect();
+		this.dialect = dialect;
 	}
 
 	@Override
@@ -384,7 +384,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
 
 	@Override
 	public MariaDBDialect getDialect() {
-		return this.dialect;
+		return dialect;
 	}
 
 	private boolean supportsWindowFunctions() {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java
@@ -35,9 +35,7 @@
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl;
 import org.hibernate.sql.exec.spi.JdbcOperation;
-import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,8 +53,11 @@ public class MySQLSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlA
 	 */
 	private static final int MAX_CHAR_SIZE = (1 << 30) - 1;
 
-	public MySQLSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+	private final MySQLDialect dialect;
+
+	public MySQLSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MySQLDialect dialect) {
 		super( sessionFactory, statement );
+		this.dialect = dialect;
 	}
 
 	public static String getSqlType(CastTarget castTarget, SessionFactoryImplementor factory) {
@@ -229,18 +230,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 		}
 	}
 
-	@Override
-	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
-		visitInsertStatement( sqlAst );
-
-		return new JdbcOperationQueryInsertImpl(
-				getSql(),
-				getParameterBinders(),
-				getAffectedTableNames(),
-				getUniqueConstraintNameThatMayFail(sqlAst)
-		);
-	}
-
 	@Override
 	protected void visitConflictClause(ConflictClause conflictClause) {
 		visitOnDuplicateKeyConflictClause( conflictClause );
@@ -426,7 +415,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
 
 	@Override
 	public MySQLDialect getDialect() {
-		return (MySQLDialect) super.getDialect();
+		return dialect;
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {`
`184`	`184`	`@Override`
`185`	`185`	`protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`186`	`186`	`SessionFactoryImplementor sessionFactory, Statement statement) {`
`187`		`- return new MariaDBLegacySqlAstTranslator<>( sessionFactory, statement );`
	`187`	`+ return new MariaDBLegacySqlAstTranslator<>( sessionFactory, statement, MariaDBLegacyDialect.this );`
`188`	`188`	`}`
`189`	`189`	`};`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {`
`742`	`742`	`@Override`
`743`	`743`	`protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`744`	`744`	`SessionFactoryImplementor sessionFactory, Statement statement) {`
`745`		`- return new MySQLLegacySqlAstTranslator<>( sessionFactory, statement );`
	`745`	`+ return new MySQLLegacySqlAstTranslator<>( sessionFactory, statement, MySQLLegacyDialect.this );`
`746`	`746`	`}`
`747`	`747`	`};`
`748`	`748`	`}`
Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {`
`772`	`772`	`@Override`
`773`	`773`	`protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`774`	`774`	`SessionFactoryImplementor sessionFactory, Statement statement) {`
`775`		`- return new SingleStoreSqlAstTranslator<>( sessionFactory, statement );`
	`775`	`+ return new SingleStoreSqlAstTranslator<>( sessionFactory, statement, SingleStoreDialect.this );`
`776`	`776`	`}`
`777`	`777`	`};`
`778`	`778`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {`
`114`	`114`	`@Override`
`115`	`115`	`protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`116`	`116`	`SessionFactoryImplementor sessionFactory, Statement statement) {`
`117`		`- return new TiDBSqlAstTranslator<>( sessionFactory, statement );`
	`117`	`+ return new TiDBSqlAstTranslator<>( sessionFactory, statement, TiDBDialect.this );`
`118`	`118`	`}`
`119`	`119`	`};`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {`
`212`	`212`	`@Override`
`213`	`213`	`protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`214`	`214`	`SessionFactoryImplementor sessionFactory, Statement statement) {`
`215`		`- return new MariaDBSqlAstTranslator<>( sessionFactory, statement );`
	`215`	`+ return new MariaDBSqlAstTranslator<>( sessionFactory, statement, MariaDBDialect.this );`
`216`	`216`	`}`
`217`	`217`	`};`
`218`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {`
`731`	`731`	`@Override`
`732`	`732`	`protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`733`	`733`	`SessionFactoryImplementor sessionFactory, Statement statement) {`
`734`		`- return new MySQLSqlAstTranslator<>( sessionFactory, statement );`
	`734`	`+ return new MySQLSqlAstTranslator<>( sessionFactory, statement, MySQLDialect.this );`
`735`	`735`	`}`
`736`	`736`	`};`
`737`	`737`	`}`