Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main.slony.info:/tmp/cvs-serv12347

Modified Files:
	slony1_funcs.sql 
Log Message:
Adjust Slony-I functions to the more restricted casting to text
that was recently introduced.

Jan


Index: slony1_funcs.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** slony1_funcs.sql	7 Jun 2007 13:01:10 -0000	1.111
--- slony1_funcs.sql	7 Jun 2007 22:40:23 -0000	1.112
***************
*** 729,733 ****
  	perform @NAMESPACE at .storeNode_int (p_no_id, p_no_comment, p_no_spool);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_NODE'',
! 									p_no_id, p_no_comment, v_no_spool_txt);
  end;
  ' language plpgsql
--- 729,734 ----
  	perform @NAMESPACE at .storeNode_int (p_no_id, p_no_comment, p_no_spool);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_NODE'',
! 									p_no_id::text, p_no_comment::text, 
! 									v_no_spool_txt::text);
  end;
  ' language plpgsql
***************
*** 835,839 ****
  	perform @NAMESPACE at .enableNode_int (p_no_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ENABLE_NODE'',
! 									p_no_id);
  end;
  ' language plpgsql;
--- 836,840 ----
  	perform @NAMESPACE at .enableNode_int (p_no_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ENABLE_NODE'',
! 									p_no_id::text);
  end;
  ' language plpgsql;
***************
*** 1015,1019 ****
  	perform @NAMESPACE at .dropNode_int(p_no_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_NODE'',
! 									p_no_id);
  end;
  ' language plpgsql;
--- 1016,1020 ----
  	perform @NAMESPACE at .dropNode_int(p_no_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_NODE'',
! 									p_no_id::text);
  end;
  ' language plpgsql;
***************
*** 1477,1481 ****
  			p_pa_conninfo, p_pa_connretry);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_PATH'', 
! 			p_pa_server, p_pa_client, p_pa_conninfo, p_pa_connretry);
  end;
  ' language plpgsql;
--- 1478,1483 ----
  			p_pa_conninfo, p_pa_connretry);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_PATH'', 
! 			p_pa_server::text, p_pa_client::text, 
! 			p_pa_conninfo::text, p_pa_connretry::text);
  end;
  ' language plpgsql;
***************
*** 1611,1615 ****
  
  	return  @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_PATH'',
! 			p_pa_server, p_pa_client);
  end;
  ' language plpgsql;
--- 1613,1617 ----
  
  	return  @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_PATH'',
! 			p_pa_server::text, p_pa_client::text);
  end;
  ' language plpgsql;
***************
*** 1680,1684 ****
  	perform @NAMESPACE at .storeListen_int (p_origin, p_provider, p_receiver);
  	return  @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''STORE_LISTEN'',
! 			p_origin, p_provider, p_receiver);
  end;
  ' language plpgsql
--- 1682,1686 ----
  	perform @NAMESPACE at .storeListen_int (p_origin, p_provider, p_receiver);
  	return  @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''STORE_LISTEN'',
! 			p_origin::text, p_provider::text, p_receiver::text);
  end;
  ' language plpgsql
***************
*** 1769,1773 ****
  	
  	return  @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_LISTEN'',
! 			p_li_origin, p_li_provider, p_li_receiver);
  end;
  ' language plpgsql;
--- 1771,1775 ----
  	
  	return  @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_LISTEN'',
! 			p_li_origin::text, p_li_provider::text, p_li_receiver::text);
  end;
  ' language plpgsql;
***************
*** 1839,1843 ****
  
  	return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_SET'', 
! 			p_set_id, v_local_node_id, p_set_comment);
  end;
  ' language plpgsql;
--- 1841,1845 ----
  
  	return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_SET'', 
! 			p_set_id::text, v_local_node_id::text, p_set_comment::text);
  end;
  ' language plpgsql;
***************
*** 2128,2132 ****
  	-- ----
  	return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''MOVE_SET'', 
! 			p_set_id, v_local_node_id, p_new_origin);
  end;
  ' language plpgsql;
--- 2130,2134 ----
  	-- ----
  	return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''MOVE_SET'', 
! 			p_set_id::text, v_local_node_id::text, p_new_origin::text);
  end;
  ' language plpgsql;
***************
*** 2175,2179 ****
  		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SYNC'', NULL);
  		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ACCEPT_SET'', 
! 			p_set_id, p_old_origin, p_new_origin, p_wait_seqno);
  	end if;
  
--- 2177,2182 ----
  		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SYNC'', NULL);
  		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ACCEPT_SET'', 
! 			p_set_id::text, p_old_origin::text, 
! 			p_new_origin::text, p_wait_seqno::text);
  	end if;
  
***************
*** 2358,2362 ****
  	perform @NAMESPACE at .dropSet_int(p_set_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_SET'', 
! 			p_set_id);
  end;
  ' language plpgsql;
--- 2361,2365 ----
  	perform @NAMESPACE at .dropSet_int(p_set_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_SET'', 
! 			p_set_id::text);
  end;
  ' language plpgsql;
***************
*** 2507,2511 ****
  	perform @NAMESPACE at .mergeSet_int(p_set_id, p_add_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''MERGE_SET'', 
! 			p_set_id, p_add_id);
  end;
  ' language plpgsql;
--- 2510,2514 ----
  	perform @NAMESPACE at .mergeSet_int(p_set_id, p_add_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''MERGE_SET'', 
! 			p_set_id::text, p_add_id::text);
  end;
  ' language plpgsql;
***************
*** 2599,2604 ****
  			p_tab_idxname, p_tab_comment);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_ADD_TABLE'',
! 			p_set_id, p_tab_id, p_fqname,
! 			p_tab_idxname, p_tab_comment);
  end;
  ' language plpgsql;
--- 2602,2607 ----
  			p_tab_idxname, p_tab_comment);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_ADD_TABLE'',
! 			p_set_id::text, p_tab_id::text, p_fqname::text,
! 			p_tab_idxname::text, p_tab_comment::text);
  end;
  ' language plpgsql;
***************
*** 2784,2788 ****
  	-- ----
  	perform @NAMESPACE at .setDropTable_int(p_tab_id);
! 	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_TABLE'', p_tab_id);
  end;
  ' language plpgsql;
--- 2787,2792 ----
  	-- ----
  	perform @NAMESPACE at .setDropTable_int(p_tab_id);
! 	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_TABLE'', 
! 				p_tab_id::text);
  end;
  ' language plpgsql;
***************
*** 2906,2910 ****
  			p_seq_comment);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_ADD_SEQUENCE'',
! 			p_set_id, p_seq_id, p_fqname, p_seq_comment);
  end;
  ' language plpgsql;
--- 2910,2915 ----
  			p_seq_comment);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_ADD_SEQUENCE'',
! 						p_set_id::text, p_seq_id::text, 
! 						p_fqname::text, p_seq_comment::text);
  end;
  ' language plpgsql;
***************
*** 3070,3074 ****
  	perform @NAMESPACE at .setDropSequence_int(p_seq_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_SEQUENCE'',
! 			p_seq_id);
  end;
  ' language plpgsql;
--- 3075,3079 ----
  	perform @NAMESPACE at .setDropSequence_int(p_seq_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_SEQUENCE'',
! 					p_seq_id::text);
  end;
  ' language plpgsql;
***************
*** 3235,3239 ****
  	perform @NAMESPACE at .setMoveTable_int(p_tab_id, p_new_set_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_MOVE_TABLE'', 
! 			p_tab_id, p_new_set_id);
  end;
  ' language plpgsql;
--- 3240,3244 ----
  	perform @NAMESPACE at .setMoveTable_int(p_tab_id, p_new_set_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_MOVE_TABLE'', 
! 			p_tab_id::text, p_new_set_id::text);
  end;
  ' language plpgsql;
***************
*** 3358,3362 ****
  	perform @NAMESPACE at .setMoveSequence_int(p_seq_id, p_new_set_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_MOVE_SEQUENCE'', 
! 			p_seq_id, p_new_set_id);
  end;
  ' language plpgsql;
--- 3363,3367 ----
  	perform @NAMESPACE at .setMoveSequence_int(p_seq_id, p_new_set_id);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_MOVE_SEQUENCE'', 
! 			p_seq_id::text, p_new_set_id::text);
  end;
  ' language plpgsql;
***************
*** 3457,3461 ****
  	perform @NAMESPACE at .storeTrigger_int(p_trig_tabid, p_trig_tgname);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_TRIGGER'',
! 			p_trig_tabid, p_trig_tgname);
  end;
  ' language plpgsql;
--- 3462,3466 ----
  	perform @NAMESPACE at .storeTrigger_int(p_trig_tabid, p_trig_tgname);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_TRIGGER'',
! 			p_trig_tabid::text, p_trig_tgname::text);
  end;
  ' language plpgsql;
***************
*** 3528,3532 ****
  	perform @NAMESPACE at .dropTrigger_int(p_trig_tabid, p_trig_tgname);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_TRIGGER'',
! 			p_trig_tabid, p_trig_tgname);
  end;
  ' language plpgsql;
--- 3533,3537 ----
  	perform @NAMESPACE at .dropTrigger_int(p_trig_tabid, p_trig_tgname);
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_TRIGGER'',
! 			p_trig_tabid::text, p_trig_tgname::text);
  end;
  ' language plpgsql;
***************
*** 3647,3651 ****
  	if p_only_on_node = -1 then
  		return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DDL_SCRIPT'', 
! 			p_set_id, p_script, p_only_on_node);
  	end if;
  	return NULL;
--- 3652,3656 ----
  	if p_only_on_node = -1 then
  		return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DDL_SCRIPT'', 
! 			p_set_id::text, p_script::text, p_only_on_node::text);
  	end if;
  	return NULL;
***************
*** 4145,4149 ****
  	-- ----
  	v_ev_seqno :=  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SUBSCRIBE_SET'', 
! 			p_sub_set, p_sub_provider, p_sub_receiver, 
  			case p_sub_forward when true then ''t'' else ''f'' end);
  
--- 4150,4154 ----
  	-- ----
  	v_ev_seqno :=  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SUBSCRIBE_SET'', 
! 			p_sub_set::text, p_sub_provider::text, p_sub_receiver::text, 
  			case p_sub_forward when true then ''t'' else ''f'' end);
  
***************
*** 4244,4248 ****
  	if v_set_origin = @NAMESPACE at .getLocalNodeId(''_ at CLUSTERNAME@'') then
  		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ENABLE_SUBSCRIPTION'', 
! 				p_sub_set, p_sub_provider, p_sub_receiver, 
  				case p_sub_forward when true then ''t'' else ''f'' end);
  		perform @NAMESPACE at .enableSubscription(p_sub_set, 
--- 4249,4253 ----
  	if v_set_origin = @NAMESPACE at .getLocalNodeId(''_ at CLUSTERNAME@'') then
  		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ENABLE_SUBSCRIPTION'', 
! 				p_sub_set::text, p_sub_provider::text, p_sub_receiver::text, 
  				case p_sub_forward when true then ''t'' else ''f'' end);
  		perform @NAMESPACE at .enableSubscription(p_sub_set, 
***************
*** 4339,4343 ****
  	-- ----
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''UNSUBSCRIBE_SET'', 
! 			p_sub_set, p_sub_receiver);
  end;
  ' language plpgsql;
--- 4344,4348 ----
  	-- ----
  	return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''UNSUBSCRIBE_SET'', 
! 			p_sub_set::text, p_sub_receiver::text);
  end;
  ' language plpgsql;
***************
*** 5059,5063 ****
  
          return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''RESET_CONFIG'',
!                         p_set_id, p_only_on_node);
  end;
  ' language plpgsql;
--- 5064,5068 ----
  
          return  @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''RESET_CONFIG'',
!                         p_set_id::text, p_only_on_node::text);
  end;
  ' language plpgsql;