From 7add2b8905ce0032af858c1e3cdc8f1b87b7998b Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 20 May 2016 03:49:30 +0200 Subject: [PATCH] Improved migrations. --- app/models/object_manager/attribute.rb | 2 ++ db/migrate/20120101000001_create_base.rb | 4 ++-- db/migrate/20160506000003_role_group_remove.rb | 9 +++------ db/migrate/20160512000001_update_object_manager.rb | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/models/object_manager/attribute.rb b/app/models/object_manager/attribute.rb index 6cd18a4ef..48b96dace 100644 --- a/app/models/object_manager/attribute.rb +++ b/app/models/object_manager/attribute.rb @@ -165,6 +165,8 @@ use "force: true" to delete also not editable fields data[:object_lookup_id] = ObjectLookup.by_name(data[:object]) end + data[:name].downcase! + # check newest entry - is needed record = ObjectManager::Attribute.find_by( object_lookup_id: data[:object_lookup_id], diff --git a/db/migrate/20120101000001_create_base.rb b/db/migrate/20120101000001_create_base.rb index dde5f8445..a4fa3ccdd 100644 --- a/db/migrate/20120101000001_create_base.rb +++ b/db/migrate/20120101000001_create_base.rb @@ -447,8 +447,8 @@ class CreateBase < ActiveRecord::Migration t.column :editable, :boolean, null: false, default: true t.column :active, :boolean, null: false, default: true t.column :screens, :string, limit: 2000, null: true - t.column :to_create, :boolean, null: false, default: true - t.column :to_migrate, :boolean, null: false, default: true + t.column :to_create, :boolean, null: false, default: false + t.column :to_migrate, :boolean, null: false, default: false t.column :to_delete, :boolean, null: false, default: false t.column :position, :integer, null: false t.column :created_by_id, :integer, null: false diff --git a/db/migrate/20160506000003_role_group_remove.rb b/db/migrate/20160506000003_role_group_remove.rb index 2a69acea6..c767f7095 100644 --- a/db/migrate/20160506000003_role_group_remove.rb +++ b/db/migrate/20160506000003_role_group_remove.rb @@ -14,9 +14,9 @@ class RoleGroupRemove < ActiveRecord::Migration name: 'group_ids', ) record.destroy if record - ObjectManager::Attribute.add( - force: true, - object: 'User', + + ObjectManager::Attribute.create( + object_lookup_id: ObjectLookup.by_name('User'), name: 'role_ids', display: 'Permissions', data_type: 'user_permission', @@ -49,9 +49,6 @@ class RoleGroupRemove < ActiveRecord::Migration }, }, }, - to_create: false, - to_migrate: false, - to_delete: false, position: 1600, updated_by_id: 1, created_by_id: 1, diff --git a/db/migrate/20160512000001_update_object_manager.rb b/db/migrate/20160512000001_update_object_manager.rb index 476d9d660..7ee50c9aa 100644 --- a/db/migrate/20160512000001_update_object_manager.rb +++ b/db/migrate/20160512000001_update_object_manager.rb @@ -3,10 +3,10 @@ class UpdateObjectManager < ActiveRecord::Migration # return if it's a new setup return if !Setting.find_by(name: 'system_init_done') - add_column :object_manager_attributes, :to_create, :boolean, null: false, default: true - add_column :object_manager_attributes, :to_migrate, :boolean, null: false, default: true + add_column :object_manager_attributes, :to_create, :boolean, null: false, default: false + add_column :object_manager_attributes, :to_migrate, :boolean, null: false, default: false add_column :object_manager_attributes, :to_delete, :boolean, null: false, default: false - + ObjectManager::Attribute.reset_column_information ObjectManager::Attribute.add( force: true, object: 'Group',