HHH-12935 : Constraint and AuxiliaryDatabaseObject export identifiers…

… are not qualified by schema or catalog
hibernate · Oct 16, 2018 · 4d38145 · 4d38145
1 parent 3806d27
commit 4d38145
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/...-core/src/main/java/org/hibernate/boot/model/relational/NamedAuxiliaryDatabaseObject.java b/...-core/src/main/java/org/hibernate/boot/model/relational/NamedAuxiliaryDatabaseObject.java
@@ -8,6 +8,8 @@
 
 import java.util.Set;
 
+import org.hibernate.boot.model.naming.Identifier;
+
 /**
  * Mainly this is used to support legacy sequence exporting.
  *
@@ -42,6 +44,10 @@ public NamedAuxiliaryDatabaseObject(
 
 	@Override
 	public String getExportIdentifier() {
-		return name;
+		return new QualifiedNameImpl(
+				Identifier.toIdentifier( getCatalogName() ),
+				Identifier.toIdentifier( getSchemaName() ),
+				Identifier.toIdentifier( name )
+		).render();
 	}
 }
diff --git a/...core/src/main/java/org/hibernate/boot/model/relational/SimpleAuxiliaryDatabaseObject.java b/...core/src/main/java/org/hibernate/boot/model/relational/SimpleAuxiliaryDatabaseObject.java
@@ -93,6 +93,14 @@ public String[] sqlDropStrings(Dialect dialect) {
 		return copy;
 	}
 
+	protected String getCatalogName() {
+		return catalogName;
+	}
+
+	protected String getSchemaName() {
+		return schemaName;
+	}
+
 	private String injectCatalogAndSchema(String ddlString) {
 		String rtn = StringHelper.replace( ddlString, CATALOG_NAME_PLACEHOLDER, catalogName == null ? "" : catalogName );
 		rtn = StringHelper.replace( rtn, SCHEMA_NAME_PLACEHOLDER, schemaName == null ? "" : schemaName );

diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java
@@ -33,7 +33,7 @@ public ForeignKey() {
 	@Override
 	public String getExportIdentifier() {
 		// NOt sure name is always set.  Might need some implicit naming
-		return StringHelper.qualify( getTable().getName(), "FK-" + getName() );
+		return StringHelper.qualify( getTable().getExportIdentifier(), "FK-" + getName() );
 	}
 
 	public void disableCreation() {

diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Index.java b/hibernate-core/src/main/java/org/hibernate/mapping/Index.java
@@ -238,6 +238,6 @@ public String toString() {
 
 	@Override
 	public String getExportIdentifier() {
-		return StringHelper.qualify( getTable().getName(), "IDX-" + getName() );
+		return StringHelper.qualify( getTable().getExportIdentifier(), "IDX-" + getName() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java
@@ -89,6 +89,6 @@ public String generatedConstraintNamePrefix() {
 
 	@Override
 	public String getExportIdentifier() {
-		return StringHelper.qualify( getTable().getName(), "PK-" + getName() );
+		return StringHelper.qualify( getTable().getExportIdentifier(), "PK-" + getName() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
@@ -72,6 +72,6 @@ public String generatedConstraintNamePrefix() {
 
 	@Override
 	public String getExportIdentifier() {
-		return StringHelper.qualify( getTable().getName(), "UK-" + getName() );
+		return StringHelper.qualify( getTable().getExportIdentifier(), "UK-" + getName() );
 	}
 }