From 37f421a4e51d825921a7fe5c900d3a5bc38bcdb6 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 17 Dec 2014 21:39:28 +0100 Subject: [PATCH] Merged several migrations. --- db/migrate/20120101000030_create_storage.rb | 14 +++++-- db/migrate/20130305065226_scheduler_create.rb | 35 +++++++++++------ db/migrate/20130502000001_scheduler_update.rb | 39 ------------------- db/migrate/20130806000001_update_geo.rb | 29 -------------- db/migrate/20130815000001_update_geo2.rb | 1 - .../20130826000001_update_scheduler2.rb | 15 ------- .../20131208000001_update_scheduler3.rb | 15 ------- db/migrate/20140427000001_update_storage.rb | 9 ----- db/migrate/20140502000001_update_storage2.rb | 28 ------------- db/migrate/20140503000001_update_storage3.rb | 28 ------------- 10 files changed, 35 insertions(+), 178 deletions(-) delete mode 100644 db/migrate/20130502000001_scheduler_update.rb delete mode 100644 db/migrate/20130806000001_update_geo.rb delete mode 100644 db/migrate/20130826000001_update_scheduler2.rb delete mode 100644 db/migrate/20131208000001_update_scheduler3.rb delete mode 100644 db/migrate/20140427000001_update_storage.rb delete mode 100644 db/migrate/20140502000001_update_storage2.rb delete mode 100644 db/migrate/20140503000001_update_storage3.rb diff --git a/db/migrate/20120101000030_create_storage.rb b/db/migrate/20120101000030_create_storage.rb index e12166a74..8b0266090 100644 --- a/db/migrate/20120101000030_create_storage.rb +++ b/db/migrate/20120101000030_create_storage.rb @@ -20,11 +20,19 @@ class CreateStorage < ActiveRecord::Migration add_index :store_objects, [:name], :unique => true create_table :store_files do |t| - t.column :data, :binary, :limit => 200.megabytes, :null => true - t.column :md5, :string, :limit => 60, :null => false + t.column :sha, :string, :limit => 128, :null => false + t.column :provider, :string, :limit => 20, :null => true t.timestamps end - add_index :store_files, [:md5], :unique => true + add_index :store_files, [:sha], :unique => true + add_index :store_files, [:provider] + + create_table :store_provider_dbs do |t| + t.column :sha, :string, :limit => 128, :null => false + t.column :data, :binary, :limit => 200.megabytes, :null => true + t.timestamps + end + add_index :store_provider_dbs, [:sha], :unique => true end diff --git a/db/migrate/20130305065226_scheduler_create.rb b/db/migrate/20130305065226_scheduler_create.rb index 2e4d035dc..61d600236 100644 --- a/db/migrate/20130305065226_scheduler_create.rb +++ b/db/migrate/20130305065226_scheduler_create.rb @@ -8,6 +8,7 @@ class SchedulerCreate < ActiveRecord::Migration t.column :period, :integer, :null => true t.column :running, :integer, :null => false, :default => false t.column :last_run, :timestamp, :null => true + t.column :prio, :integer, :null => false t.column :pid, :string, :limit => 250, :null => true t.column :note, :string, :limit => 250, :null => true t.column :active, :boolean, :null => false, :default => false @@ -16,26 +17,38 @@ class SchedulerCreate < ActiveRecord::Migration t.timestamps end add_index :schedulers, [:name], :unique => true - Scheduler.create( + Scheduler.create_or_update( + :name => 'Import OTRS diff load', + :method => 'Import::OTRS2.diff_worker', + :period => 60 * 3, + :prio => 1, + :active => true, + :updated_by_id => 1, + :created_by_id => 1, + ) + Scheduler.create_or_update( :name => 'Check Channels', :method => 'Channel.fetch', :period => 30, + :prio => 1, :active => true, :updated_by_id => 1, :created_by_id => 1, ) - Scheduler.create( - :name => 'Import OTRS diff load', - :method => 'Import::OTRS.diff_loop', - :period => 60 * 10, - :active => true, - :updated_by_id => 1, - :created_by_id => 1, - ) - Scheduler.create( + Scheduler.create_or_update( :name => 'Generate Session data', - :method => 'Session.jobs', + :method => 'Sessions.jobs', :period => 60, + :prio => 1, + :active => true, + :updated_by_id => 1, + :created_by_id => 1, + ) + Scheduler.create_or_update( + :name => 'Cleanup expired sessions', + :method => 'SessionHelper.cleanup_expired', + :period => 60 * 60 * 24, + :prio => 2, :active => true, :updated_by_id => 1, :created_by_id => 1, diff --git a/db/migrate/20130502000001_scheduler_update.rb b/db/migrate/20130502000001_scheduler_update.rb deleted file mode 100644 index 4e91cc13a..000000000 --- a/db/migrate/20130502000001_scheduler_update.rb +++ /dev/null @@ -1,39 +0,0 @@ -require 'scheduler' -require 'setting' -class SchedulerUpdate < ActiveRecord::Migration - def up - add_column :schedulers, :prio, :integer, :null => true - Scheduler.reset_column_information - Scheduler.create_or_update( - :name => 'Import OTRS diff load', - :method => 'Import::OTRS2.diff_worker', - :period => 60 * 3, - :prio => 1, - :active => true, - :updated_by_id => 1, - :created_by_id => 1, - ) - Scheduler.create_or_update( - :name => 'Check Channels', - :method => 'Channel.fetch', - :period => 30, - :prio => 1, - :active => true, - :updated_by_id => 1, - :created_by_id => 1, - ) - Scheduler.create_or_update( - :name => 'Generate Session data', - :method => 'Sessions.jobs', - :period => 60, - :prio => 1, - :active => true, - :updated_by_id => 1, - :created_by_id => 1, - ) - end - - def down - remove_column :schedulers, :prio - end -end diff --git a/db/migrate/20130806000001_update_geo.rb b/db/migrate/20130806000001_update_geo.rb deleted file mode 100644 index dd3bad9ca..000000000 --- a/db/migrate/20130806000001_update_geo.rb +++ /dev/null @@ -1,29 +0,0 @@ -class UpdateGeo < ActiveRecord::Migration - def up - Setting.create_if_not_exists( - :title => 'Geo Location Backend', - :name => 'geo_backend', - :area => 'System::Geo', - :description => 'Defines the backend for geo location lookups.', - :options => { - :form => [ - { - :display => '', - :null => true, - :name => 'geo_backend', - :tag => 'select', - :options => { - '' => '-', - 'Gmaps' => 'Google Maps', - }, - }, - ], - }, - :state => 'Gmaps', - :frontend => true - ) - end - def down - end -end - diff --git a/db/migrate/20130815000001_update_geo2.rb b/db/migrate/20130815000001_update_geo2.rb index a3e57394b..e7b4d234a 100644 --- a/db/migrate/20130815000001_update_geo2.rb +++ b/db/migrate/20130815000001_update_geo2.rb @@ -1,6 +1,5 @@ class UpdateGeo2 < ActiveRecord::Migration def up - Setting.where( :name => 'geo_backend' ).destroy_all Setting.create_if_not_exists( :title => 'Geo Location Backend', :name => 'geo_location_backend', diff --git a/db/migrate/20130826000001_update_scheduler2.rb b/db/migrate/20130826000001_update_scheduler2.rb deleted file mode 100644 index 1289d5fb2..000000000 --- a/db/migrate/20130826000001_update_scheduler2.rb +++ /dev/null @@ -1,15 +0,0 @@ -class UpdateScheduler2 < ActiveRecord::Migration - def up - Scheduler.create_or_update( - :name => 'Generate Session data', - :method => 'Sessions.jobs', - :period => 60, - :prio => 1, - :active => true, - :updated_by_id => 1, - :created_by_id => 1, - ) - end - def down - end -end diff --git a/db/migrate/20131208000001_update_scheduler3.rb b/db/migrate/20131208000001_update_scheduler3.rb deleted file mode 100644 index bdf3e8f3c..000000000 --- a/db/migrate/20131208000001_update_scheduler3.rb +++ /dev/null @@ -1,15 +0,0 @@ -class UpdateScheduler3 < ActiveRecord::Migration - def up - Scheduler.create_or_update( - :name => 'Cleanup expired sessions', - :method => 'SessionHelper.cleanup_expired', - :period => 60 * 60 * 24, - :prio => 2, - :active => true, - :updated_by_id => 1, - :created_by_id => 1, - ) - end - def down - end -end diff --git a/db/migrate/20140427000001_update_storage.rb b/db/migrate/20140427000001_update_storage.rb deleted file mode 100644 index ccf58b030..000000000 --- a/db/migrate/20140427000001_update_storage.rb +++ /dev/null @@ -1,9 +0,0 @@ -class UpdateStorage < ActiveRecord::Migration - def up - change_column :store_files, :data, :binary, :limit => 200.megabytes, :null => true - add_column :store_files, :file_system, :boolean, :null => false, :default => false - end - - def down - end -end diff --git a/db/migrate/20140502000001_update_storage2.rb b/db/migrate/20140502000001_update_storage2.rb deleted file mode 100644 index 0f349d875..000000000 --- a/db/migrate/20140502000001_update_storage2.rb +++ /dev/null @@ -1,28 +0,0 @@ -class UpdateStorage2 < ActiveRecord::Migration - def up - create_table :store_provider_dbs do |t| - t.column :data, :binary, :limit => 200.megabytes, :null => true - t.column :md5, :string, :limit => 60, :null => false - t.timestamps - end - add_index :store_provider_dbs, [:md5], :unique => true - - add_column :store_files, :provider, :string, :limit => 20, :null => true - add_index :store_files, [:provider] - - Store::File.all.each {|file| - if file.data - file.update_attribute( :provider, 'DB' ) - Store::Provider::DB.add( file.data, file.md5 ) - else - file.update_attribute( :provider, 'File' ) - Store::Provider::File.add( file.data, file.md5 ) - end - } - - remove_column :store_files, :data - end - - def down - end -end diff --git a/db/migrate/20140503000001_update_storage3.rb b/db/migrate/20140503000001_update_storage3.rb deleted file mode 100644 index 4893a226b..000000000 --- a/db/migrate/20140503000001_update_storage3.rb +++ /dev/null @@ -1,28 +0,0 @@ -class UpdateStorage3 < ActiveRecord::Migration - def up - - add_column :store_files, :sha, :string, :limit => 128, :null => true - add_index :store_files, [:sha], :unique => true - - add_column :store_provider_dbs, :sha, :string, :limit => 128, :null => true - add_index :store_provider_dbs, [:sha], :unique => true - - Store::File.all.each {|file| - next if file.sha - sha = Digest::SHA256.hexdigest( file.content ) - file.update_attribute( :sha, sha ) - } - - Store::Provider::DB.all.each {|file| - next if file.sha - sha = Digest::SHA256.hexdigest( file.data ) - file.update_attribute( :sha, sha ) - } - - remove_column :store_files, :md5 - remove_column :store_provider_dbs, :md5 - end - - def down - end -end