Merge pull request #316 from rustprooflabs/remove-schema-name-option

Remove `--schema-name` option

Author: rustprooflabs

docker/db.py

@@ -182,15 +182,14 @@ def pg_isready():
     return True
 
 
-def prepare_pgosm_db(skip_qgis_style, db_path, import_mode, schema_name):
+def prepare_pgosm_db(skip_qgis_style, db_path, import_mode):
     """Runs through series of steps to prepare database for PgOSM.
 
     Parameters
     --------------------------
     skip_qgis_style : bool
     db_path : str
     import_mode : import_mode.ImportMode
-    schema_name : str
     """
     if pg_conn_parts()['pg_host'] == 'localhost':
         drop_it = True
@@ -224,8 +223,7 @@ def prepare_pgosm_db(skip_qgis_style, db_path, import_mode, schema_name):
     else:
         LOGGER.info('Loading QGIS styles')
         qgis_styles.load_qgis_styles(db_path=db_path,
-                                     db_name=pg_conn_parts()['pg_db'],
-                                     schema_name=schema_name)
+                                     db_name=pg_conn_parts()['pg_db'])
 
 
 
@@ -553,33 +551,18 @@ def osm2pgsql_replication_finish(skip_nested):
         sys.exit(f'{err_msg} - Check the log output for details.')
 
 
-def rename_schema(schema_name):
-    """Renames default schema name "osm" to `schema_name`
-
-    Returns
-    ----------------------------
-    schema_name : str
-    """
-    LOGGER.info(f'Renaming schema from osm to {schema_name}')
-    sql_raw = f'ALTER SCHEMA osm RENAME TO {schema_name} ;'
-
-    with get_db_conn(conn_string=os.environ['PGOSM_CONN']) as conn:
-        cur = conn.cursor()
-        cur.execute(sql_raw)
-
-
-def run_pg_dump(export_path, skip_qgis_style, schema_name):
+def run_pg_dump(export_path, skip_qgis_style):
     """Runs pg_dump to save processed data to load into other PostGIS DBs.
 
     Parameters
     ---------------------------
     export_path : str
         Absolute path to output .sql file
     skip_qgis_style : bool
-    schema_name : str
     """
     logger = logging.getLogger('pgosm-flex')
     conn_string = os.environ['PGOSM_CONN']
+    schema_name = 'osm'
 
     if skip_qgis_style:
         logger.info(f'Running pg_dump (only {schema_name} schema)')

docker/pgosm_flex.py

@@ -57,9 +57,6 @@
               default=False,
               is_flag=True,
               help='Replication mode enables updates via osm2pgsql-replication.')
-@click.option('--schema-name', required=False,
-              default='osm',
-              help="Change the final schema name, defaults to 'osm'.")
 @click.option('--skip-nested',
               default=False,
               is_flag=True,
@@ -78,7 +75,7 @@
               help='EXPERIMENTAL - Wrap around osm2pgsql create v. append modes, without using osm2pgsql-replication.')
 def run_pgosm_flex(ram, region, subregion, debug,
                     input_file, layerset, layerset_path, language, pg_dump,
-                    pgosm_date, replication, schema_name, skip_nested,
+                    pgosm_date, replication, skip_nested,
                     skip_qgis_style, srid, sp_gist, update):
     """Run PgOSM Flex within Docker to automate osm2pgsql flex processing.
     """
@@ -87,12 +84,6 @@ def run_pgosm_flex(ram, region, subregion, debug,
     logger = logging.getLogger('pgosm-flex')
     logger.info('PgOSM Flex starting...')
 
-    # Input validation
-    if schema_name != 'osm' and replication:
-        err_msg = 'Replication mode with custom schema name currently not supported'
-        logger.error(err_msg)
-        sys.exit(err_msg)
-
     if replication and (update is not None):
         err_msg = 'The --replication and --update features are mutually exclusive. Use one or the other.'
         logger.error(err_msg)
@@ -130,8 +121,7 @@ def run_pgosm_flex(ram, region, subregion, debug,
 
     db.prepare_pgosm_db(skip_qgis_style=skip_qgis_style,
                         db_path=paths['db_path'],
-                        import_mode=import_mode,
-                        schema_name=schema_name)
+                        import_mode=import_mode)
 
     # There's probably a better way to get this data out, but this worked right
     # away and I'm moving on.  I'm breaking enough other things that this seemed
@@ -174,14 +164,10 @@ def run_pgosm_flex(ram, region, subregion, debug,
 
     db.log_import_message(import_id=import_id, msg='Completed')
 
-    if schema_name != 'osm':
-        db.rename_schema(schema_name)
-
     dump_database(input_file=input_file,
                   out_path=paths['out_path'],
                   pg_dump=pg_dump,
-                  skip_qgis_style=skip_qgis_style,
-                  schema_name=schema_name)
+                  skip_qgis_style=skip_qgis_style)
 
     logger.info('PgOSM Flex complete!')
 
@@ -504,7 +490,7 @@ def run_post_processing(flex_path, skip_nested, import_mode):
     return True
 
 
-def dump_database(input_file, out_path, pg_dump, skip_qgis_style, schema_name):
+def dump_database(input_file, out_path, pg_dump, skip_qgis_style):
     """Runs pg_dump when necessary to export the processed OpenStreetMap data.
 
     Parameters
@@ -513,15 +499,13 @@ def dump_database(input_file, out_path, pg_dump, skip_qgis_style, schema_name):
     out_path : str
     pg_dump : bool
     skip_qgis_style : bool
-    schema_name : str
     """
     if pg_dump:
         export_filename = get_export_filename(input_file)
         export_path = get_export_full_path(out_path, export_filename)
 
         db.run_pg_dump(export_path=export_path,
-                       skip_qgis_style=skip_qgis_style,
-                       schema_name=schema_name)
+                       skip_qgis_style=skip_qgis_style)
     else:
         logging.getLogger('pgosm-flex').info('Skipping pg_dump')
 

docker/qgis_styles.py

@@ -10,23 +10,21 @@
 LOGGER = logging.getLogger('pgosm-flex')
 
 
-def load_qgis_styles(db_path, db_name, schema_name):
+def load_qgis_styles(db_path, db_name):
     """Loads QGIS style data for easy formatting of most common layers.
 
     Parameters
     -------------------------
     db_path : str
         Base path to pgosm-flex/db directory
     db_name : str
-    schema_name : str
     """
     LOGGER.info(f'Load QGIS styles to database {db_name}...')
     conn_string = os.environ['PGOSM_CONN']
 
     create_layer_style_table(db_path=db_path, conn_string=conn_string)
     populate_layer_style_staging(db_path=db_path, conn_string=conn_string)
-    update_styles_db_name(db_name=db_name, schema_name=schema_name,
-                          conn_string=conn_string)
+    update_styles_db_name(db_name=db_name, conn_string=conn_string)
     load_staging_to_prod(db_path=db_path, conn_string=conn_string)
 
 
@@ -102,29 +100,27 @@ def load_staging_to_prod(db_path, conn_string):
     LOGGER.debug('QGIS Style staging table cleaned')
 
 
-def update_styles_db_name(db_name, schema_name, conn_string):
+def update_styles_db_name(db_name, conn_string):
     """
     Parameters
     ----------------------
     db_name : str
-    schema_name : str
     conn_string : str
     """
-    if db_name == 'pgosm' and schema_name == 'osm':
-        LOGGER.debug('Database name and schema name set to defaults. Update to layer styles not necessary')
+    if db_name == 'pgosm':
+        LOGGER.debug('Database name set to defaults. Update to layer styles not necessary')
         return
 
     sql_raw = """
 UPDATE public.layer_styles_staging
-    SET f_table_catalog = %(db_name)s ,
-        f_table_schema = %(schema_name)s
+    SET f_table_catalog = %(db_name)s
 ;
 """
-    params = {'db_name': db_name, 'schema_name': schema_name}
+    params = {'db_name': db_name}
     with db.get_db_conn(conn_string=conn_string) as conn:
         cur = conn.cursor()
         cur.execute(sql_raw, params=params)
         conn.commit()
 
-    LOGGER.info(f'Updated QGIS layer styles for {db_name}.{schema_name}')
+    LOGGER.info(f'Updated QGIS layer styles for database {db_name}')