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

diff --git a/sql/functions.sql b/sql/functions.sql
index 59122efab3f17aac81385c21ff5d3eb2b683a909..27fc6ae98869c7d14f137c1f5630307ad8d924a0 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -914,7 +914,7 @@ BEGIN
   NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry);
 
   -- 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);
     IF default_language IS NOT NULL 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
     -- 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);
       IF default_language IS NOT NULL THEN
         IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN