From bb937a037b73dc54b7dd9ca0de94d7db4292faf7 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Fri, 4 Nov 2016 10:25:47 +0100 Subject: [PATCH] reset_column_information is missing in DB migration #592 --- db/migrate/06_dmsf_1_2_0.rb | 2 +- db/migrate/07_dmsf_1_4_4.rb | 5 ++--- db/migrate/20140519133201_trash_bin.rb | 2 +- db/migrate/20141013102501_remove_project_from_revision.rb | 2 +- db/migrate/20141015132701_remove_folder_from_revision.rb | 2 +- db/migrate/20160215125801_approval_workflow_status.rb | 1 + db/migrate/20160222140401_approval_workflow_std_fields.rb | 1 + 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/db/migrate/06_dmsf_1_2_0.rb b/db/migrate/06_dmsf_1_2_0.rb index f2099274..9f6d9279 100644 --- a/db/migrate/06_dmsf_1_2_0.rb +++ b/db/migrate/06_dmsf_1_2_0.rb @@ -29,7 +29,7 @@ class Dmsf120 < ActiveRecord::Migration def self.up add_column :dmsf_file_revisions, :project_id, :integer, :null => true - + DmsfFileRevision.reset_column_information DmsfFileRevision.find_each do |revision| if revision.dmsf_file revision.project_id = revision.dmsf_file.project.id diff --git a/db/migrate/07_dmsf_1_4_4.rb b/db/migrate/07_dmsf_1_4_4.rb index 394c3a7f..5e6948d7 100644 --- a/db/migrate/07_dmsf_1_4_4.rb +++ b/db/migrate/07_dmsf_1_4_4.rb @@ -28,7 +28,6 @@ class Dmsf144 < ActiveRecord::Migration end def self.up - #Add our entity_type column (used with our entity type) add_column :dmsf_file_locks, :entity_type, :integer, :null => true @@ -46,6 +45,7 @@ class Dmsf144 < ActiveRecord::Migration # ordering, so adapted that, we grab id's load a mock object, and reload # data into it, which should enable us to run checks we need, not as # efficient, however compatible across the board. + DmsfFileLock.reset_column_information DmsfFileLock.select("MAX(#{DmsfFileLock.table_name}.id) id"). order("MAX(#{DmsfFileLock.table_name}.id) DESC"). group("#{DmsfFileLock.table_name}.dmsf_file_id"). @@ -117,12 +117,11 @@ class Dmsf144 < ActiveRecord::Migration end def self.down - rename_table :dmsf_locks, :dmsf_file_locks - add_column :dmsf_file_locks, :locked, :boolean, :default => false, :null => false #Data cleanup - delete all expired locks, or any folder locks + DmsfFileLock.reset_column_information say 'Removing all expired and/or folder locks' DmsfFileLock.delete_all ['expires_at < ? OR entity_type = 1', Time.now] diff --git a/db/migrate/20140519133201_trash_bin.rb b/db/migrate/20140519133201_trash_bin.rb index 32ba217f..00114867 100644 --- a/db/migrate/20140519133201_trash_bin.rb +++ b/db/migrate/20140519133201_trash_bin.rb @@ -23,7 +23,7 @@ class TrashBin < ActiveRecord::Migration # DMSF - project's root folder notification add_column :dmsf_folders, :deleted, :boolean, :default => false, :null => false add_column :dmsf_folders, :deleted_by_user_id, :integer - + DmsfFolder.reset_column_information DmsfFolder.update_all(:deleted => false) end diff --git a/db/migrate/20141013102501_remove_project_from_revision.rb b/db/migrate/20141013102501_remove_project_from_revision.rb index 2277a3e0..1210ffa9 100644 --- a/db/migrate/20141013102501_remove_project_from_revision.rb +++ b/db/migrate/20141013102501_remove_project_from_revision.rb @@ -25,7 +25,7 @@ class RemoveProjectFromRevision < ActiveRecord::Migration def down add_column :dmsf_file_revisions, :project_id, :integer, :null => true - + DmsfFileRevision.reset_column_information DmsfFileRevision.find_each do |revision| if revision.dmsf_file revision.project_id = revision.dmsf_file.project_id diff --git a/db/migrate/20141015132701_remove_folder_from_revision.rb b/db/migrate/20141015132701_remove_folder_from_revision.rb index 403116e4..ed512750 100644 --- a/db/migrate/20141015132701_remove_folder_from_revision.rb +++ b/db/migrate/20141015132701_remove_folder_from_revision.rb @@ -25,7 +25,7 @@ class RemoveFolderFromRevision < ActiveRecord::Migration def down add_column :dmsf_file_revisions, :dmsf_folder_id, :integer, :null => true - + DmsfFileRevision.reset_column_information DmsfFileRevision.find_each do |revision| if revision.dmsf_file revision.dmsf_folder_id = revision.dmsf_file.dmsf_folder_id diff --git a/db/migrate/20160215125801_approval_workflow_status.rb b/db/migrate/20160215125801_approval_workflow_status.rb index 1e447a0c..bdc4537d 100644 --- a/db/migrate/20160215125801_approval_workflow_status.rb +++ b/db/migrate/20160215125801_approval_workflow_status.rb @@ -21,6 +21,7 @@ class ApprovalWorkflowStatus < ActiveRecord::Migration def self.up add_column :dmsf_workflows, :status, :integer, :null => false, :default => DmsfWorkflow::STATUS_ACTIVE + DmsfWorkflow.reset_column_information DmsfWorkflow.all.each {|wf| wf.update_attribute(:status, DmsfWorkflow::STATUS_ACTIVE)} end diff --git a/db/migrate/20160222140401_approval_workflow_std_fields.rb b/db/migrate/20160222140401_approval_workflow_std_fields.rb index d96578ac..4a11f989 100644 --- a/db/migrate/20160222140401_approval_workflow_std_fields.rb +++ b/db/migrate/20160222140401_approval_workflow_std_fields.rb @@ -23,6 +23,7 @@ class ApprovalWorkflowStdFields < ActiveRecord::Migration add_column :dmsf_workflows, :updated_on, :timestamp add_column :dmsf_workflows, :created_on, :datetime add_column :dmsf_workflows, :author_id, :integer + DmsfWorkflow.reset_column_information # Set updated_on DmsfWorkflow.all.each(&:touch) # Set created_on and author_id