Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed issue that unique constraint precondition does not honor schemaName attribute on MySQL #5783

Merged
merged 6 commits into from
May 9, 2024
Merged

Fixed issue that unique constraint precondition does not honor schemaName attribute on MySQL #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bbda3a
Fixed issue that unique constraint precondition does not honor schema…
mpvvliet Apr 9, 2024
3b0fe94
Fix issue that failed to honor default schema in unique constraint ex…
mpvvliet Apr 13, 2024
dfb859f
Refactor code to fall back to default schema
mpvvliet Apr 27, 2024
49255fe
Added test for UniqueConstraintExistsPrecondition
mpvvliet Apr 27, 2024
25fd81b
Merge branch 'master' into fix-3977
mpvvliet Apr 27, 2024
d73e6b1
Merge branch 'master' into fix-3977
MalloD12 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions liquibase-integration-tests/src/test/resources/changelogs/common/common.tests.changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,4 +1350,10 @@
</preConditions>
</changeSet>

<changeSet id="check-uniqueConstraintExists" author="mpvvliet">
<preConditions>
<uniqueConstraintExists tableName="createTableNamedUqConst" constraintName="uq_uqtest1"/>
</preConditions>
</changeSet>

</databaseChangeLog>
12 changes: 11 additions & 1 deletion ...tandard/src/main/java/liquibase/precondition/core/UniqueConstraintExistsPrecondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion ...base-standard/src/main/java/liquibase/snapshot/jvm/UniqueConstraintSnapshotGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@
+ "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) + "'";
}
sql += "order by ordinal_position";
stmt = new RawSqlStatement(sql);

Check failure

Code scanning / CodeQL

Query built by concatenation with a possibly-untrusted string High

Query built by concatenation with
this expression
, which may be untrusted.
} else if (database instanceof PostgresDatabase) {
List<String> conditions = new ArrayList<>();
String sql = "select const.CONSTRAINT_NAME, COLUMN_NAME, const.constraint_schema as CONSTRAINT_CONTAINER "
Expand Down