Commit3f63333

committed

Make pg_dump/restore safer for autocommit=off in postgresql.conf.

1 parent37664ee commit3f63333Copy full SHA for 3f63333

File tree

+32

-5

lines changed

+32

-5

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.67 2003/02/01 22:06:59 tgl Exp $`
	`18`	`+ *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.68 2003/02/14 19:40:42 momjian Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -206,7 +206,8 @@ RestoreArchive(Archive AHX, RestoreOptions ropt)`
`206`	`206`	`sav=SetOutput(AH,ropt->filename,ropt->compression);`
`207`	`207`
`208`	`208`	`ahprintf(AH,"--\n-- PostgreSQL database dump\n--\n\n");`
`209`		`-`
	`209`	`+ahprintf(AH,"SET autocommit TO 'on';\n\n");`
	`210`	`+`
`210`	`211`	`/*`
`211`	`212`	`* Drop the items at the start, in reverse order`
`212`	`213`	`*/`
`@@ -2109,7 +2110,8 @@ _reconnectAsUser(ArchiveHandle AH, const char dbname, const char *user)`
`2109`	`2110`	`dbname ?fmtId(dbname) :"-");`
`2110`	`2111`	`appendPQExpBuffer(qry," %s\n\n",`
`2111`	`2112`	`fmtId(user));`
`2112`		`-`
	`2113`	`+appendPQExpBuffer(qry,"SET autocommit TO 'on';\n\n");`
	`2114`	`+`
`2113`	`2115`	`ahprintf(AH,qry->data);`
`2114`	`2116`
`2115`	`2117`	`destroyPQExpBuffer(qry);`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*Implements the basic DB functions used by the archiver.`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.45 2003/02/13 04:54:15 momjian Exp $`
	`8`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.46 2003/02/14 19:40:42 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -213,6 +213,21 @@ _connectDB(ArchiveHandle AH, const char reqdb, const char *requser)`
`213`	`213`	`if (password)`
`214`	`214`	`free(password);`
`215`	`215`
	`216`	`+/* check for version mismatch */`
	`217`	`+_check_database_version(AH, true);`
	`218`	`+`
	`219`	`+/* Turn autocommit on */`
	`220`	`+if (AH->public.remoteVersion >=70300)`
	`221`	`+{`
	`222`	`+PGresult*res;`
	`223`	`+`
	`224`	`+res=PQexec(AH->connection,"SET autocommit TO 'on'");`
	`225`	`+if (!res\|\|PQresultStatus(res)!=PGRES_COMMAND_OK)`
	`226`	`+die_horribly(AH,NULL,"SET autocommit TO 'on' failed: %s",`
	`227`	`+PQerrorMessage(AH->connection));`
	`228`	`+PQclear(res);`
	`229`	`+}`
	`230`	`+`
`216`	`231`	`PQsetNoticeProcessor(newConn,notice_processor,NULL);`
`217`	`232`
`218`	`233`	`returnnewConn;`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.13 2003/01/16 15:27:59 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.14 2003/02/14 19:40:42 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -190,6 +190,7 @@ main(int argc, char *argv[])`
`190`	`190`	`printf("-- PostgreSQL database cluster dump\n");`
`191`	`191`	`printf("--\n\n");`
`192`	`192`	`printf("\\connect \"template1\"\n\n");`
	`193`	`+printf("SET autocommit TO 'on';\n\n");`
`193`	`194`
`194`	`195`	`dumpUsers(conn);`
`195`	`196`	`dumpGroups(conn);`
`@@ -552,6 +553,7 @@ dumpDatabases(PGconn *conn)`
`552`	`553`	`fprintf(stderr,_("%s: dumping database \"%s\"...\n"),progname,dbname);`
`553`	`554`
`554`	`555`	`printf("\\connect %s\n",fmtId(dbname));`
	`556`	`+printf("SET autocommit TO 'on';\n\n");`
`555`	`557`	`ret=runPgDump(dbname);`
`556`	`558`	`if (ret!=0)`
`557`	`559`	`{`
`@@ -677,6 +679,14 @@ connectDatabase(const char dbname, const char pghost, const char *pgport,`
`677`	`679`	`}`
`678`	`680`	`PQclear(res);`
`679`	`681`
	`682`	`+if (server_version >=70300)`
	`683`	`+{`
	`684`	`+PGresult*res;`
	`685`	`+`
	`686`	`+res=executeQuery(conn,"SET autocommit TO 'on';SELECT 1;");`
	`687`	`+PQclear(res);`
	`688`	`+}`
	`689`	`+`
`680`	`690`	`returnconn;`
`681`	`691`	`}`
`682`	`692`

Comments

(0)