From f1ce24cb79dd4cdcd93d602ddede711efff8227e Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Thu, 19 Nov 2020 19:10:02 -0600 Subject: [PATCH v2 1/2] pg_restore: parse and run separately SQL commands If pg_dump emits multiple DDL commands, run them in separate transactions, to avoid failures in the 2ndary (ALTER) commands from rolling back the first, primary (CREATE) command. XXX: is there any performance benefit possible if can we call ExecuteSqlCommand() in some cases? I don't think it matters much for DDL. --- src/bin/pg_dump/pg_backup_db.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index 5ba43441f5..1565155e20 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -477,21 +477,20 @@ ExecuteSqlCommandBuf(Archive *AHX, const char *buf, size_t bufLen) else { /* - * General SQL commands; we assume that commands will not be split - * across calls. + * General SQL commands * * In most cases the data passed to us will be a null-terminated * string, but if it's not, we have to add a trailing null. */ if (buf[bufLen] == '\0') - ExecuteSqlCommand(AH, buf, "could not execute query"); + ExecuteSimpleCommands(AH, buf, bufLen); else { char *str = (char *) pg_malloc(bufLen + 1); memcpy(str, buf, bufLen); str[bufLen] = '\0'; - ExecuteSqlCommand(AH, str, "could not execute query"); + ExecuteSimpleCommands(AH, buf, bufLen); free(str); } } -- 2.17.0