database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Improve some comments in pg_upgrade.c

Browse Source 
When restoring database schemas on a new cluster, database "template1"
is processed first, followed by all other databases in parallel,
including "postgres".  Both "postgres" and "template1" have some extra
handling to propagate each one's properties, but comments were confusing
regarding which one is processed where.

Author: Julien Rouhaud
Reviewed-by: Daniel Gustafsson
Discussion: https://postgr.es/m/CAOBaU_a2iviTG7FE10yO_gcW+zQCHNFhRA_NDiktf3UR65BHdw@mail.gmail.com
This commit is contained in:
Michael Paquier
2019-12-06 11:55:04 +09:00
parent 28f4bba66b
commit 690c880269
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/pg_upgrade/pg_upgrade.c
View File

@ -341,10 +341,9 @@ create_new_objects(void)
snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid); snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid);
/* /*
* template1 and postgres databases will already exist in the target * template1 database will already exist in the target installation,
* installation, so tell pg_restore to drop and recreate them; * so tell pg_restore to drop and recreate it; otherwise we would fail
* otherwise we would fail to propagate their database-level * to propagate its database-level properties.
* properties.
*/ */
create_opts = "--clean --create"; create_opts = "--clean --create";
@ -378,10 +377,9 @@ create_new_objects(void)
snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid); snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid);
/* /*
* template1 and postgres databases will already exist in the target * postgres database will already exist in the target installation, so
* installation, so tell pg_restore to drop and recreate them; * tell pg_restore to drop and recreate it; otherwise we would fail to
* otherwise we would fail to propagate their database-level * propagate its database-level properties.
* properties.
*/ */
if (strcmp(old_db->db_name, "postgres") == 0) if (strcmp(old_db->db_name, "postgres") == 0)
create_opts = "--clean --create"; create_opts = "--clean --create";