fix(PostgresGrammar): Switch from table_catalog to table_schema when …

…referencing schema
coldbox-modules · May 12, 2023 · 8243391 · 8243391
1 parent eb76dc3
commit 8243391
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/models/Grammars/PostgresGrammar.cfc b/models/Grammars/PostgresGrammar.cfc
@@ -373,7 +373,7 @@ component extends="qb.models.Grammars.BaseGrammar" singleton {
         var sql = "SELECT #wrapColumn( "table_name" )# FROM #wrapTable( "information_schema.tables" )# WHERE #wrapColumn( "table_schema" )# = 'public'";
         var args = [];
         if ( schema != "" ) {
-            sql &= " AND #wrapColumn( "table_catalog" )# = ?";
+            sql &= " AND #wrapColumn( "table_schema" )# = ?";
             args.append( schema );
         }
         var tablesQuery = runQuery( sql, args, options, "query" );
@@ -387,7 +387,7 @@ component extends="qb.models.Grammars.BaseGrammar" singleton {
     function compileTableExists( tableName, schemaName = "" ) {
         var sql = "SELECT 1 FROM #wrapTable( "information_schema.tables" )# WHERE #wrapColumn( "table_name" )# = ?";
         if ( schemaName != "" ) {
-            sql &= " AND #wrapColumn( "table_catalog" )# = ?";
+            sql &= " AND #wrapColumn( "table_schema" )# = ?";
         }
         return sql;
     }

diff --git a/tests/specs/Schema/PostgresSchemaBuilderSpec.cfc b/tests/specs/Schema/PostgresSchemaBuilderSpec.cfc
@@ -579,7 +579,7 @@ component extends="tests.resources.AbstractSchemaBuilderSpec" {
     }
 
     function hasTableInSchema() {
-        return [ "SELECT 1 FROM ""information_schema"".""tables"" WHERE ""table_name"" = ? AND ""table_catalog"" = ?" ];
+        return [ "SELECT 1 FROM ""information_schema"".""tables"" WHERE ""table_name"" = ? AND ""table_schema"" = ?" ];
     }
 
     function hasColumn() {