pg_upgrade: Fix some whitespace oddities

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 936306ce618e13f117179d4bae2933529076f736..411689a85c7b2d674f3041f456bf5272f8f8587a 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -351,7 +351,7 @@ set_locale_and_encoding(ClusterInfo *cluster)
 
                res = executeQueryOrDie(conn,
                                                                "SELECT datcollate, datctype "
-                                                               "FROM   pg_catalog.pg_database "
+                                                               "FROM   pg_catalog.pg_database "
                                                                "WHERE  datname = 'template0' ");
                assert(PQntuples(res) == 1);
 
@@ -381,7 +381,7 @@ set_locale_and_encoding(ClusterInfo *cluster)
 
        res = executeQueryOrDie(conn,
                                                        "SELECT pg_catalog.pg_encoding_to_char(encoding) "
-                                                       "FROM   pg_catalog.pg_database "
+                                                       "FROM   pg_catalog.pg_database "
                                                        "WHERE  datname = 'template0' ");
        assert(PQntuples(res) == 1);
 

diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
index 83334a09f695b575983254017ca3c6f5f60013dc..84a47eec596305021e22562c937589b125d7cf46 100644 (file)
--- a/contrib/pg_upgrade/version_old_8_3.c
+++ b/contrib/pg_upgrade/version_old_8_3.c
@@ -61,7 +61,7 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
                                                                "               a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
                                                                "               c.relnamespace = n.oid AND "
                /* exclude possible orphaned temp tables */
-                                                               "               n.nspname !~ '^pg_temp_' AND "
+                                                               "               n.nspname !~ '^pg_temp_' AND "
                                                 "              n.nspname !~ '^pg_toast_temp_' AND "
                                                                "               n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
@@ -151,7 +151,7 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
                                                                "               a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
                                                                "               c.relnamespace = n.oid AND "
                /* exclude possible orphaned temp tables */
-                                                               "               n.nspname !~ '^pg_temp_' AND "
+                                                               "               n.nspname !~ '^pg_temp_' AND "
                                                 "              n.nspname !~ '^pg_toast_temp_' AND "
                                                                "               n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
@@ -328,7 +328,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
                                                                "               a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
                                                                "               c.relnamespace = n.oid AND "
                /* exclude possible orphaned temp tables */
-                                                               "               n.nspname !~ '^pg_temp_' AND "
+                                                               "               n.nspname !~ '^pg_temp_' AND "
                                                 "              n.nspname !~ '^pg_toast_temp_' AND "
                                                                "               n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
@@ -700,7 +700,7 @@ old_8_3_create_sequence_script(ClusterInfo *cluster)
                                                                "WHERE  c.relkind = 'S' AND "
                                                                "               c.relnamespace = n.oid AND "
                /* exclude possible orphaned temp tables */
-                                                               "               n.nspname !~ '^pg_temp_' AND "
+                                                               "               n.nspname !~ '^pg_temp_' AND "
                                                 "              n.nspname !~ '^pg_toast_temp_' AND "
                                                                "               n.nspname NOT IN ('pg_catalog', 'information_schema')");