Merge pull request osm2pgsql-dev#418 from pnorman/options_refactor_2

Refactor options_t

Author: lonvia

middle-pgsql.cpp

@@ -1028,7 +1028,7 @@ void middle_pgsql_t::connect(table_desc& table) {
     set_prefix_and_tbls(out_options, &(table.array_indexes));
 
     fprintf(stderr, "Setting up table: %s\n", table.name);
-    sql_conn = PQconnectdb(out_options->conninfo.c_str());
+    sql_conn = PQconnectdb(out_options->database_options.conninfo().c_str());
 
     // Check to see that the backend connection was successfully made, and if not, exit */
     if (PQstatus(sql_conn) != CONNECTION_OK) {