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

Escape schema/tablenames in metadata.getTables() #2398

Merged
merged 4 commits into from Feb 14, 2022
Merged

Escape schema/tablenames in metadata.getTables() #2398

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff81879
Escape schema/tablenames in metadata.getTable() to handle names with …
nvoxland Jan 24, 2022
dc47726
Escape schema/tablenames in metadata.getTable() to handle names with …
nvoxland Jan 25, 2022
f6d9a4c
Merge remote-tracking branch 'origin/master' into escape-names-in-get…
nvoxland Feb 10, 2022
fd08168
Added test for getTables and getViews with an underscore in the table…
nvoxland Feb 10, 2022
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
25 changes: 17 additions & 8 deletions liquibase-core/src/main/java/liquibase/snapshot/JdbcDatabaseSnapshot.java
View file
Open in desktop
Expand Up @@ -1029,8 +1029,8 @@ public List<CachedRow> fastFetchQuery() throws SQLException, DatabaseException {

String catalog = ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema);
String schema = ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema);
return extract(databaseMetaData.getTables(catalog, schema, ((table == null) ?
SQL_FILTER_MATCH_ALL : table), new String[]{"TABLE"}));
return extract(databaseMetaData.getTables(catalog, escapeForLike(schema), ((table == null) ?
SQL_FILTER_MATCH_ALL : escapeForLike(table)), new String[]{"TABLE"}));
}

@Override
Expand All @@ -1049,7 +1049,7 @@ public List<CachedRow> bulkFetchQuery() throws SQLException, DatabaseException {

String catalog = ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema);
String schema = ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema);
return extract(databaseMetaData.getTables(catalog, schema, SQL_FILTER_MATCH_ALL, new String[]{"TABLE"}));
return extract(databaseMetaData.getTables(catalog, escapeForLike(schema), SQL_FILTER_MATCH_ALL, new String[]{"TABLE"}));
}

private List<CachedRow> queryMssql(CatalogAndSchema catalogAndSchema, String tableName) throws DatabaseException, SQLException {
Expand Down Expand Up @@ -1133,8 +1133,8 @@ private List<CachedRow> queryDb2Zos(CatalogAndSchema catalogAndSchema, String ta
private List<CachedRow> queryPostgres(CatalogAndSchema catalogAndSchema, String tableName) throws SQLException {
String catalog = ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema);
String schema = ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema);
return extract(databaseMetaData.getTables(catalog, schema, ((tableName == null) ?
SQL_FILTER_MATCH_ALL : tableName), new String[]{"TABLE", "PARTITIONED TABLE"}));
return extract(databaseMetaData.getTables(catalog, escapeForLike(schema), ((tableName == null) ?
SQL_FILTER_MATCH_ALL : escapeForLike(tableName)), new String[]{"TABLE", "PARTITIONED TABLE"}));

}
});
Expand Down Expand Up @@ -1186,8 +1186,8 @@ public List<CachedRow> fastFetchQuery() throws SQLException, DatabaseException {

String catalog = ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema);
String schema = ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema);
return extract(databaseMetaData.getTables(catalog, schema, ((view == null) ? SQL_FILTER_MATCH_ALL
: view), new String[]{"VIEW"}));
return extract(databaseMetaData.getTables(catalog, escapeForLike(schema), ((view == null) ? SQL_FILTER_MATCH_ALL
: escapeForLike(view)), new String[]{"VIEW"}));
}

@Override
Expand All @@ -1200,7 +1200,7 @@ public List<CachedRow> bulkFetchQuery() throws SQLException, DatabaseException {

String catalog = ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema);
String schema = ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema);
return extract(databaseMetaData.getTables(catalog, schema, SQL_FILTER_MATCH_ALL, new String[]{"VIEW"}));
return extract(databaseMetaData.getTables(catalog, escapeForLike(schema), SQL_FILTER_MATCH_ALL, new String[]{"VIEW"}));
}


Expand Down Expand Up @@ -1698,4 +1698,13 @@ private String getAllCatalogsStringScratchData() {
return (String) JdbcDatabaseSnapshot.this.getScratchData(ALL_CATALOGS_STRING_SCRATCH_KEY);
}

private String escapeForLike(String string) {
if (string == null) {
return null;
}
return string
.replace("%", "\\%")
.replace("_", "\\_");
}

}