Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / loaddata.sql

diff --git a/sql/loaddata.sql b/sql/loaddata.sql
index 45df1e33a9b4ff852b937e3e69068c004045afd0..a3c8914a1f4466ef29f396bd47cca39a5c0a7df9 100644 (file)
--- a/sql/loaddata.sql
+++ b/sql/loaddata.sql
@@ -6,8 +6,11 @@ TRUNCATE location_area;
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 100000;
 
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 100000;
 

-insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, geometry) select * from place where osm_type = 'N';
-insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, geometry) select * from place where osm_type = 'W';
-insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, geometry) select * from place where osm_type = 'R';
+insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry)
+             select osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry from place where osm_type = 'N';
+insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry)
+             select osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry from place where osm_type = 'W';
+insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry)
+             select osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry from place where osm_type = 'R';

 
 --select count(*) from (select create_interpolation(osm_id, housenumber) from placex where indexed=false and class='place' and type='houses') as x;
 
 --select count(*) from (select create_interpolation(osm_id, housenumber) from placex where indexed=false and class='place' and type='houses') as x;