CVS User Account cvsuser
Thu Dec 14 21:34:18 PST 2006
Log Message:
-----------
Pre/post scripts run by slonik on origin node for EXECUTE SCRIPT
did not remove/restore the logtrigger() triggers.

Version numbers in UPGRADE FUNCTIONS varying from 1.2's code

Modified Files:
--------------
    slony1-engine/src/backend:
        slony1_funcs.sql (r1.102 -> r1.103)

-------------- next part --------------
Index: slony1_funcs.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.102
retrieving revision 1.103
diff -Lsrc/backend/slony1_funcs.sql -Lsrc/backend/slony1_funcs.sql -u -w -r1.102 -r1.103
--- src/backend/slony1_funcs.sql
+++ src/backend/slony1_funcs.sql
@@ -3700,6 +3700,8 @@
 	-- ----
 	-- Create a SYNC event, run the script and generate the DDL_SCRIPT event
 	-- ----
+    perform @NAMESPACE at .alterTableRestore(tab_id) from @NAMESPACE at .sl_table where tab_set in (select set_id from @NAMESPACE at .sl_set where set_origin = @NAMESPACE at .getLocalNodeId(''_ at CLUSTERNAME@''));
+
 	perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SYNC'', NULL);
 	return 1;
 end;
@@ -3725,6 +3727,7 @@
 	v_set_origin		int4;
 begin
 	perform @NAMESPACE at .updateRelname(p_set_id, p_only_on_node);
+    perform @NAMESPACE at .alterTableForReplication(tab_id) from @NAMESPACE at .sl_table where tab_set in (select set_id from @NAMESPACE at .sl_set where set_origin = @NAMESPACE at .getLocalNodeId(''_ at CLUSTERNAME@''));
 	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DDL_SCRIPT'', 
 			p_set_id, p_script, p_only_on_node);
 end;
@@ -5784,7 +5787,7 @@
 	-- ----
 	-- Changes for 1.1.3
 	-- ----
-	if p_old IN (''1.0.2'', ''1.0.5'', ''1.0.6'', ''1.1.0'', ''1.1.1'', ''1.1.2'', ''1.1.3'', ''1.1.5'', ''1.1.6'') then
+	if p_old IN (''1.0.2'', ''1.0.5'', ''1.0.6'', ''1.1.0'', ''1.1.1'', ''1.1.2'') then
 		-- Add new table sl_nodelock
 		execute ''create table @NAMESPACE at .sl_nodelock (
 						nl_nodeid		int4,
@@ -5803,7 +5806,7 @@
 	-- ----
 	-- Changes for 1.2
 	-- ----
-	if p_old IN (''1.0.2'', ''1.0.5'', ''1.0.6'', ''1.1.0'', ''1.1.1'', ''1.1.2'', ''1.1.3'') then
+	if p_old IN (''1.0.2'', ''1.0.5'', ''1.0.6'', ''1.1.0'', ''1.1.1'', ''1.1.2'', ''1.1.3'', ''1.1.5'', ''1.1.6'') then
 		-- Add new table sl_registry
 		execute ''create table @NAMESPACE at .sl_registry (
 						reg_key			text primary key,



More information about the Slony1-commit mailing list