diff --git a/db/migrate/20160217133001_status_deleted.rb b/db/migrate/20160217133001_status_deleted.rb
index 99301acb..c3a8cdde 100644
--- a/db/migrate/20160217133001_status_deleted.rb
+++ b/db/migrate/20160217133001_status_deleted.rb
@@ -20,25 +20,42 @@
 
 class StatusDeleted < ActiveRecord::Migration
 
-  def self.cast_integer(colname)
-    adapter_name = ActiveRecord::Base.connection.adapter_name.downcase
-    case adapter_name
+  def self.up
+    case ActiveRecord::Base.connection.adapter_name.downcase
       when /postgresql/
-        'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END'
+        execute 'ALTER TABLE dmsf_folders ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_folders, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfFolder::STATUS_ACTIVE
+        execute 'ALTER TABLE dmsf_files ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_files, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfFile::STATUS_ACTIVE
+        execute 'ALTER TABLE dmsf_file_revisions ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_file_revisions, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfFileRevision::STATUS_ACTIVE
+        execute 'ALTER TABLE dmsf_links ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_links, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfLink::STATUS_ACTIVE
       else
-        'integer'
+        change_column :dmsf_folders, :deleted, :integer, :default => DmsfFolder::STATUS_ACTIVE
+        change_column :dmsf_files, :deleted, :integer, :default => DmsfFile::STATUS_ACTIVE
+        change_column :dmsf_file_revisions, :integer, :boolean, :default => DmsfFile::STATUS_ACTIVE
+        change_column :dmsf_links, :deleted, :integer, :default => DmsfFile::STATUS_ACTIVE
     end
   end
 
-  def self.up
-    execute 'ALTER TABLE dmsf_folders ALTER deleted DROP DEFAULT;'
-    change_column :dmsf_folders, :deleted, cast_integer(:deleted), :null => false, :default => DmsfFolder::STATUS_ACTIVE
-    execute 'ALTER TABLE dmsf_files ALTER deleted DROP DEFAULT;'
-    change_column :dmsf_files, :deleted, cast_integer(:deleted), :null => false, :default => DmsfFile::STATUS_ACTIVE
-    execute 'ALTER TABLE dmsf_file_revisions ALTER deleted DROP DEFAULT;'
-    change_column :dmsf_file_revisions, :deleted, cast_integer(:deleted), :null => false, :default => DmsfFileRevision::STATUS_ACTIVE
-    execute 'ALTER TABLE dmsf_links ALTER deleted DROP DEFAULT;'
-    change_column :dmsf_links, :deleted, cast_integer(:deleted), :null => false, :default => DmsfLink::STATUS_ACTIVE
+  def self.down
+    case ActiveRecord::Base.connection.adapter_name.downcase
+      when /postgresql/
+        execute 'ALTER TABLE dmsf_folders ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_folders, :deleted, 'BOOLEAN USING CASE WHEN 1 THEN TRUE ELSE FALSE END', :null => false, :default => DmsfFolder::STATUS_ACTIVE
+        execute 'ALTER TABLE dmsf_files ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_files, :deleted, 'BOOLEAN USING CASE WHEN 1 THEN TRUE ELSE FALSE END', :null => false, :default => DmsfFile::STATUS_ACTIVE
+        execute 'ALTER TABLE dmsf_file_revisions ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_file_revisions, :deleted, 'BOOLEAN USING CASE WHEN 1 THEN TRUE ELSE FALSE END', :null => false, :default => DmsfFileRevision::STATUS_ACTIVE
+        execute 'ALTER TABLE dmsf_links ALTER deleted DROP DEFAULT;'
+        change_column :dmsf_links, :deleted, 'BOOLEAN USING CASE WHEN 1 THEN TRUE ELSE FALSE END', :null => false, :default => DmsfLink::STATUS_ACTIVE
+      else
+        change_column :dmsf_folders, :deleted, :boolean, :null => false, :default => false
+        change_column :dmsf_files, :deleted, :boolean, :null => false, :default => false
+        change_column :dmsf_file_revisions, :boolean, :null => false, :default => false
+        change_column :dmsf_links, :deleted, :boolean, :null => false, :default => false
+    end
   end
   
 end
\ No newline at end of file