Merge pull request #1998 from joto/pg-catalog

Consistently use pg_catalog schema when accessing system tables

Author: lonvia

src/pgsql-capabilities.cpp

@@ -47,7 +47,7 @@ static void init_settings(pg_conn_t const &db_connection)
     capabilities().settings.clear(); // In case this is called multiple times
 
     auto const res =
-        db_connection.exec("SELECT name, setting FROM pg_settings");
+        db_connection.exec("SELECT name, setting FROM pg_catalog.pg_settings");
 
     for (int i = 0; i < res.num_tuples(); ++i) {
         capabilities().settings.emplace(res.get(i, 0), res.get(i, 1));
@@ -70,7 +70,7 @@ static void init_postgis_version(pg_conn_t const &db_connection)
 {
     auto const res = db_connection.exec(
         "SELECT regexp_split_to_table(extversion, '\\.') FROM"
-        " pg_extension WHERE extname='postgis'");
+        " pg_catalog.pg_extension WHERE extname='postgis'");
 
     if (res.num_tuples() == 0) {
         throw fmt_error(

src/pgsql.cpp

@@ -69,8 +69,8 @@ void pg_conn_t::set_config(char const *setting, char const *value) const
     // Update pg_settings instead of using SET because it does not yield
     // errors on older versions of PostgreSQL where the settings are not
     // implemented.
-    exec("UPDATE pg_settings SET setting = '{}' WHERE name = '{}'", value,
-         setting);
+    exec("UPDATE pg_catalog.pg_settings SET setting = '{}' WHERE name = '{}'",
+         value, setting);
 }
 
 pg_result_t pg_conn_t::exec(char const *sql) const

tests/test-middle.cpp

@@ -120,12 +120,13 @@ TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
 
     auto conn = db.connect();
     auto const num_tables =
-        conn.get_count("pg_tables", "schemaname = 'public'");
+        conn.get_count("pg_catalog.pg_tables", "schemaname = 'public'");
     auto const num_indexes =
-        conn.get_count("pg_indexes", "schemaname = 'public'");
+        conn.get_count("pg_catalog.pg_indexes", "schemaname = 'public'");
     auto const num_procs =
-        conn.get_count("pg_proc", "pronamespace = (SELECT oid FROM "
-                                  "pg_namespace WHERE nspname = 'public')");
+        conn.get_count("pg_catalog.pg_proc",
+                       "pronamespace = (SELECT oid FROM "
+                       "pg_catalog.pg_namespace WHERE nspname = 'public')");
 
     if (!options.middle_dbschema.empty()) {
         conn.exec("CREATE SCHEMA IF NOT EXISTS osm;");
@@ -329,14 +330,15 @@ TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
     }
 
     if (!options.middle_dbschema.empty()) {
-        REQUIRE(num_tables ==
-                conn.get_count("pg_tables", "schemaname = 'public'"));
-        REQUIRE(num_indexes ==
-                conn.get_count("pg_indexes", "schemaname = 'public'"));
+        REQUIRE(num_tables == conn.get_count("pg_catalog.pg_tables",
+                                             "schemaname = 'public'"));
+        REQUIRE(num_indexes == conn.get_count("pg_catalog.pg_indexes",
+                                              "schemaname = 'public'"));
         REQUIRE(num_procs ==
-                conn.get_count("pg_proc",
-                               "pronamespace = (SELECT oid FROM "
-                               "pg_namespace WHERE nspname = 'public')"));
+                conn.get_count(
+                    "pg_catalog.pg_proc",
+                    "pronamespace = (SELECT oid FROM "
+                    "pg_catalog.pg_namespace WHERE nspname = 'public')"));
     }
 }
 

tests/test-output-flex-schema.cpp

@@ -27,17 +27,19 @@ TEST_CASE("config with schema should work")
 
     REQUIRE_NOTHROW(db.run_file(options, data_file));
 
-    REQUIRE(1 == conn.get_count("pg_namespace", "nspname = 'myschema'"));
-    REQUIRE(1 == conn.get_count("pg_tables", "schemaname = 'myschema'"));
+    REQUIRE(1 ==
+            conn.get_count("pg_catalog.pg_namespace", "nspname = 'myschema'"));
+    REQUIRE(1 ==
+            conn.get_count("pg_catalog.pg_tables", "schemaname = 'myschema'"));
 
     REQUIRE(7103 == conn.get_count("myschema.osm2pgsql_test_line"));
 
     REQUIRE(1 ==
-            conn.get_count("pg_proc",
+            conn.get_count("pg_catalog.pg_proc",
                            "proname = 'osm2pgsql_test_line_osm2pgsql_valid'"));
 
-    REQUIRE(1 == conn.get_count("pg_trigger"));
+    REQUIRE(1 == conn.get_count("pg_catalog.pg_trigger"));
     REQUIRE(1 ==
-            conn.get_count("pg_trigger",
+            conn.get_count("pg_catalog.pg_trigger",
                            "tgname = 'osm2pgsql_test_line_osm2pgsql_valid'"));
 }

tests/test-output-flex-tablespace.cpp

@@ -20,8 +20,8 @@ TEST_CASE("simple import with tablespaces for middle")
 {
     {
         auto conn = db.db().connect();
-        REQUIRE(1 ==
-                conn.get_count("pg_tablespace", "spcname = 'tablespacetest'"));
+        REQUIRE(1 == conn.get_count("pg_catalog.pg_tablespace",
+                                    "spcname = 'tablespacetest'"));
     }
 
     options_t options = testing::opt_t().slim().flex(conf_file);

tests/test-output-pgsql-tablespace.cpp

@@ -26,8 +26,8 @@ TEST_CASE("simple import with tables spaces")
 {
     {
         auto conn = db.db().connect();
-        REQUIRE(1 ==
-                conn.get_count("pg_tablespace", "spcname = 'tablespacetest'"));
+        REQUIRE(1 == conn.get_count("pg_catalog.pg_tablespace",
+                                    "spcname = 'tablespacetest'"));
     }
 
     options_t options = testing::opt_t().slim();