Fix problem with DB2, PostgerSQL with CTE table names for quoted tables

hibernate · Aug 24, 2021 · 39ee023 · 39ee023
1 parent 3f87ed1
commit 39ee023
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/...c/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java b/...c/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
@@ -15,6 +15,7 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
+import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -298,4 +299,16 @@ protected TableReference resolveUnionTableReference(
 			return tableGroup.getTableReference( tableGroup.getNavigablePath(), tableExpression );
 		}
 	}
+
+	protected String getCteTableName(String tableExpression) {
+		if ( Identifier.isQuoted( tableExpression ) ) {
+			tableExpression = unquote( tableExpression );
+			return DML_RESULT_TABLE_NAME_PREFIX + tableExpression;
+		}
+		return DML_RESULT_TABLE_NAME_PREFIX + tableExpression;
+	}
+
+	private String unquote(String tableExpression) {
+		return tableExpression.substring( 1, tableExpression.length() - 1 );
+	}
 }
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
@@ -68,7 +68,7 @@ protected void addDmlCtes(
 							// collection table
 							final String tableExpression = pluralAttribute.getSeparateCollectionTable();
 							final CteTable dmlResultCte = new CteTable(
-									DML_RESULT_TABLE_NAME_PREFIX + tableExpression,
+									getCteTableName( tableExpression ),
 									idSelectCte.getCteTable().getCteColumns(),
 									factory
 							);
@@ -97,7 +97,7 @@ protected void addDmlCtes(
 		getEntityDescriptor().visitConstraintOrderedTables(
 				(tableExpression, tableColumnsVisitationSupplier) -> {
 					final CteTable dmlResultCte = new CteTable(
-							DML_RESULT_TABLE_NAME_PREFIX + tableExpression,
+							getCteTableName( tableExpression ),
 							idSelectCte.getCteTable().getCteColumns(),
 							factory
 					);

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
@@ -140,7 +140,7 @@ protected void addDmlCtes(
 		getEntityDescriptor().visitConstraintOrderedTables(
 				(tableExpression, tableColumnsVisitationSupplier) -> {
 					final CteTable dmlResultCte = new CteTable(
-							DML_RESULT_TABLE_NAME_PREFIX + tableExpression,
+							getCteTableName( tableExpression ),
 							idSelectCte.getCteTable().getCteColumns(),
 							factory
 					);