HHH-19649 Fix QualifiedNameParser parsing for three part names

Author: beikov

hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java

@@ -135,8 +135,8 @@ else if ( tokens.length == 2 ) {
 			name = tokens[1];
 		}
 		else if ( tokens.length == 3 ) {
-			schemaName = tokens[0];
-			catalogName = tokens[1];
+			catalogName = tokens[0];
+			schemaName = tokens[1];
 			name = tokens[2];
 		}
 		else {

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

@@ -538,22 +538,12 @@ private static Table findTable(RuntimeModelCreationContext runtimeModelCreationC
 		final QualifiedNameParser.NameParts nameParts = QualifiedNameParser.INSTANCE.parse( tableName );
 		// Strip off the default catalog and schema names since these are not reflected in the Database#namespaces
 		final SqlStringGenerationContext sqlContext = runtimeModelCreationContext.getSqlStringGenerationContext();
-		final Identifier catalog;
-		final Identifier schema;
-		if ( nameParts.getCatalogName() != null && nameParts.getSchemaName() != null ) {
-			// For some reason, the QualifiedNameParser thinks a.b.c parses a as schema and b as catalog,
-			// though it renders catalog.schema.object
-			catalog = nameParts.getSchemaName() == null || nameParts.getSchemaName().equals( sqlContext.getDefaultCatalog() )
-					? null : nameParts.getSchemaName();
-			schema = nameParts.getCatalogName() == null || nameParts.getCatalogName().equals( sqlContext.getDefaultSchema() )
-					? null : nameParts.getCatalogName();
-		}
-		else {
-			catalog = nameParts.getCatalogName() == null || nameParts.getCatalogName().equals( sqlContext.getDefaultCatalog() )
-							? null : nameParts.getCatalogName();
-			schema = nameParts.getSchemaName() == null || nameParts.getSchemaName().equals( sqlContext.getDefaultSchema() )
-							? null : nameParts.getSchemaName();
-		}
+		final Identifier catalog =
+				nameParts.getCatalogName() == null || nameParts.getCatalogName().equals( sqlContext.getDefaultCatalog() )
+						? null : nameParts.getCatalogName();
+		final Identifier schema =
+				nameParts.getSchemaName() == null || nameParts.getSchemaName().equals( sqlContext.getDefaultSchema() )
+						? null : nameParts.getSchemaName();
 		final Identifier tableNameIdentifier = nameParts.getObjectName();
 		Namespace namespace = database.findNamespace( catalog, schema );
 		if ( namespace == null ) {

hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java

@@ -38,7 +38,7 @@ public void testStringSplittingWithSchema() {
 	@Test
 	public void testStringSplittingWithCatalogAndSchema() {
 		QualifiedNameParser.NameParts nameParts = PARSER.parse(
-				"schema.catalog.MyEntity",
+				"catalog.schema.MyEntity",
 				DEFAULT_CATALOG,
 				DEFAULT_SCHEMA
 		);

hibernate-core/src/test/java/org/hibernate/orm/test/naming/QualifiedNameParserTests.java

@@ -75,7 +75,7 @@ void testSimpleQuoted() {
 
 	@Test
 	void testIndividualQuotes() {
-		final String name = "`schema2`.`catalog2`.`tbl`";
+		final String name = "`catalog2`.`schema2`.`tbl`";
 		test(
 				name,
 				NO_CATALOG,