Commit 55c3d86a authored by Peter Eisentraut's avatar Peter Eisentraut

pg_upgrade: Fix some whitespace oddities

parent 61a07bae
...@@ -351,7 +351,7 @@ set_locale_and_encoding(ClusterInfo *cluster) ...@@ -351,7 +351,7 @@ set_locale_and_encoding(ClusterInfo *cluster)
res = executeQueryOrDie(conn, res = executeQueryOrDie(conn,
"SELECT datcollate, datctype " "SELECT datcollate, datctype "
"FROM pg_catalog.pg_database " "FROM pg_catalog.pg_database "
"WHERE datname = 'template0' "); "WHERE datname = 'template0' ");
assert(PQntuples(res) == 1); assert(PQntuples(res) == 1);
...@@ -381,7 +381,7 @@ set_locale_and_encoding(ClusterInfo *cluster) ...@@ -381,7 +381,7 @@ set_locale_and_encoding(ClusterInfo *cluster)
res = executeQueryOrDie(conn, res = executeQueryOrDie(conn,
"SELECT pg_catalog.pg_encoding_to_char(encoding) " "SELECT pg_catalog.pg_encoding_to_char(encoding) "
"FROM pg_catalog.pg_database " "FROM pg_catalog.pg_database "
"WHERE datname = 'template0' "); "WHERE datname = 'template0' ");
assert(PQntuples(res) == 1); assert(PQntuples(res) == 1);
......
...@@ -61,7 +61,7 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster) ...@@ -61,7 +61,7 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
" a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND " " a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude possible orphaned temp tables */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_temp_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND " " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')"); " n.nspname NOT IN ('pg_catalog', 'information_schema')");
...@@ -151,7 +151,7 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster) ...@@ -151,7 +151,7 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
" a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND " " a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude possible orphaned temp tables */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_temp_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND " " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')"); " n.nspname NOT IN ('pg_catalog', 'information_schema')");
...@@ -328,7 +328,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode) ...@@ -328,7 +328,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
" a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " " a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude possible orphaned temp tables */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_temp_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND " " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')"); " n.nspname NOT IN ('pg_catalog', 'information_schema')");
...@@ -700,7 +700,7 @@ old_8_3_create_sequence_script(ClusterInfo *cluster) ...@@ -700,7 +700,7 @@ old_8_3_create_sequence_script(ClusterInfo *cluster)
"WHERE c.relkind = 'S' AND " "WHERE c.relkind = 'S' AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude possible orphaned temp tables */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_temp_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND " " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')"); " n.nspname NOT IN ('pg_catalog', 'information_schema')");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment