osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-11 06:24:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename functions where return parameter changed

Browse Source 
Postgresql cannot cleanly reimport these functions when
upgrading, so simply rename to avoid errors.
This commit is contained in:
Sarah Hoffmann 2020-01-23 22:24:41 +01:00
parent 9371b1aeb9
commit 5ec25122f6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/functions/aux_property.sql
View File

@ -23,7 +23,7 @@ BEGIN
address_street_word_ids := word_ids_from_name(in_street); address_street_word_ids := word_ids_from_name(in_street);
IF address_street_word_ids IS NOT NULL THEN 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); address_street_word_ids);
END IF; END IF;

4
sql/functions/utils.sql
View File

@ -262,7 +262,7 @@ BEGIN
-- Note that addr:street links can only be indexed, once the street itself is indexed -- Note that addr:street links can only be indexed, once the street itself is indexed
word_ids := word_ids_from_name(street); word_ids := word_ids_from_name(street);
IF word_ids is not null THEN 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 IF parent_place_id is not null THEN
--DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id; --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id;
RETURN parent_place_id; RETURN parent_place_id;
@ -274,7 +274,7 @@ BEGIN
IF place is not null THEN IF place is not null THEN
word_ids := word_ids_from_name(place); word_ids := word_ids_from_name(place);
IF word_ids is not null THEN 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 IF parent_place_id is not null THEN
--DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id; --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id;
RETURN parent_place_id; RETURN parent_place_id;

4
sql/partition-functions.src.sql
View File

@ -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, point GEOMETRY,
isin_token INTEGER[]) isin_token INTEGER[])
RETURNS BIGINT 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, point GEOMETRY,
isin_token INTEGER[]) isin_token INTEGER[])
RETURNS BIGINT RETURNS BIGINT

2
sql/tiger_import_start.sql
View File

@ -58,7 +58,7 @@ BEGIN
address_street_word_ids := word_ids_from_name(in_street); address_street_word_ids := word_ids_from_name(in_street);
IF address_street_word_ids IS NOT NULL THEN 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); address_street_word_ids);
END IF; END IF;