Merge branch 'bug305'

machack666 · Jul 29, 2013 · 8bb7618 · 8bb7618
2 parents bcd79f5 + bed4153
commit 8bb7618
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/backend/slony1_funcs.c b/src/backend/slony1_funcs.c
@@ -989,9 +989,11 @@ versionFunc(logApply)(PG_FUNCTION_ARGS)
 		char	   *ddl_script;
 		bool		localNodeFound = true;
 		Datum		script_insert_args[5];
+		char        query[1024];
 
 		apply_num_script++;
 
+
 		/*
 		 * Turn the log_cmdargs into a plain array of Text Datums.
 		 */
@@ -1036,12 +1038,27 @@ versionFunc(logApply)(PG_FUNCTION_ARGS)
 		 */
 		if (localNodeFound)
 		{
+			sprintf(query,"set session_replication_role to local;");
+			if(SPI_exec(query,0) < 0)
+			{
+				elog(ERROR, "SPI_exec() failed for statement '%s'",
+					 query);
+			}
+
+
 			if (SPI_exec(ddl_script, 0) < 0)
 			{
 				elog(ERROR, "SPI_exec() failed for DDL statement '%s'",
 					 ddl_script);
 			}
 
+			sprintf(query,"set session_replication_role to replica;");
+			if(SPI_exec(query,0) < 0)
+			{
+					elog(ERROR, "SPI_exec() failed for statement '%s'",
+					 query);
+			}
+
 			/*
 			 * Set the currentXid to invalid to flush the apply query cache.
 			 */
@@ -1130,6 +1147,7 @@ versionFunc(logApply)(PG_FUNCTION_ARGS)
 				elog(ERROR, "SPI_exec() failed for statement '%s'",
 					 query);
 			}
+
 
 			/*
 			 * Set the currentXid to invalid to flush the apply query cache.

diff --git a/tools/slony1_dump.sh b/tools/slony1_dump.sh
@@ -281,7 +281,9 @@ begin
 		execute v_command;
 	end if;
     if NEW.log_cmdtype = 'S' then
+          execute 'set session_replication_role to local;';
           execute NEW.log_cmdargs[1];  
+          execute 'set session_replication_role to replica;';
 
     end if;
 	if NEW.log_cmdtype = 'T' then