- Fixed drop scripts for the case that part of the file-storage

  have already dropped

sql/postgresql/file-storage-drop.sql

@@ -26,7 +26,11 @@ CREATE OR REPLACE FUNCTION inline_0(
 DECLARE
 	rec_root_folder		record;
         template_id             integer;
+	v_count			integer;
 BEGIN
+    -- Skip if already dropped
+    select count(*) into v_count from user_tab_columns where lower(table_name) = 'fs_root_folders';
+    if v_count = 0 then return 0; end if;
 
     for rec_root_folder in 
         select package_id
@@ -46,16 +50,15 @@ BEGIN
 
 END;
 $$ LANGUAGE plpgsql;
-
 select inline_0();
 drop function inline_0();
 
 \i file-storage-views-drop.sql;
-drop trigger fs_package_items_delete_trig on fs_root_folders;
-drop function fs_package_items_delete_trig();
+drop trigger if exists fs_package_items_delete_trig on fs_root_folders;
+drop function if exists fs_package_items_delete_trig();
 
-drop trigger fs_root_folder_delete_trig on fs_root_folders;
-drop function fs_root_folder_delete_trig();
+drop trigger if exists fs_root_folder_delete_trig on fs_root_folders;
+drop function if exists fs_root_folder_delete_trig();
 
 
 select content_type__drop_type (
@@ -69,8 +72,8 @@ select content_type__drop_type (
 
 \i file-storage-notifications-drop.sql
 
-drop table fs_root_folders cascade;
+drop table if exists fs_root_folders cascade;
 
-drop table fs_rss_subscrs;
+drop table if exists fs_rss_subscrs;
 
 select drop_package('file_storage');

sql/postgresql/file-storage-views-drop.sql

@@ -6,7 +6,7 @@
 -- @version $Id$
 --
 
-drop view fs_objects;
-drop view fs_files;
-drop view fs_folders;
-drop view fs_urls_full;
+drop view if exists fs_objects;
+drop view if exists fs_files;
+drop view if exists fs_folders;
+drop view if exists fs_urls_full;

tcl/file-storage-install-procs.tcl

@@ -52,7 +52,9 @@ ad_proc -private fs::install::before_uninstantiate {
     {-package_id:required}
 } {
 } {
-    fs::delete_folder -folder_id [fs::get_root_folder -package_id $package_id] -no_notifications
+    catch {
+        fs::delete_folder -folder_id [fs::get_root_folder -package_id $package_id] -no_notifications
+    } err_msg
 }
 
 ad_proc -private fs::install::register_implementation {