VladPolskiy/osm2pgsql
1
0
Fork 0
mirror of https://github.com/osm2pgsql-dev/osm2pgsql.git synced 2025-08-22 19:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move db options into database_options_t

Browse Source
This commit is contained in:
Paul Norman
2015-07-25 19:48:12 -07:00
parent 8de5aa0276
commit 3d44d34db1
23 changed files with 96 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test-output-pgsql.cpp
View File

@ -117,7 +117,7 @@ void test_regression_simple() {
std::shared_ptr<middle_pgsql_t> mid_pgsql(new middle_pgsql_t());
options_t options = options_t(2, argv);
options.conninfo = db->conninfo().c_str();
options.database_options = db->database_options;
options.num_procs = 1;
options.prefix = "osm2pgsql_test";
options.slim = true;
@ -138,7 +138,7 @@ void test_regression_simple() {
osmdata.stop();
// start a new connection to run tests on
pg::conn_ptr test_conn = pg::conn::connect(db->conninfo());
pg::conn_ptr test_conn = pg::conn::connect(db->database_options);
assert_has_table(test_conn, "osm2pgsql_test_point");
assert_has_table(test_conn, "osm2pgsql_test_line");
@ -177,7 +177,7 @@ void test_latlong() {
std::shared_ptr<middle_pgsql_t> mid_pgsql(new middle_pgsql_t());
options_t options = options_t(2, argv);
options.conninfo = db->conninfo().c_str();
options.database_options = db->database_options;
options.num_procs = 1;
options.prefix = "osm2pgsql_test";
options.slim = true;
@ -201,7 +201,7 @@ void test_latlong() {
osmdata.stop();
// start a new connection to run tests on
pg::conn_ptr test_conn = pg::conn::connect(db->conninfo());
pg::conn_ptr test_conn = pg::conn::connect(db->database_options);
assert_has_table(test_conn, "osm2pgsql_test_point");
assert_has_table(test_conn, "osm2pgsql_test_line");
@ -241,7 +241,7 @@ void test_area_way_simple() {
std::shared_ptr<middle_pgsql_t> mid_pgsql(new middle_pgsql_t());
options_t options = options_t(2, argv);
options.conninfo = db->conninfo().c_str();
options.database_options = db->database_options;
options.num_procs = 1;
options.prefix = "osm2pgsql_test";
options.slim = true;
@ -264,7 +264,7 @@ void test_area_way_simple() {
osmdata.stop();
// start a new connection to run tests on
pg::conn_ptr test_conn = pg::conn::connect(db->conninfo());
pg::conn_ptr test_conn = pg::conn::connect(db->database_options);
assert_has_table(test_conn, "osm2pgsql_test_point");
assert_has_table(test_conn, "osm2pgsql_test_line");
@ -292,7 +292,7 @@ void test_route_rel() {
std::shared_ptr<middle_ram_t> mid_ram(new middle_ram_t());
options_t options = options_t(2, argv);
options.conninfo = db->conninfo().c_str();
options.database_options = db->database_options;
options.num_procs = 1;
options.prefix = "osm2pgsql_test";
options.slim = false;
@ -313,7 +313,7 @@ void test_route_rel() {
osmdata.stop();
// start a new connection to run tests on
pg::conn_ptr test_conn = pg::conn::connect(db->conninfo());
pg::conn_ptr test_conn = pg::conn::connect(db->database_options);
assert_has_table(test_conn, "osm2pgsql_test_point");
assert_has_table(test_conn, "osm2pgsql_test_line");
@ -343,7 +343,7 @@ void test_clone() {
std::shared_ptr<middle_pgsql_t> mid_pgsql(new middle_pgsql_t());
options_t options = options_t(2, argv);
options.conninfo = db->conninfo().c_str();
options.database_options = db->database_options;
options.num_procs = 1;
options.prefix = "osm2pgsql_test";
options.slim = true;
@ -368,7 +368,7 @@ void test_clone() {
osmdata.stop();
// start a new connection to run tests on
pg::conn_ptr test_conn = pg::conn::connect(db->conninfo());
pg::conn_ptr test_conn = pg::conn::connect(db->database_options);
assert_has_table(test_conn, "osm2pgsql_test_point");
assert_has_table(test_conn, "osm2pgsql_test_line");