Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / test_indexing.py

diff --git a/test/python/test_indexing.py b/test/python/test_indexing.py
index 9873e7d72673a8aaeb3e356276a4b558d97be3e8..4c9d940d09b1c2a0a0cddbe78383c34c9251af53 100644 (file)
--- a/test/python/test_indexing.py
+++ b/test/python/test_indexing.py
@@ -19,14 +19,17 @@ class IndexerTestDB:
         with self.conn.cursor() as cur:
             cur.execute('CREATE EXTENSION hstore')
             cur.execute("""CREATE TABLE placex (place_id BIGINT,
         with self.conn.cursor() as cur:
             cur.execute('CREATE EXTENSION hstore')
             cur.execute("""CREATE TABLE placex (place_id BIGINT,

+                                                name HSTORE,

                                                 class TEXT,
                                                 type TEXT,
                                                 class TEXT,
                                                 type TEXT,

+                                                linked_place_id BIGINT,

                                                 rank_address SMALLINT,
                                                 rank_search SMALLINT,
                                                 indexed_status SMALLINT,
                                                 indexed_date TIMESTAMP,
                                                 partition SMALLINT,
                                                 admin_level SMALLINT,
                                                 rank_address SMALLINT,
                                                 rank_search SMALLINT,
                                                 indexed_status SMALLINT,
                                                 indexed_date TIMESTAMP,
                                                 partition SMALLINT,
                                                 admin_level SMALLINT,

+                                                country_code TEXT,

                                                 address HSTORE,
                                                 token_info JSONB,
                                                 geometry_sector INTEGER)""")
                                                 address HSTORE,
                                                 token_info JSONB,
                                                 geometry_sector INTEGER)""")


@@ -52,14 +55,26 @@ class IndexerTestDB:
                              END IF;
                              RETURN NEW;
                            END; $$ LANGUAGE plpgsql;""")
                              END IF;
                              RETURN NEW;
                            END; $$ LANGUAGE plpgsql;""")

-            cur.execute("""CREATE OR REPLACE FUNCTION placex_prepare_update(p placex,
-                                                      OUT name HSTORE,
-                                                      OUT address HSTORE,
-                                                      OUT country_feature VARCHAR)
+            cur.execute("DROP TYPE IF EXISTS prepare_update_info CASCADE")
+            cur.execute("""CREATE TYPE prepare_update_info AS (
+                             name HSTORE,
+                             address HSTORE,
+                             rank_address SMALLINT,
+                             country_code TEXT,
+                             class TEXT,
+                             type TEXT,
+                             linked_place_id BIGINT
+                           )""")
+            cur.execute("""CREATE OR REPLACE FUNCTION placex_indexing_prepare(p placex,
+                                                     OUT result prepare_update_info)

                            AS $$
                            BEGIN
                            AS $$
                            BEGIN

-                            address := p.address;
-                            name := p.address;
+                             result.address := p.address;
+                             result.name := p.name;
+                             result.class := p.class;
+                             result.type := p.type;
+                             result.country_code := p.country_code;
+                             result.rank_address := p.rank_address;

                            END;
                            $$ LANGUAGE plpgsql STABLE;
                         """)
                            END;
                            $$ LANGUAGE plpgsql STABLE;
                         """)