diff --git a/.snyk b/.snyk index 50b563f8..2f01e789 100644 --- a/.snyk +++ b/.snyk @@ -5,6 +5,5 @@ ignore: SNYK-JAVA-ORGLIQUIBASE-2419059: - '*': reason: ignore liquibase version - expires: 2023-03-07T00:00:00.000Z created: 2022-03-07T15:57:03.089Z patch: {} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 81d32891..abd29afb 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ UTF-8 6.1.7.Final - 6.0.5 + 6.0.7 0-SNAPSHOT ${env.GITHUB_TOKEN} @@ -149,7 +149,7 @@ org.yaml snakeyaml - 1.33 + 2.0 test @@ -194,14 +194,14 @@ maven-resources-plugin - 3.3.0 + 3.3.1 UTF-8 maven-compiler-plugin - 3.10.1 + 3.11.0 17 true @@ -211,7 +211,7 @@ maven-surefire-plugin - 2.22.2 + 3.0.0 true plain @@ -283,7 +283,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.9 diff --git a/src/main/java/liquibase/ext/hibernate/diff/ChangedColumnChangeGenerator.java b/src/main/java/liquibase/ext/hibernate/diff/ChangedColumnChangeGenerator.java new file mode 100644 index 00000000..dffc5f3c --- /dev/null +++ b/src/main/java/liquibase/ext/hibernate/diff/ChangedColumnChangeGenerator.java @@ -0,0 +1,78 @@ +package liquibase.ext.hibernate.diff; + +import liquibase.change.Change; +import liquibase.database.Database; +import liquibase.diff.Difference; +import liquibase.diff.ObjectDifferences; +import liquibase.diff.output.DiffOutputControl; +import liquibase.ext.hibernate.database.HibernateDatabase; +import liquibase.statement.DatabaseFunction; +import liquibase.structure.DatabaseObject; +import liquibase.structure.core.Column; +import liquibase.structure.core.DataType; + +import java.util.List; + +/** + * Hibernate and database types tend to look different even though they are not. + * The only change that we are handling it size change, and even for this one there are exceptions. + */ +public class ChangedColumnChangeGenerator extends liquibase.diff.output.changelog.core.ChangedColumnChangeGenerator { + + private static final List TYPES_TO_IGNORE_SIZE = List.of("TIMESTAMP"); + + @Override + public int getPriority(Class objectType, Database database) { + if (Column.class.isAssignableFrom(objectType)) { + return PRIORITY_ADDITIONAL; + } + return PRIORITY_NONE; + } + + @Override + protected void handleTypeDifferences(Column column, ObjectDifferences differences, DiffOutputControl control, List changes, Database referenceDatabase, Database comparisonDatabase) { + if (referenceDatabase instanceof HibernateDatabase || comparisonDatabase instanceof HibernateDatabase) { + handleSizeChange(column, differences, control, changes, referenceDatabase, comparisonDatabase); + } else { + super.handleTypeDifferences(column, differences, control, changes, referenceDatabase, comparisonDatabase); + } + } + + private void handleSizeChange(Column column, ObjectDifferences differences, DiffOutputControl control, List changes, Database referenceDatabase, Database comparisonDatabase) { + if (TYPES_TO_IGNORE_SIZE.stream().anyMatch(s -> s.equalsIgnoreCase(column.getType().getTypeName()))) { + return; + } + Difference difference = differences.getDifference("type"); + if (difference != null) { + for (Difference d : differences.getDifferences()) { + if (!(d.getReferenceValue() instanceof DataType)) { + differences.removeDifference(d.getField()); + continue; + } + Integer originalSize = ((DataType) d.getReferenceValue()).getColumnSize(); + Integer newSize = ((DataType) d.getComparedValue()).getColumnSize(); + if (newSize == null || originalSize == null || newSize.equals(originalSize)) { + differences.removeDifference(d.getField()); + } + } + super.handleTypeDifferences(column, differences, control, changes, referenceDatabase, comparisonDatabase); + } + } + + @Override + protected void handleDefaultValueDifferences(Column column, ObjectDifferences differences, DiffOutputControl control, List changes, Database referenceDatabase, Database comparisonDatabase) { + if (referenceDatabase instanceof HibernateDatabase || comparisonDatabase instanceof HibernateDatabase) { + Difference difference = differences.getDifference("defaultValue"); + if (difference != null && difference.getReferenceValue() == null && difference.getComparedValue() instanceof DatabaseFunction) { + //database sometimes adds a function default value, like for timestamp columns + return; + } + difference = differences.getDifference("defaultValue"); + if (difference != null) { + super.handleDefaultValueDifferences(column, differences, control, changes, referenceDatabase, comparisonDatabase); + } + // do nothing, types tend to not match with hibernate + } + super.handleDefaultValueDifferences(column, differences, control, changes, referenceDatabase, comparisonDatabase); + } +} diff --git a/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java b/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java deleted file mode 100644 index 95e9d205..00000000 --- a/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java +++ /dev/null @@ -1,124 +0,0 @@ -package liquibase.ext.hibernate.snapshot; - -import liquibase.Scope; -import liquibase.exception.DatabaseException; -import liquibase.snapshot.DatabaseSnapshot; -import liquibase.snapshot.InvalidExampleException; -import liquibase.structure.DatabaseObject; -import liquibase.structure.core.Column; -import liquibase.structure.core.Index; -import liquibase.structure.core.Table; -import liquibase.structure.core.UniqueConstraint; -import org.hibernate.HibernateException; - -import java.math.BigInteger; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Iterator; - -public class UniqueConstraintSnapshotGenerator extends HibernateSnapshotGenerator { - - public UniqueConstraintSnapshotGenerator() { - super(UniqueConstraint.class, new Class[]{Table.class}); - } - - @Override - protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot snapshot) throws DatabaseException, InvalidExampleException { - return example; - } - - @Override - protected void addTo(DatabaseObject foundObject, DatabaseSnapshot snapshot) throws DatabaseException, InvalidExampleException { - if (!snapshot.getSnapshotControl().shouldInclude(UniqueConstraint.class)) { - return; - } - - if (foundObject instanceof Table) { - Table table = (Table) foundObject; - org.hibernate.mapping.Table hibernateTable = findHibernateTable(table, snapshot); - if (hibernateTable == null) { - return; - } - Iterator uniqueIterator = hibernateTable.getUniqueKeyIterator(); - while (uniqueIterator.hasNext()) { - org.hibernate.mapping.UniqueKey hibernateUnique = (org.hibernate.mapping.UniqueKey) uniqueIterator.next(); - - UniqueConstraint uniqueConstraint = new UniqueConstraint(); - uniqueConstraint.setName(hibernateUnique.getName()); - uniqueConstraint.setRelation(table); - uniqueConstraint.setClustered(false); // No way to set true via Hibernate - Iterator columnIterator = hibernateUnique.getColumnIterator(); - int i = 0; - while (columnIterator.hasNext()) { - org.hibernate.mapping.Column hibernateColumn = (org.hibernate.mapping.Column) columnIterator.next(); - uniqueConstraint.addColumn(i, new Column(hibernateColumn.getName()).setRelation(table)); - i++; - } - - Index index = getBackingIndex(uniqueConstraint, hibernateTable, snapshot); - uniqueConstraint.setBackingIndex(index); - - Scope.getCurrentScope().getLog(getClass()).info("Found unique constraint " + uniqueConstraint.toString()); - table.getUniqueConstraints().add(uniqueConstraint); - } - Iterator columnIterator = hibernateTable.getColumnIterator(); - while (columnIterator.hasNext()) { - org.hibernate.mapping.Column column = (org.hibernate.mapping.Column) columnIterator.next(); - if (column.isUnique()) { - UniqueConstraint uniqueConstraint = new UniqueConstraint(); - uniqueConstraint.setRelation(table); - uniqueConstraint.setClustered(false); // No way to set true via Hibernate - String name = "UC_" + table.getName().toUpperCase() + column.getName().toUpperCase() + "_COL"; - if (name.length() > 64) { - name = name.substring(0, 63); - } - uniqueConstraint.addColumn(0, new Column(column.getName()).setRelation(table)); - uniqueConstraint.setName(name); - Scope.getCurrentScope().getLog(getClass()).info("Found unique constraint " + uniqueConstraint.toString()); - table.getUniqueConstraints().add(uniqueConstraint); - - Index index = getBackingIndex(uniqueConstraint, hibernateTable, snapshot); - uniqueConstraint.setBackingIndex(index); - - } - } - - Iterator ucIter = table.getUniqueConstraints().iterator(); - while (ucIter.hasNext()) { - UniqueConstraint uc = ucIter.next(); - if (uc.getName() == null || uc.getName().isEmpty()) { - String name = table.getName() + uc.getColumnNames(); - name = "UCIDX" + hashedName(name); - uc.setName(name); - } - } - } - } - - private String hashedName(String s) { - try { - MessageDigest md = MessageDigest.getInstance("MD5"); - md.reset(); - md.update(s.getBytes()); - byte[] digest = md.digest(); - BigInteger bigInt = new BigInteger(1, digest); - // By converting to base 35 (full alphanumeric), we guarantee - // that the length of the name will always be smaller than the 30 - // character identifier restriction enforced by a few dialects. - return bigInt.toString(35); - } catch (NoSuchAlgorithmException e) { - throw new HibernateException("Unable to generate a hashed name!", e); - } - } - - protected Index getBackingIndex(UniqueConstraint uniqueConstraint, org.hibernate.mapping.Table hibernateTable, DatabaseSnapshot snapshot) { - Index index = new Index(); - index.setRelation(uniqueConstraint.getRelation()); - index.setColumns(uniqueConstraint.getColumns()); - index.setUnique(true); - index.setName(hibernateTable.getName() + "_IX"); - - return index; - } - -} diff --git a/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator b/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator index b5d2eb3d..28466d96 100644 --- a/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator +++ b/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator @@ -1,3 +1,4 @@ +liquibase.ext.hibernate.diff.ChangedColumnChangeGenerator liquibase.ext.hibernate.diff.ChangedForeignKeyChangeGenerator liquibase.ext.hibernate.diff.ChangedSequenceChangeGenerator liquibase.ext.hibernate.diff.MissingSequenceChangeGenerator diff --git a/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator b/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator index c71d4fe8..59f2b6f5 100644 --- a/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator +++ b/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator @@ -6,5 +6,4 @@ liquibase.ext.hibernate.snapshot.PrimaryKeySnapshotGenerator liquibase.ext.hibernate.snapshot.SchemaSnapshotGenerator liquibase.ext.hibernate.snapshot.SequenceSnapshotGenerator liquibase.ext.hibernate.snapshot.TableSnapshotGenerator -liquibase.ext.hibernate.snapshot.UniqueConstraintSnapshotGenerator liquibase.ext.hibernate.snapshot.ViewSnapshotGenerator diff --git a/src/test/resources/com/example/pojo/auction/User.hbm.xml b/src/test/resources/com/example/pojo/auction/User.hbm.xml index 0c69d711..1cbe4194 100644 --- a/src/test/resources/com/example/pojo/auction/User.hbm.xml +++ b/src/test/resources/com/example/pojo/auction/User.hbm.xml @@ -19,11 +19,11 @@ - - +