added shema escaping to getColumns call

liquibase · Jun 24, 2022 · 99dfbcd · 99dfbcd
1 parent bae65a4
commit 99dfbcd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/snapshot/JdbcDatabaseSnapshot.java b/liquibase-core/src/main/java/liquibase/snapshot/JdbcDatabaseSnapshot.java
@@ -392,8 +392,8 @@ public List<CachedRow> fastFetchQuery() throws SQLException, DatabaseException {
                        extract(
                             databaseMetaData.getColumns(
                                     ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema),
-                                    ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema),
-                                    tableName,
+                                    escapeForLike(((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema), database),
+                                    escapeForLike(tableName, database),
                                     SQL_FILTER_MATCH_ALL)
                     );
                     //
@@ -424,8 +424,9 @@ public List<CachedRow> bulkFetchQuery() throws SQLException, DatabaseException {
                 try {
                     List<CachedRow> returnList =
                         extract(databaseMetaData.getColumns(((AbstractJdbcDatabase) database)
-                            .getJdbcCatalogName(catalogAndSchema), ((AbstractJdbcDatabase) database)
-                            .getJdbcSchemaName(catalogAndSchema), SQL_FILTER_MATCH_ALL, SQL_FILTER_MATCH_ALL));
+                                    .getJdbcCatalogName(catalogAndSchema),
+                            escapeForLike(((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema), database),
+                            SQL_FILTER_MATCH_ALL, SQL_FILTER_MATCH_ALL));
                     //
                     // IF MARIADB
                     // Query to get actual data types and then map each column to its CachedRow

diff --git a/...base-integration-tests/src/test/groovy/liquibase/snapshot/JdbcDatabaseSnapshotTest.groovy b/...base-integration-tests/src/test/groovy/liquibase/snapshot/JdbcDatabaseSnapshotTest.groovy
@@ -7,22 +7,20 @@ import liquibase.extension.testing.testsystem.DatabaseTestSystem
 import liquibase.extension.testing.testsystem.TestSystemFactory
 import liquibase.statement.SqlStatement
 import liquibase.statement.core.RawSqlStatement
+import liquibase.structure.core.Column
 import liquibase.structure.core.Table
 import liquibase.structure.core.View
 import org.junit.Rule
-import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import java.sql.Connection
-
 class JdbcDatabaseSnapshotTest extends Specification {
 
     @Rule
     public DatabaseTestSystem h2 = Scope.currentScope.getSingleton(TestSystemFactory).getTestSystem("h2")
 
     @Unroll
-    def "getTables and getViews works with underscores in schema names"() {
+    def "getTables, getColumns and getViews works with underscores in schema names"() {
         when:
         def connection = h2.getConnection()
         def db = DatabaseFactory.instance.findCorrectDatabaseImplementation(new JdbcConnection(connection))
@@ -37,6 +35,9 @@ class JdbcDatabaseSnapshotTest extends Specification {
         SnapshotGeneratorFactory.instance.has(new Table(null, "TEST-SCHEMA", "TEST_TABLE"), db)
         !SnapshotGeneratorFactory.instance.has(new Table(null, "TEST_SCHEMA", "TEST_TABLE"), db)
 
+        SnapshotGeneratorFactory.instance.has(new Column(Table.class,null, "TEST-SCHEMA", "TEST_TABLE", "ID"), db)
+        !SnapshotGeneratorFactory.instance.has(new Column(Table.class, null, "TEST_SCHEMA", "TEST_TABLE","ID"), db)
+
         SnapshotGeneratorFactory.instance.has(new View(null, "TEST-SCHEMA", "TEST_VIEW"), db)
         !SnapshotGeneratorFactory.instance.has(new View(null, "TEST_SCHEMA", "TEST_VIEW"), db)