CVS User Account cvsuser
Fri Dec 17 23:19:05 PST 2004
Log Message:
-----------
More diff crazyness repairs

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

-------------- next part --------------
Index: slony1_funcs.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lsrc/backend/slony1_funcs.sql -Lsrc/backend/slony1_funcs.sql -u -w -r1.51 -r1.52
--- src/backend/slony1_funcs.sql
+++ src/backend/slony1_funcs.sql
@@ -2298,14 +2298,15 @@
 create or replace function @NAMESPACE at .setAddTable_int(int4, int4, text, name, text)
 returns int4
 as '
-	v_tab_relname		name;
-	v_tab_nspname		name;
 declare
+
 	p_set_id			alias for $1;
 	p_tab_id			alias for $2;
 	p_fqname			alias for $3;
 	p_tab_idxname		alias for $4;
 	p_tab_comment		alias for $5;
+	v_tab_relname		name;
+	v_tab_nspname		name;
 	v_local_node_id		int4;
 	v_set_origin		int4;
 	v_sub_provider		int4;
@@ -4721,6 +4722,16 @@
 				and PGA.attname = ''_Slony-I_ at CLUSTERNAME@_rowID''
 				and not PGA.attisdropped;
 	return found;
+end;
+' language plpgsql;
+
+comment on function @NAMESPACE at .tableHasSerialKey(text) is
+'tableHasSerialKey (tab_fqname)
+
+Checks if a table has our special serial key column that is used if
+the table has no natural unique constraint.';
+
+-- ----------------------------------------------------------------------
 -- FUNCTION updateRelname (set_id, only_on_node)
 --
 --      Reset the relnames          
@@ -4779,6 +4790,7 @@
         return p_set_id;
 end;
 ' language plpgsql;
+
 comment on function @NAMESPACE at .updateRelname(int4, int4) is
 'updateRelname(set_id, only_on_node)';
 
@@ -4853,17 +4865,6 @@
 their respective FQN';
 
 -- ----------------------------------------------------------------------
-end;
-' language plpgsql;
-
-comment on function @NAMESPACE at .tableHasSerialKey(text) is
-'tableHasSerialKey (tab_fqname)
-
-Checks if a table has our special serial key column that is used if
-the table has no natural unique constraint.';
-
-
--- ----------------------------------------------------------------------
 -- FUNCTION upgradeSchema(old_version)
         -- upgrade sl_node
 --


More information about the Slony1-commit mailing list