safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

postgresq 8.4 backward compatibility: count hash size with akeys instead of hash_to_array

Browse Source
This commit is contained in:
Sarah Hoffmann
2012-03-30 00:52:08 +02:00
parent 9d1845a338
commit 7391e00bc3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/functions.sql
View File

@@ -914,7 +914,7 @@ BEGIN
NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry); NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry);
-- copy 'name' to or from the default language (if there is a default language) -- copy 'name' to or from the default language (if there is a default language)
IF NEW.name is not null AND array_upper(%#NEW.name,1) > 1 THEN IF NEW.name is not null AND array_upper(akeys(NEW.name),1) > 1 THEN
default_language := get_country_language_code(NEW.country_code); default_language := get_country_language_code(NEW.country_code);
IF default_language IS NOT NULL THEN IF default_language IS NOT NULL THEN
IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN
@@ -1260,7 +1260,7 @@ BEGIN
-- Thought this wasn't needed but when we add new languages to the country_name table -- Thought this wasn't needed but when we add new languages to the country_name table
-- we need to update the existing names -- we need to update the existing names
IF NEW.name is not null AND array_upper(%#NEW.name,1) > 1 THEN IF NEW.name is not null AND array_upper(akeys(NEW.name),1) > 1 THEN
default_language := get_country_language_code(NEW.country_code); default_language := get_country_language_code(NEW.country_code);
IF default_language IS NOT NULL THEN IF default_language IS NOT NULL THEN
IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN