Chris Browne cbbrowne at lists.slony.info
Wed Aug 6 15:05:48 PDT 2008
Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main.slony.info:/tmp/cvs-serv5574

Modified Files:
	slony1_funcs.sql 
Log Message:
Changed stored functions to use dollar quoting (e.g. - $$ / $$) rather than
the 7.4-and-before ''double quotes''.

In the few places where we need to use quotes, generate that via 
pg_catalog.quote_literal().

I ran through test1 and testddl, which look to exercise enough logic to
cover everything, as, between them, these tests:
 a) Load all stored procs, to make sure we have them all
    syntax-correct;
 b) Create logtriggers + denyaccess triggers on replicated tables;
 c) Drop & recreate those triggers.

That would seem to represent the 3 scenarios where quoting might be
expected to break.


Index: slony1_funcs.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** slony1_funcs.sql	15 Jul 2008 22:25:44 -0000	1.141
--- slony1_funcs.sql	6 Aug 2008 22:05:45 -0000	1.142
***************
*** 180,194 ****
    'Returns the compiled-in version number of the Slony-I shared object';
  
! create or replace function @NAMESPACE at .checkmoduleversion () returns text as '
  declare
    moduleversion	text;
  begin
    select into moduleversion @NAMESPACE at .getModuleVersion();
!   if moduleversion <> ''@MODULEVERSION@'' then
!       raise exception ''Slonik version: @MODULEVERSION@ != Slony-I version in PG build %'',
               moduleversion;
[...5912 lines suppressed...]
  
***************
*** 5840,5844 ****
     return @NAMESPACE at .add_empty_table_to_replication(v_set_id, p_tab_id, p_nspname, p_tabname, p_idxname, p_comment);
  end
! ' language plpgsql;
  
  comment on function @NAMESPACE at .replicate_partition(int4, text, text, text, text) is
--- 5839,5843 ----
     return @NAMESPACE at .add_empty_table_to_replication(v_set_id, p_tab_id, p_nspname, p_tabname, p_idxname, p_comment);
  end
! $$ language plpgsql;
  
  comment on function @NAMESPACE at .replicate_partition(int4, text, text, text, text) is
***************
*** 5846,5848 ****
  tab_idxname is optional - if NULL, then we use the primary key.
  This function looks up replication configuration via the parent table.';
- 
--- 5845,5846 ----



More information about the Slony1-commit mailing list