Fix error in SQL installation scripts

3liz · May 28, 2020 · c64132c · c64132c
1 parent 3b71c83
commit c64132c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/lizsync/install/sql/lizsync/10_FUNCTION.sql b/lizsync/install/sql/lizsync/10_FUNCTION.sql
@@ -386,12 +386,10 @@ BEGIN
             Coalesce(
                 lizsync.get_event_sql(
                     a.event_id,
-                    ''%2$s'',
-                    array_to_string(
-                        array_cat(
-                            string_to_array(''%3$s'',''@''),
-                            array_remove(akeys(a.changed_fields), s)
-                        ), '',''
+                    ''%2$s''::text,
+                    array_cat(
+                        string_to_array(''%3$s'',''@''),
+                        array_remove(akeys(a.changed_fields), s)
                     )
                 ),
                 ''''
@@ -477,12 +475,10 @@ BEGIN
         Coalesce(
             lizsync.get_event_sql(
                 a.event_id,
-                p_uid_field,
-                array_to_string(
-                    array_cat(
-                        p_excluded_columns,
-                        array_remove(akeys(a.changed_fields), s)
-                    ), ','
+                p_uid_field::text,
+                array_cat(
+                    p_excluded_columns,
+                    array_remove(akeys(a.changed_fields), s)
                 )
             ),
             ''

diff --git a/lizsync/install/sql/upgrade/upgrade_to_0.4.1.sql b/lizsync/install/sql/upgrade/upgrade_to_0.4.1.sql
@@ -1,7 +1,6 @@
     BEGIN;
 
 DROP FUNCTION IF EXISTS lizsync.get_event_sql(target text, pevent_id bigint, puid_column text, excluded_columns text);
-
 CREATE OR REPLACE FUNCTION lizsync.get_event_sql(pevent_id bigint, puid_column text, excluded_columns text[]) RETURNS text
     LANGUAGE plpgsql
     AS $$
@@ -173,12 +172,10 @@ BEGIN
             Coalesce(
                 lizsync.get_event_sql(
                     a.event_id,
-                    ''%2$s'',
-                    array_to_string(
-                        array_cat(
-                            string_to_array(''%3$s'',''@''),
-                            array_remove(akeys(a.changed_fields), s)
-                        ), '',''
+                    ''%2$s''::text,
+                    array_cat(
+                        string_to_array(''%3$s'',''@''),
+                        array_remove(akeys(a.changed_fields), s)
                     )
                 ),
                 ''''
@@ -263,12 +260,10 @@ BEGIN
         Coalesce(
             lizsync.get_event_sql(
                 a.event_id,
-                p_uid_field,
-                array_to_string(
-                    array_cat(
-                        p_excluded_columns,
-                        array_remove(akeys(a.changed_fields), s)
-                    ), ','
+                p_uid_field::text,
+                array_cat(
+                    p_excluded_columns,
+                    array_remove(akeys(a.changed_fields), s)
                 )
             ),
             ''