HHH-15517 Fix for temporary table prefixing the qualified table name instead of just table name

Author: beikov

hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java

@@ -213,7 +213,7 @@ public boolean isQuoted() {
 	 */
 	public String render(Dialect dialect) {
 		return isQuoted
-				? dialect.openQuote() + getText() + dialect.closeQuote()
+				? dialect.toQuotedIdentifier( getText() )
 				: getText();
 	}
 

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -2360,6 +2360,22 @@ public char closeQuote() {
 		return '"';
 	}
 
+	/**
+	 * Apply dialect-specific quoting.
+	 *
+	 * @param name The value to be quoted.
+	 * @return The quoted value.
+	 * @see #openQuote()
+	 * @see #closeQuote()
+	 */
+	public String toQuotedIdentifier(String name) {
+		if ( name == null ) {
+			return null;
+		}
+
+		return openQuote() + name + closeQuote();
+	}
+
 	/**
 	 * Apply dialect-specific quoting.
 	 * <p/>

hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java

@@ -599,6 +599,20 @@ public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<St
 		return sql + new ForUpdateFragment( this, aliasedLockOptions, keyColumnNames ).toFragmentString();
 	}
 
+	@Override
+	public String toQuotedIdentifier(String name) {
+		if ( name == null || name.isEmpty() ) {
+			return name;
+		}
+		if ( name.charAt( 0 ) == '#' ) {
+			// Temporary tables must start with a '#' character,
+			// but Sybase doesn't support quoting of such identifiers,
+			// so we simply don't apply quoting in this case
+			return name;
+		}
+		return super.toQuotedIdentifier( name );
+	}
+
 	@Override
 	public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 		return EXTRACTOR;

hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java

@@ -14,6 +14,9 @@
 
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.Exportable;
+import org.hibernate.boot.model.relational.QualifiedNameParser;
+import org.hibernate.boot.model.relational.QualifiedTableName;
+import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.OptimizableGenerator;
@@ -64,24 +67,38 @@ private TemporaryTable(
 			EntityMappingType entityDescriptor,
 			Function<String, String> temporaryTableNameAdjuster,
 			Dialect dialect,
+			SqlStringGenerationContext sqlStringGenerationContext,
 			Function<TemporaryTable, List<TemporaryTableColumn>> columnInitializer) {
 		this.entityDescriptor = entityDescriptor;
 
 		// The table name might be a sub-query, which is inappropriate for a temporary table name
 		final String originalTableName = entityDescriptor.getEntityPersister().getSynchronizedQuerySpaces()[0];
-		final String name;
-		if ( Identifier.isQuoted( originalTableName ) ) {
-			name = dialect.quote( temporaryTableNameAdjuster.apply( Identifier.unQuote( originalTableName ) ) );
-		}
-		else {
-			name = temporaryTableNameAdjuster.apply( originalTableName );
-		}
-		if ( name.length() > dialect.getMaxIdentifierLength() ) {
-			this.qualifiedTableName = name.substring( 0, dialect.getMaxIdentifierLength() );
+		final QualifiedNameParser.NameParts nameParts = QualifiedNameParser.INSTANCE.parse( originalTableName );
+		final QualifiedNameParser.NameParts adjustedNameParts = QualifiedNameParser.INSTANCE.parse(
+				temporaryTableNameAdjuster.apply( nameParts.getObjectName().getText() )
+		);
+		final String temporaryTableName = adjustedNameParts.getObjectName().getText();
+		final Identifier tableNameIdentifier;
+		if ( temporaryTableName.length() > dialect.getMaxIdentifierLength() ) {
+			tableNameIdentifier = new Identifier(
+					temporaryTableName.substring( 0, dialect.getMaxIdentifierLength() ),
+					nameParts.getObjectName().isQuoted()
+			);
 		}
 		else {
-			this.qualifiedTableName = name;
+			tableNameIdentifier = new Identifier( temporaryTableName, nameParts.getObjectName().isQuoted() );
 		}
+		this.qualifiedTableName = sqlStringGenerationContext.format(
+				new QualifiedTableName(
+						adjustedNameParts.getCatalogName() != null
+								? adjustedNameParts.getCatalogName()
+								: nameParts.getCatalogName(),
+						adjustedNameParts.getSchemaName() != null
+								? adjustedNameParts.getSchemaName()
+								: nameParts.getSchemaName(),
+						tableNameIdentifier
+				)
+		);
 		this.dialect = dialect;
 		if ( dialect.getSupportedTemporaryTableKind() == TemporaryTableKind.PERSISTENT ) {
 			final TypeConfiguration typeConfiguration = entityDescriptor.getEntityPersister()
@@ -123,6 +140,7 @@ public static TemporaryTable createIdTable(
 				entityDescriptor,
 				temporaryTableNameAdjuster,
 				dialect,
+				runtimeModelCreationContext.getSessionFactory().getSqlStringGenerationContext(),
 				temporaryTable -> {
 					final List<TemporaryTableColumn> columns = new ArrayList<>();
 					final PersistentClass entityBinding = runtimeModelCreationContext.getBootModel()
@@ -211,6 +229,7 @@ public static TemporaryTable createEntityTable(
 				entityDescriptor,
 				temporaryTableNameAdjuster,
 				dialect,
+				runtimeModelCreationContext.getSessionFactory().getSqlStringGenerationContext(),
 				temporaryTable -> {
 					final List<TemporaryTableColumn> columns = new ArrayList<>();
 					final PersistentClass entityBinding = runtimeModelCreationContext.getBootModel()