Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / sql / tiger_import_finish.sql

diff --git a/sql/tiger_import_finish.sql b/sql/tiger_import_finish.sql
index a7d837f4c02a30927b93c77e63f3592c1b3e24c5..09942bac48cffacf6dad971ac09ac3f023029602 100644 (file)
--- a/sql/tiger_import_finish.sql
+++ b/sql/tiger_import_finish.sql
@@ -1,4 +1,5 @@
-CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber) {ts:aux-index};
+--index only on parent_place_id
+CREATE INDEX idx_location_property_tiger_parent_place_id_imp ON location_property_tiger_import (parent_place_id) {ts:aux-index};

 CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index};
 
 GRANT SELECT ON location_property_tiger_import TO "{www-user}";
 CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index};
 
 GRANT SELECT ON location_property_tiger_import TO "{www-user}";


@@ -6,7 +7,7 @@ GRANT SELECT ON location_property_tiger_import TO "{www-user}";
 --DROP TABLE IF EXISTS location_property_tiger;
 --ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
 
 --DROP TABLE IF EXISTS location_property_tiger;
 --ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
 

---ALTER INDEX idx_location_property_tiger_housenumber_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
+--ALTER INDEX idx_location_property_tiger_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;

 --ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id;
 
 --ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id;
 

-DROP FUNCTION tigger_create_interpolation (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text);
+DROP FUNCTION tiger_line_import (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text);