Consistently use pg_catalog schema when accessing system tables

Just to make osm2pgsql a tiny bit more robust...
This commit is contained in:
Jochen Topf
2023-07-10 22:31:43 +02:00
parent fb6bd80caa
commit 017731a9d1
6 changed files with 28 additions and 24 deletions

View File

@ -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'"));
}