Thu Jun 7 17:08:05 PDT 2007
- Previous message: [Slony1-commit] slony1-engine/src/backend slony1_funcs.sql
- Next message: [Slony1-commit] slony1-engine/src/ducttape test_1_pgbench.in
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main.slony.info:/tmp/cvs-serv13073/src/backend
Modified Files:
Tag: REL_1_2_STABLE
slony1_funcs.sql
Log Message:
Backpatch the fixes for the restricted text casts in 8.3. Tested against
8.3 and 8.2 ... need much more tests before we can release 1.2.10.
Jan
Index: slony1_funcs.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.98.2.16
retrieving revision 1.98.2.17
diff -C2 -d -r1.98.2.16 -r1.98.2.17
*** slony1_funcs.sql 6 Jun 2007 22:23:16 -0000 1.98.2.16
--- slony1_funcs.sql 8 Jun 2007 00:08:03 -0000 1.98.2.17
***************
*** 754,758 ****
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
--- 754,759 ----
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
***************
*** 860,864 ****
perform @NAMESPACE at .enableNode_int (p_no_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ENABLE_NODE'',
! p_no_id);
end;
' language plpgsql;
--- 861,865 ----
perform @NAMESPACE at .enableNode_int (p_no_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''ENABLE_NODE'',
! p_no_id::text);
end;
' language plpgsql;
***************
*** 1040,1044 ****
perform @NAMESPACE at .dropNode_int(p_no_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_NODE'',
! p_no_id);
end;
' language plpgsql;
--- 1041,1045 ----
perform @NAMESPACE at .dropNode_int(p_no_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_NODE'',
! p_no_id::text);
end;
' language plpgsql;
***************
*** 1515,1519 ****
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;
--- 1516,1521 ----
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;
***************
*** 1649,1653 ****
return @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_PATH'',
! p_pa_server, p_pa_client);
end;
' language plpgsql;
--- 1651,1655 ----
return @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_PATH'',
! p_pa_server::text, p_pa_client::text);
end;
' language plpgsql;
***************
*** 1718,1722 ****
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
--- 1720,1724 ----
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
***************
*** 1807,1811 ****
return @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_LISTEN'',
! p_li_origin, p_li_provider, p_li_receiver);
end;
' language plpgsql;
--- 1809,1813 ----
return @NAMESPACE at .createEvent (''_ at CLUSTERNAME@'', ''DROP_LISTEN'',
! p_li_origin::text, p_li_provider::text, p_li_receiver::text);
end;
' language plpgsql;
***************
*** 1877,1881 ****
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_SET'',
! p_set_id, v_local_node_id, p_set_comment);
end;
' language plpgsql;
--- 1879,1883 ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''STORE_SET'',
! p_set_id::text, v_local_node_id::text, p_set_comment::text);
end;
' language plpgsql;
***************
*** 2167,2171 ****
-- ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''MOVE_SET'',
! p_set_id, v_local_node_id, p_new_origin);
end;
' language plpgsql;
--- 2169,2173 ----
-- ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''MOVE_SET'',
! p_set_id::text, v_local_node_id::text, p_new_origin::text);
end;
' language plpgsql;
***************
*** 2227,2231 ****
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;
--- 2229,2234 ----
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;
***************
*** 2410,2414 ****
perform @NAMESPACE at .dropSet_int(p_set_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_SET'',
! p_set_id);
end;
' language plpgsql;
--- 2413,2417 ----
perform @NAMESPACE at .dropSet_int(p_set_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DROP_SET'',
! p_set_id::text);
end;
' language plpgsql;
***************
*** 2561,2565 ****
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;
--- 2564,2568 ----
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;
***************
*** 2653,2658 ****
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;
--- 2656,2661 ----
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;
***************
*** 2838,2842 ****
-- ----
perform @NAMESPACE at .setDropTable_int(p_tab_id);
! return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_TABLE'', p_tab_id);
end;
' language plpgsql;
--- 2841,2846 ----
-- ----
perform @NAMESPACE at .setDropTable_int(p_tab_id);
! return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_TABLE'',
! p_tab_id::text);
end;
' language plpgsql;
***************
*** 2961,2965 ****
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;
--- 2965,2970 ----
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;
***************
*** 3125,3129 ****
perform @NAMESPACE at .setDropSequence_int(p_seq_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_SEQUENCE'',
! p_seq_id);
end;
' language plpgsql;
--- 3130,3134 ----
perform @NAMESPACE at .setDropSequence_int(p_seq_id);
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SET_DROP_SEQUENCE'',
! p_seq_id::text);
end;
' language plpgsql;
***************
*** 3290,3294 ****
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;
--- 3295,3299 ----
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;
***************
*** 3413,3417 ****
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;
--- 3418,3422 ----
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;
***************
*** 3512,3516 ****
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;
--- 3517,3521 ----
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;
***************
*** 3597,3601 ****
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;
--- 3602,3606 ----
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;
***************
*** 3742,3746 ****
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DDL_SCRIPT'',
! p_set_id, p_script, p_only_on_node);
else
perform @NAMESPACE at .alterTableForReplication(tab_id) from @NAMESPACE at .sl_table;
--- 3747,3751 ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''DDL_SCRIPT'',
! p_set_id::text, p_script::text, p_only_on_node::text);
else
perform @NAMESPACE at .alterTableForReplication(tab_id) from @NAMESPACE at .sl_table;
***************
*** 4199,4203 ****
-- ----
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);
--- 4204,4208 ----
-- ----
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);
***************
*** 4298,4302 ****
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,
--- 4303,4307 ----
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,
***************
*** 4395,4399 ****
-- ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''UNSUBSCRIBE_SET'',
! p_sub_set, p_sub_receiver);
end;
' language plpgsql;
--- 4400,4404 ----
-- ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''UNSUBSCRIBE_SET'',
! p_sub_set::text, p_sub_receiver::text);
end;
' language plpgsql;
***************
*** 5409,5413 ****
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''RESET_CONFIG'',
! p_set_id, p_only_on_node);
end;
' language plpgsql;
--- 5414,5418 ----
return @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''RESET_CONFIG'',
! p_set_id::text, p_only_on_node::text);
end;
' language plpgsql;
- Previous message: [Slony1-commit] slony1-engine/src/backend slony1_funcs.sql
- Next message: [Slony1-commit] slony1-engine/src/ducttape test_1_pgbench.in
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list