rename functions where return parameter changed

Postgresql cannot cleanly reimport these functions when
upgrading, so simply rename to avoid errors.

diff --git a/sql/functions/aux_property.sql b/sql/functions/aux_property.sql
index 841f240a091e24f255181f29f78cdb88fd1eeacb..cee5cfb2e3619145b4b10ff856d6057d54b59b3a 100644 (file)
--- a/sql/functions/aux_property.sql
+++ b/sql/functions/aux_property.sql
@@ -23,7 +23,7 @@ BEGIN
 
   address_street_word_ids := word_ids_from_name(in_street);
   IF address_street_word_ids IS NOT NULL THEN
 
   address_street_word_ids := word_ids_from_name(in_street);
   IF address_street_word_ids IS NOT NULL THEN

-    out_parent_place_id := getNearestNamedRoadFeature(out_partition, place_centroid,
+    out_parent_place_id := getNearestNamedRoadPlaceId(out_partition, place_centroid,

                                                       address_street_word_ids);
   END IF;
 
                                                       address_street_word_ids);
   END IF;
 

diff --git a/sql/functions/utils.sql b/sql/functions/utils.sql
index 741a3969e37f1732fc248a102a535bd00588c0ec..6371e9adb739f3fdb7e868219fed02ca9804c7dd 100644 (file)
--- a/sql/functions/utils.sql
+++ b/sql/functions/utils.sql
@@ -262,7 +262,7 @@ BEGIN
     -- Note that addr:street links can only be indexed, once the street itself is indexed
     word_ids := word_ids_from_name(street);
     IF word_ids is not null THEN
     -- Note that addr:street links can only be indexed, once the street itself is indexed
     word_ids := word_ids_from_name(street);
     IF word_ids is not null THEN

-      parent_place_id := getNearestNamedRoadFeature(partition, centroid, word_ids);
+      parent_place_id := getNearestNamedRoadPlaceId(partition, centroid, word_ids);

       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id;
         RETURN parent_place_id;
       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id;
         RETURN parent_place_id;


@@ -274,7 +274,7 @@ BEGIN
   IF place is not null THEN
     word_ids := word_ids_from_name(place);
     IF word_ids is not null THEN
   IF place is not null THEN
     word_ids := word_ids_from_name(place);
     IF word_ids is not null THEN

-      parent_place_id := getNearestNamedPlaceFeature(partition, centroid, word_ids);
+      parent_place_id := getNearestNamedPlacePlaceId(partition, centroid, word_ids);

       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id;
         RETURN parent_place_id;
       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id;
         RETURN parent_place_id;

diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql
index 50f50db44919b027368c1a405c5943d4dab56bc5..41758c83d22481234b2e2253f30169033e03a36d 100644 (file)
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -82,7 +82,7 @@ END
 $$
 LANGUAGE plpgsql;
 
 $$
 LANGUAGE plpgsql;
 

-CREATE OR REPLACE FUNCTION getNearestNamedRoadFeature(in_partition INTEGER,
+CREATE OR REPLACE FUNCTION getNearestNamedRoadPlaceId(in_partition INTEGER,

                                                       point GEOMETRY,
                                                       isin_token INTEGER[])
   RETURNS BIGINT
                                                       point GEOMETRY,
                                                       isin_token INTEGER[])
   RETURNS BIGINT


@@ -108,7 +108,7 @@ END
 $$
 LANGUAGE plpgsql STABLE;
 
 $$
 LANGUAGE plpgsql STABLE;
 

-CREATE OR REPLACE FUNCTION getNearestNamedPlaceFeature(in_partition INTEGER,
+CREATE OR REPLACE FUNCTION getNearestNamedPlacePlaceId(in_partition INTEGER,

                                                        point GEOMETRY,
                                                        isin_token INTEGER[])
   RETURNS BIGINT
                                                        point GEOMETRY,
                                                        isin_token INTEGER[])
   RETURNS BIGINT

diff --git a/sql/tiger_import_start.sql b/sql/tiger_import_start.sql
index c5246854cd740dc8331c0e9d9bda176e694ebfbe..b9c4fcfc86e83e9855c4c63b7e5d7e23cc72a08a 100644 (file)
--- a/sql/tiger_import_start.sql
+++ b/sql/tiger_import_start.sql
@@ -58,7 +58,7 @@ BEGIN
 
   address_street_word_ids := word_ids_from_name(in_street);
   IF address_street_word_ids IS NOT NULL THEN
 
   address_street_word_ids := word_ids_from_name(in_street);
   IF address_street_word_ids IS NOT NULL THEN

-    out_parent_place_id := getNearestNamedRoadFeature(out_partition, place_centroid,
+    out_parent_place_id := getNearestNamedRoadPlaceId(out_partition, place_centroid,

                                                       address_street_word_ids);
   END IF;
 
                                                       address_street_word_ids);
   END IF;