Add RESET ALL to crucial places in DDL processing

diff --git a/src/backend/slony1_funcs.sql b/src/backend/slony1_funcs.sql
index e83c911e057b282fb230e7c828f13c19d87efb39..e87c9e534a7a478b6a7b86188710554dc855b9dd 100644 (file)
--- a/src/backend/slony1_funcs.sql
+++ b/src/backend/slony1_funcs.sql
@@ -3787,6 +3787,7 @@ create or replace function @[email protected]_complete_int ()
 returns int4
 as $$
 begin
+       execute 'RESET ALL;';
        perform @[email protected]();
        perform @[email protected]_log_triggers(true);
        return 0;

diff --git a/src/slonik/slonik.c b/src/slonik/slonik.c
index 5ab4cd9cb946ee540638c0a80726459c5a162dbc..d2f9486cc8457c941e6aa06e26cf1d2c6c22888b 100644 (file)
--- 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;
+               }                               
        }
 
        /*