From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Wed, 17 Dec 2014 22:16:05 +0000 (-0500)
Subject: Add RESET ALL to crucial places in DDL processing
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=refs%2Fheads%2Fbug355;p=slony1-engine.git

Add RESET ALL to crucial places in DDL processing
---

diff --git a/src/backend/slony1_funcs.sql b/src/backend/slony1_funcs.sql
index e83c911e..e87c9e53 100644
--- a/src/backend/slony1_funcs.sql
+++ b/src/backend/slony1_funcs.sql
@@ -3787,6 +3787,7 @@ create or replace function @NAMESPACE@.ddlScript_complete_int ()
 returns int4
 as $$
 begin
+	execute 'RESET ALL;';
 	perform @NAMESPACE@.updateRelname();
 	perform @NAMESPACE@.repair_log_triggers(true);
 	return 0;
diff --git a/src/slonik/slonik.c b/src/slonik/slonik.c
index 5ab4cd9c..d2f9486c 100644
--- a/src/slonik/slonik.c
+++ b/src/slonik/slonik.c
@@ -5061,6 +5061,17 @@ slonik_ddl_script(SlonikStmt_ddl_script * stmt)
 			return -1;
 		}
 		PQclear(res1);
+		
+		slon_mkquery(&query, "%s", "RESET ALL;");
+		res1 = PQexec(adminfo1->dbconn, dstring_data(&query));
+		if (PQresultStatus(res1) != PGRES_COMMAND_OK) {
+			fprintf(stderr, "%s [%s] - %s",
+					PQresStatus(PQresultStatus(res1)),
+					dstring_data(&query), PQresultErrorMessage(res1));
+			PQclear(res1);
+			dstring_free(&query);
+			return -1;
+		}				
 	}
 
 	/*