Add alternative output for multi_deparse_function

Postgres tightened up its checks for invalid GUC names hence we started
to get an alternative output for one of our tests. We add an alternative
output since the file is relatively small.

Commit on PG:
3db826bd55cd1df0dd8c3d811f8e5b936d7ba1e4

src/test/regress/expected/distributed_functions.out

@@ -343,20 +343,6 @@ SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,maca
  t
 (1 row)
 
-ALTER FUNCTION eq(macaddr,macaddr) SET "citus.setting;'" TO 'hello '' world';
-SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
- verify_function_is_same_on_workers
----------------------------------------------------------------------
- t
-(1 row)
-
-ALTER FUNCTION eq(macaddr,macaddr) RESET "citus.setting;'";
-SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
- verify_function_is_same_on_workers
----------------------------------------------------------------------
- t
-(1 row)
-
 ALTER FUNCTION eq(macaddr,macaddr) SET search_path TO 'sch'';ma', public;
 SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
  verify_function_is_same_on_workers
@@ -540,9 +526,6 @@ SELECT * FROM run_command_on_workers('SELECT function_tests2.sum2(id) FROM (sele
  localhost |    57638 | f       | ERROR:  function function_tests2.sum2(integer) does not exist
 (2 rows)
 
--- postgres doesn't accept parameter names in the regprocedure input
-SELECT create_distributed_function('eq_with_param_names(val1 macaddr, macaddr)', 'val1');
-ERROR:  invalid type name "val1 macaddr"
 -- invalid distribution_arg_name
 SELECT create_distributed_function('eq_with_param_names(macaddr, macaddr)', distribution_arg_name:='test');
 ERROR:  cannot distribute the function "eq_with_param_names" since the distribution argument is not valid

src/test/regress/expected/multi_deparse_function.out

@@ -70,7 +70,7 @@ SELECT create_distributed_function('add(int,int)');
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION  add CALLED ON NULL INPUT
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) CALLED ON NULL INPUT;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) CALLED ON NULL INPUT;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -83,7 +83,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add RETURNS NULL ON NULL INPUT
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) STRICT;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) STRICT;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -94,7 +94,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add STRICT
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) STRICT;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) STRICT;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -105,7 +105,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add IMMUTABLE
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) IMMUTABLE;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) IMMUTABLE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -116,7 +116,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add STABLE
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) STABLE;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) STABLE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -127,7 +127,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add VOLATILE
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) VOLATILE;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) VOLATILE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -138,7 +138,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add LEAKPROOF
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) LEAKPROOF;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) LEAKPROOF;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -149,7 +149,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add NOT LEAKPROOF
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) NOT LEAKPROOF;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) NOT LEAKPROOF;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -162,7 +162,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER  FUNCTION add EXTERNAL SECURITY INVOKER
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY INVOKER;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SECURITY INVOKER;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -173,7 +173,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add SECURITY INVOKER
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY INVOKER;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SECURITY INVOKER;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -184,7 +184,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER  FUNCTION add EXTERNAL SECURITY DEFINER
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY DEFINER;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SECURITY DEFINER;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -195,7 +195,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add SECURITY DEFINER
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY DEFINER;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SECURITY DEFINER;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -206,7 +206,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add PARALLEL UNSAFE
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) PARALLEL UNSAFE;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) PARALLEL UNSAFE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -217,7 +217,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add PARALLEL RESTRICTED
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) PARALLEL RESTRICTED;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) PARALLEL RESTRICTED;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -228,7 +228,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add PARALLEL SAFE
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) PARALLEL SAFE;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) PARALLEL SAFE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -240,7 +240,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add COST 1234
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) COST 1234.000000;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) COST 1234.000000;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -251,7 +251,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER  FUNCTION add COST 1234.5
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) COST 1234.500000;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) COST 1234.500000;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -262,7 +262,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION  add SET log_min_messages = ERROR
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET log_min_messages = 'error';
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SET log_min_messages = 'error';
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -273,7 +273,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION  add SET log_min_messages TO DEFAULT
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET log_min_messages TO DEFAULT;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SET log_min_messages TO DEFAULT;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -284,7 +284,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION  add SET log_min_messages FROM CURRENT
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET log_min_messages FROM CURRENT;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SET log_min_messages FROM CURRENT;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -295,7 +295,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add(int, int) SET TIME ZONE INTERVAL '-08:00' HOUR TO MINUTE;
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET TIME ZONE INTERVAL '@ 8 hours ago';
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SET TIME ZONE INTERVAL '@ 8 hours ago';
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -306,7 +306,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add(int, int) SET TIME ZONE '-7';
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET timezone = '-7';
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SET timezone = '-7';
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -314,56 +314,10 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
  (localhost,57638,t,"ALTER FUNCTION")
 (2 rows)
 
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO 'hello '' world';
-$cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = 'hello '' world';
-CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
-      deparse_and_run_on_workers
----------------------------------------------------------------------
- (localhost,57637,t,"ALTER FUNCTION")
- (localhost,57638,t,"ALTER FUNCTION")
-(2 rows)
-
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO -3.2;
-$cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = -3.2;
-CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
-      deparse_and_run_on_workers
----------------------------------------------------------------------
- (localhost,57637,t,"ALTER FUNCTION")
- (localhost,57638,t,"ALTER FUNCTION")
-(2 rows)
-
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO -32;
-$cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = -32;
-CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
-      deparse_and_run_on_workers
----------------------------------------------------------------------
- (localhost,57637,t,"ALTER FUNCTION")
- (localhost,57638,t,"ALTER FUNCTION")
-(2 rows)
-
--- This raises an error about only accepting one item,
--- that's okay, we're just testing that we don't produce bad syntax.
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO 'hello '' world', 'second '' item';
-$cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = 'hello '' world', 'second '' item';
-CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
-                        deparse_and_run_on_workers
----------------------------------------------------------------------
- (localhost,57637,f,"ERROR:  SET citus.setting;' takes only one argument")
- (localhost,57638,f,"ERROR:  SET citus.setting;' takes only one argument")
-(2 rows)
-
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add RESET log_min_messages
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) RESET log_min_messages;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) RESET log_min_messages;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -374,7 +328,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add RESET ALL
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) RESET ALL;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) RESET ALL;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -386,7 +340,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add RENAME TO summation
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) RENAME TO summation;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) RENAME TO summation;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -401,7 +355,7 @@ ALTER FUNCTION add RENAME TO summation;
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION summation RENAME TO add
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.summation(integer, integer) RENAME TO add;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.summation(integer,integer) RENAME TO add;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -424,7 +378,7 @@ SELECT run_command_on_workers('CREATE ROLE function_role');
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add OWNER TO function_role
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) OWNER TO function_role;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) OWNER TO function_role;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -435,7 +389,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add OWNER TO missing_role
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) OWNER TO missing_role;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) OWNER TO missing_role;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
                      deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -447,7 +401,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add SET SCHEMA public
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET SCHEMA public;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) SET SCHEMA public;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -460,7 +414,7 @@ ALTER FUNCTION add SET SCHEMA public;
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION public.add SET SCHEMA function_tests
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION public.add(integer, integer) SET SCHEMA function_tests;
+INFO:  Propagating deparsed query: ALTER FUNCTION public.add(integer,integer) SET SCHEMA function_tests;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -472,7 +426,7 @@ ALTER FUNCTION public.add SET SCHEMA function_tests;
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add DEPENDS ON EXTENSION citus
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) DEPENDS ON EXTENSION citus;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) DEPENDS ON EXTENSION citus;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -484,7 +438,7 @@ CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION pg_catalog.get_shard_id_for_distribution_column(table_name regclass, distribution_value "any") PARALLEL SAFE;
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION pg_catalog.get_shard_id_for_distribution_column(pg_catalog.regclass, pg_catalog."any") PARALLEL SAFE;
+INFO:  Propagating deparsed query: ALTER FUNCTION pg_catalog.get_shard_id_for_distribution_column(pg_catalog.regclass,pg_catalog."any") PARALLEL SAFE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------
@@ -498,14 +452,14 @@ DROP FUNCTION add(int,int);
 $cmd$);
                     deparse_test
 ---------------------------------------------------------------------
- DROP FUNCTION function_tests.add(integer, integer);
+ DROP FUNCTION function_tests.add(integer,integer);
 (1 row)
 
 -- have multiple actions in a single query
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add volatile leakproof SECURITY DEFINER PARALLEL unsafe;
 $cmd$);
-INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) VOLATILE LEAKPROOF SECURITY DEFINER PARALLEL UNSAFE;
+INFO:  Propagating deparsed query: ALTER FUNCTION function_tests.add(integer,integer) VOLATILE LEAKPROOF SECURITY DEFINER PARALLEL UNSAFE;
 CONTEXT:  PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE
       deparse_and_run_on_workers
 ---------------------------------------------------------------------

src/test/regress/sql/distributed_functions.sql

@@ -233,10 +233,6 @@ ALTER ROUTINE eq(macaddr,macaddr) SET client_min_messages TO debug;
 SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
 ALTER FUNCTION eq(macaddr,macaddr) RESET client_min_messages;
 SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
-ALTER FUNCTION eq(macaddr,macaddr) SET "citus.setting;'" TO 'hello '' world';
-SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
-ALTER FUNCTION eq(macaddr,macaddr) RESET "citus.setting;'";
-SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
 ALTER FUNCTION eq(macaddr,macaddr) SET search_path TO 'sch'';ma', public;
 SELECT public.verify_function_is_same_on_workers('function_tests.eq(macaddr,macaddr)');
 ALTER FUNCTION eq(macaddr,macaddr) RESET search_path;
@@ -318,9 +314,6 @@ DROP AGGREGATE function_tests2.sum2(int);
 -- call should fail as aggregate should have been dropped
 SELECT * FROM run_command_on_workers('SELECT function_tests2.sum2(id) FROM (select 1 id, 2) subq;') ORDER BY 1,2;
 
--- postgres doesn't accept parameter names in the regprocedure input
-SELECT create_distributed_function('eq_with_param_names(val1 macaddr, macaddr)', 'val1');
-
 -- invalid distribution_arg_name
 SELECT create_distributed_function('eq_with_param_names(macaddr, macaddr)', distribution_arg_name:='test');
 SELECT create_distributed_function('eq_with_param_names(macaddr, macaddr)', distribution_arg_name:='int');

src/test/regress/sql/multi_deparse_function.sql

@@ -166,24 +166,6 @@ SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add(int, int) SET TIME ZONE '-7';
 $cmd$);
 
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO 'hello '' world';
-$cmd$);
-
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO -3.2;
-$cmd$);
-
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO -32;
-$cmd$);
-
--- This raises an error about only accepting one item,
--- that's okay, we're just testing that we don't produce bad syntax.
-SELECT deparse_and_run_on_workers($cmd$
-ALTER FUNCTION add(int, int) SET "citus.setting;'" TO 'hello '' world', 'second '' item';
-$cmd$);
-
 SELECT deparse_and_run_on_workers($cmd$
 ALTER FUNCTION add RESET log_min_messages
 $cmd$);