Index: openacs-4/packages/user-profile/sql/postgresql/user-profile-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/sql/postgresql/user-profile-init.sql,v
diff -u -r1.1 -r1.1.22.1
--- openacs-4/packages/user-profile/sql/postgresql/user-profile-init.sql	29 Mar 2002 16:56:10 -0000	1.1
+++ openacs-4/packages/user-profile/sql/postgresql/user-profile-init.sql	18 Aug 2014 19:46:17 -0000	1.1.22.1
@@ -5,24 +5,30 @@
 -- @version $Id$
 --
 
-create function inline_1()
-returns integer as '
+
+
+--
+-- procedure inline_1/0
+--
+CREATE OR REPLACE FUNCTION inline_1(
+
+) RETURNS integer AS $$
 DECLARE
 	foo integer;
 BEGIN
     PERFORM acs_rel_type__create_type(
-        ''user_profile_rel'',
-        ''Profiled User Membership'',
-        ''Profiled User Memberships'',
-        ''membership_rel'',
-        ''user_profile_rels'',
-        ''rel_id'',
-        ''user_profile_rel'',
-        ''profiled_group'',
+        'user_profile_rel',
+        'Profiled User Membership',
+        'Profiled User Memberships',
+        'membership_rel',
+        'user_profile_rels',
+        'rel_id',
+        'user_profile_rel',
+        'profiled_group',
         null,
         0,
         null,
-        ''user'',
+        'user',
         null,
         0,
         1
@@ -31,30 +37,31 @@
     select min(impl_id)
     into foo
     from acs_sc_impls
-    where impl_name = ''user_profile_provider'';
+    where impl_name = 'user_profile_provider';
 
     foo:= profiled_group__new(
 	   foo,
-	   ''Profiled Users''
+	   'Profiled Users'
     );
 
     PERFORM rel_segment__new(
         NULL,
-	''rel_segment'',
+	'rel_segment',
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
-        ''Profiled Users'',
+        'Profiled Users',
         foo,
-        ''user_profile_rel'',
+        'user_profile_rel',
 	NULL
     );
 
     return 0;
-end;
-' language 'plpgsql';
+END;
 
+$$ LANGUAGE plpgsql;
+
 select inline_1();
 drop function inline_1();
Index: openacs-4/packages/user-profile/sql/postgresql/user-profile-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/sql/postgresql/user-profile-package-create.sql,v
diff -u -r1.2 -r1.2.22.1
--- openacs-4/packages/user-profile/sql/postgresql/user-profile-package-create.sql	12 Jul 2002 21:26:48 -0000	1.2
+++ openacs-4/packages/user-profile/sql/postgresql/user-profile-package-create.sql	18 Aug 2014 19:46:17 -0000	1.2.22.1
@@ -11,15 +11,21 @@
 select define_function_args ('user_profile_rel__delete','rel_id');
 
 
-create function user_profile_rel__new(integer,varchar,integer,integer,integer,varchar)
-returns integer as '
+
+
+--
+-- procedure user_profile_rel__new/6
+--
+CREATE OR REPLACE FUNCTION user_profile_rel__new(
+   p_rel_id integer,
+   p_rel_type varchar, -- default 'user_profile_rel'
+   p_group_id integer,
+   p_user_id integer,
+   p_creation_user integer,
+   p_creation_ip varchar
+
+) RETURNS integer AS $$
 DECLARE
-	p_rel_id		alias for $1;
-	p_rel_type		alias for $2;
-	p_group_id		alias for $3;
-	p_user_id		alias for $4;
-	p_creation_user		alias for $5;
-	p_creation_ip		alias for $6;
         v_rel_id                membership_rels.rel_id%TYPE;
         v_group_id              groups.group_id%TYPE;
 BEGIN
@@ -29,7 +35,7 @@
             from profiled_groups
             where profile_provider = (select min(impl_id)
                                       from acs_sc_impls
-                                      where impl_name = ''user_profile_provider'');
+                                      where impl_name = 'user_profile_provider');
         else
              v_group_id := p_group_id;
         end if;
@@ -39,7 +45,7 @@
             p_rel_type,
             v_group_id,
             p_user_id,
-	    ''approved'',
+	    'approved',
             p_creation_user,
             p_creation_ip
         );
@@ -52,13 +58,19 @@
 
         return v_rel_id;
 END;
-' language 'plpgsql';
 
+$$ LANGUAGE plpgsql;
 
-create function user_profile_rel__delete(integer)
-returns integer as '
+
+
+
+--
+-- procedure user_profile_rel__delete/1
+--
+CREATE OR REPLACE FUNCTION user_profile_rel__delete(
+   p_rel_id integer
+) RETURNS integer AS $$
 DECLARE
-	p_rel_id		alias for $1;
 BEGIN
         delete
         from user_profile_rels
@@ -68,4 +80,5 @@
 	
 	return 0;
 END;
-' language 'plpgsql';
+
+$$ LANGUAGE plpgsql;
Index: openacs-4/packages/user-profile/sql/postgresql/user-profile-provider-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/sql/postgresql/user-profile-provider-drop.sql,v
diff -u -r1.2 -r1.2.22.1
--- openacs-4/packages/user-profile/sql/postgresql/user-profile-provider-drop.sql	8 Jul 2002 22:10:21 -0000	1.2
+++ openacs-4/packages/user-profile/sql/postgresql/user-profile-provider-drop.sql	18 Aug 2014 19:46:17 -0000	1.2.22.1
@@ -5,49 +5,49 @@
 -- @version $Id$
 --
 
-create function inline_0()
-returns integer as '
-begin
+CREATE OR REPLACE FUNCTION inline_0() RETURNS integer AS $$
+BEGIN
 
     -- drop the binding between this implementation and the interface it
     -- implements.
     perform acs_sc_binding__delete (
-        ''profile_provider'',
-        ''user_profile_provider''
+        'profile_provider',
+        'user_profile_provider'
     );
 
     -- drop the bindings to the method implementations
 
     -- name method
     perform acs_sc_impl_alias__delete (
-        ''profile_provider'',
-        ''user_profile_provider'',
-        ''name''
+        'profile_provider',
+        'user_profile_provider',
+        'name'
     );
 
     -- prettyName method
     perform acs_sc_impl_alias__delete (
-        ''profile_provider'',
-        ''user_profile_provider'',
-        ''prettyName''
+        'profile_provider',
+        'user_profile_provider',
+        'prettyName'
     );
 
     -- render method
     perform acs_sc_impl_alias__delete (
-        ''profile_provider'',
-        ''user_profile_provider'',
-        ''render''
+        'profile_provider',
+        'user_profile_provider',
+        'render'
     );
 
     -- drop the implementation
     perform acs_sc_impl__delete(
-        ''profile_provider'',
-        ''user_profile_provider''
+        'profile_provider',
+        'user_profile_provider'
     );
 
     return 0;
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 select inline_0();
 drop function inline_0();
Index: openacs-4/packages/user-profile/sql/postgresql/user-profile-sanitize.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/sql/postgresql/user-profile-sanitize.sql,v
diff -u -r1.2 -r1.2.22.1
--- openacs-4/packages/user-profile/sql/postgresql/user-profile-sanitize.sql	8 Jul 2002 22:10:21 -0000	1.2
+++ openacs-4/packages/user-profile/sql/postgresql/user-profile-sanitize.sql	18 Aug 2014 19:46:17 -0000	1.2.22.1
@@ -5,16 +5,22 @@
 -- @version $Id$
 --
 
-create function inline_1()
-returns integer as '
-declare
+
+
+--
+-- procedure inline_1/0
+--
+CREATE OR REPLACE FUNCTION inline_1(
+
+) RETURNS integer AS $$
+DECLARE
     foo                         integer;
-begin
+BEGIN
 
     select min(segment_id)
     into foo
     from rel_segments
-    where segment_name = ''Profiled Users'';
+    where segment_name = 'Profiled Users';
 
     perform rel_segment__delete(
         foo
@@ -25,21 +31,22 @@
     from profiled_groups
     where profile_provider = (select min(impl_id)
                               from acs_sc_impls
-                              where impl_name = ''user_profile_provider'');
+                              where impl_name = 'user_profile_provider');
 
     perform profiled_group__delete(
         foo
     );
 
     perform acs_rel_type__drop_type(
-        ''user_profile_rel'',
-        ''t''
+        'user_profile_rel',
+        't'
     );
 
     return 0;
 
-end;
-' language 'plpgsql';
+END;
 
+$$ LANGUAGE plpgsql;
+
 select inline_1();
 drop function inline_1();