CVS User Account cvsuser
Tue Jul 11 15:22:29 PDT 2006
Log Message:
-----------
In older versions of PG we can not call functional output in raise notice.

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

-------------- next part --------------
Index: slony1_funcs.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.89
retrieving revision 1.90
diff -Lsrc/backend/slony1_funcs.sql -Lsrc/backend/slony1_funcs.sql -u -w -r1.89 -r1.90
--- src/backend/slony1_funcs.sql
+++ src/backend/slony1_funcs.sql
@@ -181,10 +181,13 @@
   '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
-  if @NAMESPACE at .getModuleVersion() <> ''@MODULEVERSION@'' then
-      raise exception ''Slonik version: % != Slony-I version in PG build %'',
-             ''@MODULEVERSION@'', @NAMESPACE at .getModuleVersion();
+  select into moduleversion @NAMESPACE at .getModuleVersion();
+  if moduleversion <> ''@MODULEVERSION@'' then
+      raise exception ''Slonik version: @MODULEVERSION@ != Slony-I version in PG build %'',
+             moduleversion;
   end if;
   return null;
 end;' language plpgsql;



More information about the Slony1-commit mailing list