mirror of
https://github.com/osm2pgsql-dev/osm2pgsql.git
synced 2025-08-22 19:42:12 +00:00
Consolidate pgsql function and trigger creation in a function
Move the code creating the pgsql function and trigger checking the geometry validity into its own function. This function can create the pgsql function in the correct schema if one is specified. The flex output already has schema support, so it uses this function now to create the function in the right schema. The pgsql output doesn't have schema support yet, so it doesn't.
This commit is contained in:
33
tests/test-output-flex-schema.cpp
Normal file
33
tests/test-output-flex-schema.cpp
Normal file
@ -0,0 +1,33 @@
|
||||
#include <catch.hpp>
|
||||
|
||||
#include "common-import.hpp"
|
||||
#include "common-options.hpp"
|
||||
|
||||
static testing::db::import_t db;
|
||||
|
||||
static char const *const conf_file = "test_output_flex_schema.lua";
|
||||
static char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
|
||||
|
||||
TEST_CASE("config with schema should work")
|
||||
{
|
||||
options_t const options = testing::opt_t().slim().flex(conf_file);
|
||||
|
||||
auto conn = db.db().connect();
|
||||
conn.exec("CREATE SCHEMA IF NOT EXISTS myschema;");
|
||||
|
||||
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(1362 == conn.get_count("myschema.osm2pgsql_test_point"));
|
||||
|
||||
REQUIRE(1 ==
|
||||
conn.get_count("pg_proc",
|
||||
"proname = 'osm2pgsql_test_point_osm2pgsql_valid'"));
|
||||
|
||||
REQUIRE(1 == conn.get_count("pg_trigger"));
|
||||
REQUIRE(1 ==
|
||||
conn.get_count("pg_trigger",
|
||||
"tgname = 'osm2pgsql_test_point_osm2pgsql_valid'"));
|
||||
}
|
Reference in New Issue
Block a user