Fixed issue that unique constraint precondition does not honor schema…

…Name attribute on MySQL (#5783) * Fixed issue that unique constraint precondition does not honor schemaName attribute on MySQL * Fix issue that failed to honor default schema in unique constraint exists precondition * Refactor code to fall back to default schema * Added test for UniqueConstraintExistsPrecondition --------- Co-authored-by: Daniel Mallorga <75833793+MalloD12@users.noreply.github.com>
liquibase · May 9, 2024 · c095fa2 · c095fa2
1 parent 77f1384
commit c095fa2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/liquibase-integration-tests/src/test/resources/changelogs/common/common.tests.changelog.xml b/liquibase-integration-tests/src/test/resources/changelogs/common/common.tests.changelog.xml
@@ -1352,4 +1352,10 @@
         </preConditions>
     </changeSet>
 
+    <changeSet id="check-uniqueConstraintExists" author="mpvvliet">
+        <preConditions>
+            <uniqueConstraintExists tableName="createTableNamedUqConst" constraintName="uq_uqtest1"/>
+        </preConditions>
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/...tandard/src/main/java/liquibase/precondition/core/UniqueConstraintExistsPrecondition.java b/...tandard/src/main/java/liquibase/precondition/core/UniqueConstraintExistsPrecondition.java
@@ -97,10 +97,12 @@ public ValidationErrors validate(Database database) {
 	public void check(Database database, DatabaseChangeLog changeLog, ChangeSet changeSet, ChangeExecListener changeExecListener)
 		throws PreconditionFailedException, PreconditionErrorException {
 
+		String schemaName = getSchema(database);
+
 		UniqueConstraint example = new UniqueConstraint(
 			StringUtil.trimToNull(getConstraintName()),
 			StringUtil.trimToNull(getCatalogName()),
-			StringUtil.trimToNull(getSchemaName()),
+			StringUtil.trimToNull(schemaName),
 			StringUtil.trimToNull(getTableName()));
 
 		String columnNames = StringUtil.trimToNull(getColumnNames());
@@ -117,6 +119,14 @@ public void check(Database database, DatabaseChangeLog changeLog, ChangeSet chan
 		}
 	}
 
+	private String getSchema(Database database) {
+		String schemaName = getSchemaName();
+		if (schemaName == null) {
+			schemaName = database.getDefaultSchemaName();
+		}
+		return schemaName;
+	}
+
 	private List<Column> toColumns(Database database, String columnNames) {
 		return Arrays.stream(columnNames.split("\\s*,\\s*"))
 			.map(columnName -> database.correctObjectName(columnName, Column.class))

diff --git a/...base-standard/src/main/java/liquibase/snapshot/jvm/UniqueConstraintSnapshotGenerator.java b/...base-standard/src/main/java/liquibase/snapshot/jvm/UniqueConstraintSnapshotGenerator.java
@@ -172,7 +172,7 @@ protected List<CachedRow> listConstraints(Table table, DatabaseSnapshot snapshot
                         + "on const.constraint_schema=col.constraint_schema "
                         + "and const.table_name=col.table_name "
                         + "and const.constraint_name=col.constraint_name "
-                        + "where const.constraint_schema='" + database.correctObjectName(schema.getCatalogName(), Catalog.class) + "' ";
+                        + "where const.constraint_schema='" + database.correctObjectName(schema.getSchema().getName(), Schema.class) + "' ";
                 if (!bulkQuery) {
                     sql += "and const.table_name='" + database.correctObjectName(example.getRelation().getName(), Table.class) + "' "
                             + "and const.constraint_name='" + database.correctObjectName(name, UniqueConstraint.class) + "'";