Merge pull request #773 from energiekollektiv/fixes/#771-and-#772

Fix #771 and #772
This commit is contained in:
Karel Picman 2017-09-25 08:55:10 +02:00 committed by GitHub
commit 9ac47d497c
2 changed files with 7 additions and 7 deletions

View File

@ -43,13 +43,13 @@ class StatusDeleted < ActiveRecord::Migration
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
change_column :dmsf_folders, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
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
change_column :dmsf_files, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
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
change_column :dmsf_file_revisions, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
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
change_column :dmsf_links, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
else
change_column :dmsf_folders, :deleted, :boolean, :null => false, :default => false
change_column :dmsf_files, :deleted, :boolean, :null => false, :default => false
@ -57,5 +57,5 @@ class StatusDeleted < ActiveRecord::Migration
change_column :dmsf_links, :deleted, :boolean, :null => false, :default => false
end
end
end
end

View File

@ -69,7 +69,7 @@ class DmsfFileContainerRollback < ActiveRecord::Migration
def down
# dmsf_files
file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as unsigned)')
file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as int)')
remove_index :dmsf_files, :project_id
rename_column :dmsf_files, :project_id, :container_id
add_column :dmsf_files, :project_id, :int, :null => true # temporarily added for the save method