force update of linker when linkee is updates

[nominatim.git] / test / bdd / steps / db_ops.py

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index 07b377face965fb29560695f7a96ed2531242c9d..fa8cd0de3a2ddc51fab81d427ad411c45978f267 100644 (file)
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -40,19 +40,24 @@ class PlaceColumn:
         self.columns['admin_level'] = int(value)
 
     def set_key_housenr(self, value):
         self.columns['admin_level'] = int(value)
 
     def set_key_housenr(self, value):

-        self.add_hstore('address', 'housenumber', None if value == '' else value)
+        if value:
+            self.add_hstore('address', 'housenumber', value)

 
     def set_key_postcode(self, value):
 
     def set_key_postcode(self, value):

-        self.add_hstore('address', 'postcode', None if value == '' else value)
+        if value:
+            self.add_hstore('address', 'postcode', value)

 
     def set_key_street(self, value):
 
     def set_key_street(self, value):

-        self.add_hstore('address', 'street', None if value == '' else value)
+        if value:
+            self.add_hstore('address', 'street', value)

 
     def set_key_addr_place(self, value):
 
     def set_key_addr_place(self, value):

-        self.add_hstore('address', 'place', None if value == '' else value)
+        if value:
+            self.add_hstore('address', 'place', value)

 
     def set_key_country(self, value):
 
     def set_key_country(self, value):

-        self.add_hstore('address', 'country', None if value == '' else value)
+        if value:
+            self.add_hstore('address', 'country', value)

 
     def set_key_geometry(self, value):
         self.geometry = self.context.osm.parse_geometry(value, self.context.scene)
 
     def set_key_geometry(self, value):
         self.geometry = self.context.osm.parse_geometry(value, self.context.scene)


@@ -103,9 +108,10 @@ class PlaceObjName(object):
         if self.pid is None:
             return "<null>"
 
         if self.pid is None:
             return "<null>"
 

-        self.conn.cursor().execute("""SELECT osm_type, osm_id, class
-                                      FROM placex WHERE place_id = %s""",
-                                   self.pid)
+        cur = self.conn.cursor()
+        cur.execute("""SELECT osm_type, osm_id, class
+                       FROM placex WHERE place_id = %s""",
+                    (self.pid, ))

         eq_(1, cur.rowcount, "No entry found for place id %s" % self.pid)
 
         return "%s%s:%s" % cur.fetchone()
         eq_(1, cur.rowcount, "No entry found for place id %s" % self.pid)
 
         return "%s%s:%s" % cur.fetchone()


@@ -272,9 +278,9 @@ def import_and_index_data_from_place_table(context):
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions')
     cur = context.db.cursor()
     cur.execute(
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions')
     cur = context.db.cursor()
     cur.execute(

-        """insert into placex (osm_type, osm_id, class, type, name, admin_level,
-           address, extratags, geometry)
-           select * from place where not (class='place' and type='houses' and osm_type='W')""")
+        """insert into placex (osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry)
+           select              osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry
+           from place where not (class='place' and type='houses' and osm_type='W')""")

     cur.execute(
             """insert into location_property_osmline (osm_id, address, linegeo)
              SELECT osm_id, address, geometry from place
     cur.execute(
             """insert into location_property_osmline (osm_id, address, linegeo)
              SELECT osm_id, address, geometry from place


@@ -342,7 +348,13 @@ def check_placex_contents(context, exact):
             if exact:
                 expected_content.add((res['osm_type'], res['osm_id'], res['class']))
             for h in row.headings:
             if exact:
                 expected_content.add((res['osm_type'], res['osm_id'], res['class']))
             for h in row.headings:

-                if h.startswith('name'):
+                if h in ('extratags', 'address'):
+                    if row[h] == '-':
+                        assert_is_none(res[h])
+                    else:
+                        vdict = eval('{' + row[h] + '}')
+                        assert_equals(vdict, res[h])
+                elif h.startswith('name'):

                     name = h[5:] if h.startswith('name+') else 'name'
                     assert_in(name, res['name'])
                     eq_(res['name'][name], row[h])
                     name = h[5:] if h.startswith('name+') else 'name'
                     assert_in(name, res['name'])
                     eq_(res['name'][name], row[h])


@@ -432,7 +444,8 @@ def check_search_name_contents(context):
                                       FROM word, (SELECT unnest(%s) as term) t
                                       WHERE word_token = make_standard_name(t.term)""",
                                    (terms,))
                                       FROM word, (SELECT unnest(%s) as term) t
                                       WHERE word_token = make_standard_name(t.term)""",
                                    (terms,))

-                    ok_(subcur.rowcount >= len(terms))
+                    ok_(subcur.rowcount >= len(terms),
+                        "No word entry found for " + row[h])

                     for wid in subcur:
                         assert_in(wid[0], res[h],
                                   "Missing term for %s/%s: %s" % (pid, h, wid[1]))
                     for wid in subcur:
                         assert_in(wid[0], res[h],
                                   "Missing term for %s/%s: %s" % (pid, h, wid[1]))