add migration for separate entrance table

src/nominatim_db/tools/migration.py

@@ -120,26 +120,39 @@ def create_postcode_parent_index(conn: Connection, **_: Any) -> None:
 
 @_migration(5, 1, 99, 0)
 def create_placex_entrance_table(conn: Connection, config: Configuration, **_: Any) -> None:
-    """ Add the placex_entrance table to store entrance nodes
+    """ Add the placex_entrance table to store linked-up entrance nodes
     """
-    sqlp = SQLPreprocessor(conn, config)
+    if not table_exists(conn, 'placex_entrance'):
-    sqlp.run_string(conn, """
+        sqlp = SQLPreprocessor(conn, config)
-        -- Table to store location of entrance nodes
+        sqlp.run_string(conn, """
-        DROP TABLE IF EXISTS placex_entrance;
+            -- Table to store location of entrance nodes
-        CREATE TABLE placex_entrance (
+            CREATE TABLE placex_entrance (
-          place_id BIGINT NOT NULL,
+              place_id BIGINT NOT NULL,
-          osm_id BIGINT NOT NULL,
+              osm_id BIGINT NOT NULL,
-          type TEXT NOT NULL,
+              type TEXT NOT NULL,
-          location GEOMETRY(Point, 4326) NOT NULL,
+              location GEOMETRY(Point, 4326) NOT NULL,
-          extratags HSTORE
+              extratags HSTORE
-          );
+              );
-        CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance
+            CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance
-          USING BTREE (place_id, osm_id) {{db.tablespace.search_index}};
+              USING BTREE (place_id, osm_id) {{db.tablespace.search_index}};
-        GRANT SELECT ON placex_entrance TO "{{config.DATABASE_WEBUSER}}" ;
+            GRANT SELECT ON placex_entrance TO "{{config.DATABASE_WEBUSER}}" ;
+              """)
 
-        -- Create an index on the place table for lookups to populate the entrance
+
-        -- table
+@_migration(5, 1, 99, 1)
-        CREATE INDEX IF NOT EXISTS idx_placex_entrance_lookup ON place
+def create_place_entrance_table(conn: Connection, config: Configuration, **_: Any) -> None:
-          USING BTREE (osm_id)
+    """ Add the place_entrance table to store incomming entrance nodes
-          WHERE class IN ('routing:entrance', 'entrance');
+    """
-          """)
+    if not table_exists(conn, 'place_entrance'):
+        with conn.cursor() as cur:
+            cur.execute("""
+            -- Table to store location of entrance nodes
+            CREATE TABLE place_entrance (
+              osm_id BIGINT NOT NULL,
+              type TEXT NOT NULL,
+              extratags HSTORE,
+              geometry GEOMETRY(Point, 4326) NOT NULL
+              );
+            CREATE UNIQUE INDEX place_entrance_osm_id_idx ON place_entrance
+              USING BTREE (osm_id);
+              """)

src/nominatim_db/version.py

@@ -55,7 +55,7 @@ def parse_version(version: str) -> NominatimVersion:
     return NominatimVersion(*[int(x) for x in parts[:2] + parts[2].split('-')])
 
 
-NOMINATIM_VERSION = parse_version('5.1.99-0')
+NOMINATIM_VERSION = parse_version('5.1.99-1')
 
 POSTGRESQL_REQUIRED_VERSION = (12, 0)
 POSTGIS_REQUIRED_VERSION = (3, 0)