Double-space commands in system_constraints.sql/system_functions.sql.

Previously, any error reported by the backend while reading
system_constraints.sql would report the entire file, not just the
particular command it was working on.  (Ask me how I know.)  Likewise,
there were chunks of system_functions.sql that would be read as one
command, which would be annoying if anything failed there.

The issue for system_constraints.sql is an oversight in commit
dfb75e478.  I didn't try to trace down where the poor formatting
in system_functions.sql started, but it's certainly contrary to
the advice at the head of that file.

2 files changed, 49 insertions, 1 deletions

diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index bf080b5f124..63a907d50d5 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -678,7 +678,8 @@ die
 
 foreach my $c (@system_constraints)
 {
-	print $constraints $c, "\n";
+	# leave blank lines to localize any bootstrap error messages better
+	print $constraints $c, "\n\n";
 }
 
 # Now generate schemapg.h
diff --git a/src/backend/catalog/system_functions.sql b/src/backend/catalog/system_functions.sql
index 1b2b37c1bf0..a4373b176c6 100644
--- a/src/backend/catalog/system_functions.sql
+++ b/src/backend/catalog/system_functions.sql
@@ -607,72 +607,119 @@ AS 'unicode_is_normalized';
 -- can later change who can access these functions, or leave them as only
 -- available to superuser / cluster owner, if they choose.
 --
+
 REVOKE EXECUTE ON FUNCTION pg_start_backup(text, boolean, boolean) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stop_backup() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stop_backup(boolean, boolean) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_create_restore_point(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_switch_wal() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_wal_replay_pause() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_wal_replay_resume() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_rotate_logfile() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_reload_conf() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_current_logfile() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_current_logfile(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_promote(boolean, integer) FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_stat_reset() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_shared(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_slru(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_single_table_counters(oid) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_single_function_counters(oid) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_replication_slot(text) FROM public;
 
 REVOKE EXECUTE ON FUNCTION lo_import(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION lo_import(text, oid) FROM public;
+
 REVOKE EXECUTE ON FUNCTION lo_export(oid, text) FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_ls_logdir() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_ls_waldir() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_ls_archive_statusdir() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_ls_tmpdir() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_ls_tmpdir(oid) FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_read_file(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_read_file(text,bigint,bigint) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_read_file(text,bigint,bigint,boolean) FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_read_binary_file(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_read_binary_file(text,bigint,bigint) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_read_binary_file(text,bigint,bigint,boolean) FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_advance(text, pg_lsn) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_create(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_drop(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_oid(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_progress(text, boolean) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_session_is_setup() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_session_progress(boolean) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_session_reset() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_session_setup(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_xact_reset() FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_replication_origin_xact_setup(pg_lsn, timestamp with time zone) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_show_replication_origin_status() FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_stat_file(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_stat_file(text,boolean) FROM public;
 
 REVOKE EXECUTE ON FUNCTION pg_ls_dir(text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_ls_dir(text,boolean,boolean) FROM public;
 
 --
 -- We also set up some things as accessible to standard roles.
 --
+
 GRANT EXECUTE ON FUNCTION pg_ls_logdir() TO pg_monitor;
+
 GRANT EXECUTE ON FUNCTION pg_ls_waldir() TO pg_monitor;
+
 GRANT EXECUTE ON FUNCTION pg_ls_archive_statusdir() TO pg_monitor;
+
 GRANT EXECUTE ON FUNCTION pg_ls_tmpdir() TO pg_monitor;
+
 GRANT EXECUTE ON FUNCTION pg_ls_tmpdir(oid) TO pg_monitor;
 
 GRANT pg_read_all_settings TO pg_monitor;
+
 GRANT pg_read_all_stats TO pg_monitor;
+
 GRANT pg_stat_scan_tables TO pg_monitor;