HHH-16792 Unqualify table expressions for cte table names

hibernate · Jun 30, 2023 · 63cccf8 · 63cccf8
1 parent 520394a
commit 63cccf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...te-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java b/...te-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 
 import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.relational.QualifiedNameParser;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -183,7 +184,7 @@ protected void addDmlCtes(
 	protected String getCteTableName(String tableExpression) {
 		final Dialect dialect = getSessionFactory().getJdbcServices().getDialect();
 		if ( Identifier.isQuoted( tableExpression ) ) {
-			tableExpression = tableExpression.substring( 1, tableExpression.length() - 1 );
+			tableExpression = QualifiedNameParser.INSTANCE.parse( tableExpression ).getObjectName().getText();
 		}
 		return Identifier.toIdentifier( DELETE_RESULT_TABLE_NAME_PREFIX + tableExpression ).render( dialect );
 	}

diff --git a/...te-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java b/...te-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java
@@ -12,6 +12,7 @@
 import java.util.function.BiConsumer;
 
 import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.relational.QualifiedNameParser;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.CollectionHelper;
@@ -324,7 +325,7 @@ private TableReference resolveTableReference(
 	protected String getCteTableName(String tableExpression) {
 		final Dialect dialect = getSessionFactory().getJdbcServices().getDialect();
 		if ( Identifier.isQuoted( tableExpression ) ) {
-			tableExpression = tableExpression.substring( 1, tableExpression.length() - 1 );
+			tableExpression = QualifiedNameParser.INSTANCE.parse( tableExpression ).getObjectName().getText();
 		}
 		return Identifier.toIdentifier( UPDATE_RESULT_TABLE_NAME_PREFIX + tableExpression ).render( dialect );
 	}