Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql	26 May 2005 08:28:45 -0000	1.3
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql	30 Mar 2013 22:50:45 -0000	1.4
@@ -5,38 +5,52 @@
 -- @cvs-id $Id$
 --
 
-create or replace function file_storage__delete_folder(
-       --
-       -- Delete a folder
-       --
-       integer          -- cr_folders.folder_id%TYPE
-) returns integer as '  -- 0 for success
-declare
-        delete_folder__folder_id        alias for $1; 
-begin
 
+
+-- added
+
+--
+-- procedure file_storage__delete_folder/1
+--
+CREATE OR REPLACE FUNCTION file_storage__delete_folder(
+   delete_folder__folder_id --        --
+       integer
+
+) RETURNS integer AS $$
+-- 0 for success
+DECLARE
+BEGIN
+
         return file_storage__delete_folder(
                     delete_folder__folder_id,  -- folder_id
-                    ''f''
+                    'f'
                     );
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
-create or replace function file_storage__delete_folder(
-       --
-       -- Delete a folder
-       --
-       integer,          -- cr_folders.folder_id%TYPE
-       boolean
-) returns integer as '  -- 0 for success
-declare
-        delete_folder__folder_id        alias for $1; 
-        delete_folder__cascade_p        alias for $2;
-begin
 
+
+-- added
+select define_function_args('file_storage__delete_folder','folder_id,cascade_p');
+
+--
+-- procedure file_storage__delete_folder/2
+--
+CREATE OR REPLACE FUNCTION file_storage__delete_folder(
+   delete_folder__folder_id --        --
+       integer,
+   delete_folder__cascade_p boolean
+
+) RETURNS integer AS $$
+-- 0 for success
+DECLARE
+BEGIN
+
         return content_folder__delete(
                     delete_folder__folder_id,  -- folder_id
                     delete_folder__cascade_p
                     );
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;