use unique name for backing index of unique constraints

fixes #411
liquibase · Oct 1, 2023 · b8bd7f5 · b8bd7f5
1 parent d297eac
commit b8bd7f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java b/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java
@@ -55,7 +55,7 @@ protected void addTo(DatabaseObject foundObject, DatabaseSnapshot snapshot) thro
                     i++;
                 }
 
-                Index index = getBackingIndex(uniqueConstraint, hibernateTable, snapshot);
+                Index index = getBackingIndex(uniqueConstraint, snapshot);
                 uniqueConstraint.setBackingIndex(index);
 
                 Scope.getCurrentScope().getLog(getClass()).info("Found unique constraint " + uniqueConstraint.toString());
@@ -77,7 +77,7 @@ protected void addTo(DatabaseObject foundObject, DatabaseSnapshot snapshot) thro
                     Scope.getCurrentScope().getLog(getClass()).info("Found unique constraint " + uniqueConstraint.toString());
                     table.getUniqueConstraints().add(uniqueConstraint);
 
-                    Index index = getBackingIndex(uniqueConstraint, hibernateTable, snapshot);
+                    Index index = getBackingIndex(uniqueConstraint, snapshot);
                     uniqueConstraint.setBackingIndex(index);
 
                 }
@@ -111,12 +111,12 @@ private String hashedName(String s) {
         }
     }
 
-    protected Index getBackingIndex(UniqueConstraint uniqueConstraint, org.hibernate.mapping.Table hibernateTable, DatabaseSnapshot snapshot) {
+    protected Index getBackingIndex(UniqueConstraint uniqueConstraint, DatabaseSnapshot snapshot) {
         Index index = new Index();
         index.setRelation(uniqueConstraint.getRelation());
         index.setColumns(uniqueConstraint.getColumns());
         index.setUnique(true);
-        index.setName(hibernateTable.getName() + "_IX");
+        index.setName(uniqueConstraint.getName() + "_IX");
 
         return index;
     }

diff --git a/src/test/java/com/example/ejb3/auction/Item.java b/src/test/java/com/example/ejb3/auction/Item.java
@@ -12,6 +12,9 @@ public class Item {
     @Column(unique = true)
     private String name;
 
+    @Column(unique = true)
+    private String key;
+
     public long getId() {
         return id;
     }
@@ -28,4 +31,7 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public String getKey() { return key; }
+
+    public void setKey(String key) { this.key = key; }
 }
diff --git a/src/test/java/liquibase/ext/hibernate/SpringPackageScanningIntegrationTest.java b/src/test/java/liquibase/ext/hibernate/SpringPackageScanningIntegrationTest.java
@@ -124,6 +124,7 @@ public void runGeneratedChangeLog() throws Exception {
 
         assertEquals(differences, 0, diffResult.getMissingObjects().size());
         assertEquals(differences, 0, diffResult.getUnexpectedObjects().size());
+        assertEquals(differences, 0, diffResult.getChangedObjects(UniqueConstraint.class).size());
 //        assertEquals(differences, 0, diffResult.getChangedObjects().size()); //unimportant differences in schema name and datatypes causing test to fail
 
     }