Merge pull request #2192 from lonvia/database-versioning

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

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 72a56dcff581bb123ee29855589352cf3eeee47b..d16dceffccb1008a1fe6082ab0a5e9d04cd2a439 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -43,6 +43,11 @@ class _TestingCursor(psycopg2.extras.DictCursor):
                              WHERE tablename = %s""", (table, ))
         return num == 1
 
                              WHERE tablename = %s""", (table, ))
         return num == 1
 

+    def table_rows(self, table):
+        """ Return the number of rows in the given table.
+        """
+        return self.scalar('SELECT count(*) FROM ' + table)
+

 
 @pytest.fixture
 def temp_db(monkeypatch):
 
 @pytest.fixture
 def temp_db(monkeypatch):


@@ -71,6 +76,12 @@ def temp_db(monkeypatch):
 
     conn.close()
 
 
     conn.close()
 

+
+@pytest.fixture
+def dsn(temp_db):
+    return 'dbname=' + temp_db
+
+

 @pytest.fixture
 def temp_db_with_extensions(temp_db):
     conn = psycopg2.connect(database=temp_db)
 @pytest.fixture
 def temp_db_with_extensions(temp_db):
     conn = psycopg2.connect(database=temp_db)


@@ -85,9 +96,8 @@ def temp_db_with_extensions(temp_db):
 def temp_db_conn(temp_db):
     """ Connection to the test database.
     """
 def temp_db_conn(temp_db):
     """ Connection to the test database.
     """

-    conn = connection.connect('dbname=' + temp_db)
-    yield conn
-    conn.close()
+    with connection.connect('dbname=' + temp_db) as conn:
+        yield conn

 
 
 @pytest.fixture
 
 
 @pytest.fixture


@@ -102,10 +112,25 @@ def temp_db_cursor(temp_db):
     conn.close()
 
 
     conn.close()
 
 

+@pytest.fixture
+def table_factory(temp_db_cursor):
+    def mk_table(name, definition='id INT', content=None):
+        temp_db_cursor.execute('CREATE TABLE {} ({})'.format(name, definition))
+        if content is not None:
+            if not isinstance(content, str):
+                content = '),('.join([str(x) for x in content])
+            temp_db_cursor.execute("INSERT INTO {} VALUES ({})".format(name, content))
+
+    return mk_table
+
+

 @pytest.fixture
 def def_config():
     return Configuration(None, SRC_DIR.resolve() / 'settings')
 
 @pytest.fixture
 def def_config():
     return Configuration(None, SRC_DIR.resolve() / 'settings')
 

+@pytest.fixture
+def src_dir():
+    return SRC_DIR.resolve()

 
 @pytest.fixture
 def status_table(temp_db_conn):
 
 @pytest.fixture
 def status_table(temp_db_conn):


@@ -158,7 +183,7 @@ def place_row(place_table, temp_db_cursor):
         temp_db_cursor.execute("INSERT INTO place VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)",
                                (osm_id or next(idseq), osm_type, cls, typ, names,
                                 admin_level, address, extratags,
         temp_db_cursor.execute("INSERT INTO place VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)",
                                (osm_id or next(idseq), osm_type, cls, typ, names,
                                 admin_level, address, extratags,

-                                geom or 'SRID=4326;POINT(0 0 )'))
+                                geom or 'SRID=4326;POINT(0 0)'))

 
     return _insert
 
 
     return _insert
 


@@ -168,7 +193,7 @@ def placex_table(temp_db_with_extensions, temp_db_conn):
     """
     with temp_db_conn.cursor() as cur:
         cur.execute("""CREATE TABLE placex (
     """
     with temp_db_conn.cursor() as cur:
         cur.execute("""CREATE TABLE placex (

-                           place_id BIGINT NOT NULL,
+                           place_id BIGINT,

                            parent_place_id BIGINT,
                            linked_place_id BIGINT,
                            importance FLOAT,
                            parent_place_id BIGINT,
                            linked_place_id BIGINT,
                            importance FLOAT,


@@ -191,9 +216,53 @@ def placex_table(temp_db_with_extensions, temp_db_conn):
                            country_code varchar(2),
                            housenumber TEXT,
                            postcode TEXT,
                            country_code varchar(2),
                            housenumber TEXT,
                            postcode TEXT,

-                           centroid GEOMETRY(Geometry, 4326))
-                           """)
+                           centroid GEOMETRY(Geometry, 4326))""")

     temp_db_conn.commit()
 
 
     temp_db_conn.commit()
 
 

+@pytest.fixture
+def osmline_table(temp_db_with_extensions, temp_db_conn):
+    with temp_db_conn.cursor() as cur:
+        cur.execute("""CREATE TABLE location_property_osmline (
+                           place_id BIGINT,
+                           osm_id BIGINT,
+                           parent_place_id BIGINT,
+                           geometry_sector INTEGER,
+                           indexed_date TIMESTAMP,
+                           startnumber INTEGER,
+                           endnumber INTEGER,
+                           partition SMALLINT,
+                           indexed_status SMALLINT,
+                           linegeo GEOMETRY,
+                           interpolationtype TEXT,
+                           address HSTORE,
+                           postcode TEXT,
+                           country_code VARCHAR(2))""")
+    temp_db_conn.commit()
+

 
 

+@pytest.fixture
+def word_table(temp_db, temp_db_conn):
+    with temp_db_conn.cursor() as cur:
+        cur.execute("""CREATE TABLE word (
+                           word_id INTEGER,
+                           word_token text,
+                           word text,
+                           class text,
+                           type text,
+                           country_code varchar(2),
+                           search_name_count INTEGER,
+                           operator TEXT)""")
+    temp_db_conn.commit()
+
+
+@pytest.fixture
+def osm2pgsql_options(temp_db):
+    return dict(osm2pgsql='echo',
+                osm2pgsql_cache=10,
+                osm2pgsql_style='style.file',
+                threads=1,
+                dsn='dbname=' + temp_db,
+                flatnode_file='',
+                tablespaces=dict(slim_data='', slim_index='',
+                                 main_data='', main_index=''))