mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-29 15:25:31 +02:00
ea0b414a0d
pg_upgrade opened the output from pg_dumpall in text mode and wrote the split files in text mode. This caused unwanted eating of intended carriage returns on input and production of spurious carriage returns on output. To avoid this, open all these files in binary mode. On non-Windows platforms, this change has no effect. Backpatch to 9.0. On 9.0 and 9.1, we also switch from redirecting pg_dumpall's output to using pg_dumpall's -f switch, for the same reason.
111 lines
3.2 KiB
C
111 lines
3.2 KiB
C
/*
|
|
* dump.c
|
|
*
|
|
* dump functions
|
|
*
|
|
* Copyright (c) 2010-2012, PostgreSQL Global Development Group
|
|
* contrib/pg_upgrade/dump.c
|
|
*/
|
|
|
|
#include "postgres.h"
|
|
|
|
#include "pg_upgrade.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
void
|
|
generate_old_dump(void)
|
|
{
|
|
/* run new pg_dumpall binary */
|
|
prep_status("Creating catalog dump");
|
|
|
|
/*
|
|
* --binary-upgrade records the width of dropped columns in pg_class, and
|
|
* restores the frozenid's for databases and relations.
|
|
*/
|
|
exec_prog(UTILITY_LOG_FILE, NULL, true,
|
|
"\"%s/pg_dumpall\" %s --schema-only --binary-upgrade %s -f %s",
|
|
new_cluster.bindir, cluster_conn_opts(&old_cluster),
|
|
log_opts.verbose ? "--verbose" : "",
|
|
ALL_DUMP_FILE);
|
|
check_ok();
|
|
}
|
|
|
|
|
|
/*
|
|
* split_old_dump
|
|
*
|
|
* This function splits pg_dumpall output into global values and
|
|
* database creation, and per-db schemas. This allows us to create
|
|
* the support functions between restoring these two parts of the
|
|
* dump. We split on the first "\connect " after a CREATE ROLE
|
|
* username match; this is where the per-db restore starts.
|
|
*
|
|
* We suppress recreation of our own username so we don't generate
|
|
* an error during restore
|
|
*/
|
|
void
|
|
split_old_dump(void)
|
|
{
|
|
FILE *all_dump,
|
|
*globals_dump,
|
|
*db_dump;
|
|
FILE *current_output;
|
|
char line[LINE_ALLOC];
|
|
bool start_of_line = true;
|
|
char create_role_str[MAX_STRING];
|
|
char create_role_str_quote[MAX_STRING];
|
|
char filename[MAXPGPATH];
|
|
bool suppressed_username = false;
|
|
|
|
|
|
/*
|
|
* Open all files in binary mode to avoid line end translation on Windows,
|
|
* both for input and output.
|
|
*/
|
|
|
|
snprintf(filename, sizeof(filename), "%s", ALL_DUMP_FILE);
|
|
if ((all_dump = fopen(filename, PG_BINARY_R)) == NULL)
|
|
pg_log(PG_FATAL, "Could not open dump file \"%s\": %s\n", filename, getErrorText(errno));
|
|
snprintf(filename, sizeof(filename), "%s", GLOBALS_DUMP_FILE);
|
|
if ((globals_dump = fopen_priv(filename, PG_BINARY_W)) == NULL)
|
|
pg_log(PG_FATAL, "Could not write to dump file \"%s\": %s\n", filename, getErrorText(errno));
|
|
snprintf(filename, sizeof(filename), "%s", DB_DUMP_FILE);
|
|
if ((db_dump = fopen_priv(filename, PG_BINARY_W)) == NULL)
|
|
pg_log(PG_FATAL, "Could not write to dump file \"%s\": %s\n", filename, getErrorText(errno));
|
|
|
|
current_output = globals_dump;
|
|
|
|
/* patterns used to prevent our own username from being recreated */
|
|
snprintf(create_role_str, sizeof(create_role_str),
|
|
"CREATE ROLE %s;", os_info.user);
|
|
snprintf(create_role_str_quote, sizeof(create_role_str_quote),
|
|
"CREATE ROLE %s;", quote_identifier(os_info.user));
|
|
|
|
while (fgets(line, sizeof(line), all_dump) != NULL)
|
|
{
|
|
/* switch to db_dump file output? */
|
|
if (current_output == globals_dump && start_of_line &&
|
|
suppressed_username &&
|
|
strncmp(line, "\\connect ", strlen("\\connect ")) == 0)
|
|
current_output = db_dump;
|
|
|
|
/* output unless we are recreating our own username */
|
|
if (current_output != globals_dump || !start_of_line ||
|
|
(strncmp(line, create_role_str, strlen(create_role_str)) != 0 &&
|
|
strncmp(line, create_role_str_quote, strlen(create_role_str_quote)) != 0))
|
|
fputs(line, current_output);
|
|
else
|
|
suppressed_username = true;
|
|
|
|
if (strlen(line) > 0 && line[strlen(line) - 1] == '\n')
|
|
start_of_line = true;
|
|
else
|
|
start_of_line = false;
|
|
}
|
|
|
|
fclose(all_dump);
|
|
fclose(globals_dump);
|
|
fclose(db_dump);
|
|
}
|