add --schema option to osm2pgsql-replication

Author: lonvia

scripts/osm2pgsql-replication

@@ -615,8 +615,10 @@ def get_parser():
                        help='Database server port')
     group.add_argument('-p', '--prefix', metavar='PREFIX', default='planet_osm',
                        help="Prefix for table names (default 'planet_osm')")
-    group.add_argument('--middle-schema', metavar='MIDDLE_SCHEMA', default='public',
+    group.add_argument('--middle-schema', metavar='SCHEMA', default=None,
                     help='Name of the schema to store the table for the replication state in')
+    group.add_argument('--schema', metavar='SCHEMA', default=None,
+                    help='Name of the schema for the database')
 
     # Arguments for init
     cmd = subs.add_parser('init', parents=[default_args],
@@ -697,14 +699,16 @@ def main(prog_args=None):
                         datefmt='%Y-%m-%d %H:%M:%S',
                         level=max(4 - args.verbose, 1) * 10)
 
+    args.middle_schema = args.middle_schema or args.schema or 'public'
+
     with DBConnection(args) as db:
         if db.table_exists(Osm2pgsqlProperties.PROP_TABLE_NAME):
             props = Osm2pgsqlProperties(db)
         else:
             props = LegacyProperties(db, args.prefix)
 
         if not props.is_updatable:
-            LOG.fatal(f'osm2pgsql middle table "{args.prefix}_ways" not found in database "{db.name}". '
+            LOG.fatal(f'osm2pgsql middle table "{args.middle_schema}.{args.prefix}_ways" not found in database "{db.name}". '
                        'Database needs to be imported in --slim mode.')
             return 1
 

tests/bdd/command-line/replication.feature

@@ -61,7 +61,7 @@ Feature: Tests for the osm2pgsql-replication script with property table
             Database needs to be imported in --slim mode.
             """
 
-    Scenario: Replication can be initialised for a database in a different schema
+    Scenario: Replication can be initialised for a database in a different schema (middle-schema)
         Given the database schema foobar
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
         And the replication service at http://example.com/europe/liechtenstein-updates
@@ -78,6 +78,41 @@ Feature: Tests for the osm2pgsql-replication script with property table
             | replication_timestamp       | 2013-08-03T19:00:02Z                            |
 
 
+    Scenario: Replication can be initialised for a database in a different schema (schema)
+        Given the database schema foobar
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the replication service at http://example.com/europe/liechtenstein-updates
+        When running osm2pgsql pgsql with parameters
+            | --slim | --schema=foobar |
+
+        And running osm2pgsql-replication
+            | init | --schema=foobar |
+
+        Then table foobar.osm2pgsql_properties contains
+            | property                    | value                                           |
+            | replication_base_url        | http://example.com/europe/liechtenstein-updates |
+            | replication_sequence_number | 9999999                                         |
+            | replication_timestamp       | 2013-08-03T19:00:02Z                            |
+
+
+    Scenario: Replication can be initialised for a database in a different schema (schema)
+        Given the database schema foobar
+        Given the database schema baz
+        Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the replication service at http://example.com/europe/liechtenstein-updates
+        When running osm2pgsql pgsql with parameters
+            | --slim | --middle-schema=foobar | --schema=baz |
+
+        And running osm2pgsql-replication
+            | init | --middle-schema=foobar | --schema=baz |
+
+        Then table foobar.osm2pgsql_properties contains
+            | property                    | value                                           |
+            | replication_base_url        | http://example.com/europe/liechtenstein-updates |
+            | replication_sequence_number | 9999999                                         |
+            | replication_timestamp       | 2013-08-03T19:00:02Z                            |
+
+
     Scenario: Replication initialisation will fail for a database in a different schema
         Given the database schema foobar
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'