[PATCH conductor] Fix dc:setup rake task

Imre Farkas ifarkas at redhat.com
Tue Jun 12 11:40:36 UTC 2012


On 06/12/2012 01:33 PM, Jan Provaznik wrote:
> On 06/12/2012 01:30 PM, ifarkas at redhat.com wrote:
>> From: Imre Farkas<ifarkas at redhat.com>
>>
>> The issue was tracked down by Jan: in the migration the
>> reset_column_information call on the 2 models was called too early,
>> that caused the issue.
>> ---
>>   src/db/migrate/20120520151500_change_permission_user.rb |   12
>> ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/src/db/migrate/20120520151500_change_permission_user.rb
>> b/src/db/migrate/20120520151500_change_permission_user.rb
>> index d6af52b..d9432d3 100644
>> --- a/src/db/migrate/20120520151500_change_permission_user.rb
>> +++ b/src/db/migrate/20120520151500_change_permission_user.rb
>> @@ -19,9 +19,6 @@ class ChangePermissionUser<  ActiveRecord::Migration
>>       add_column :permissions, :entity_id, :integer
>>       add_column :derived_permissions, :entity_id, :integer
>>
>> -    Permission.reset_column_information
>> -    DerivedPermission.reset_column_information
>> -
>>       Permission.skip_callback(:save, :after,
>> :update_derived_permissions)
>>       counter = 0
>>       total_perms = Permission.count
>> @@ -44,15 +41,15 @@ class ChangePermissionUser<  ActiveRecord::Migration
>>
>>       remove_column :permissions, :user_id
>>       remove_column :derived_permissions, :user_id
>> +
>> +    Permission.reset_column_information
>> +    DerivedPermission.reset_column_information
>>     end
>>
>>     def self.down
>>       add_column :permissions, :user_id, :integer
>>       add_column :derived_permissions, :user_id, :integer
>>
>> -    Permission.reset_column_information
>> -    DerivedPermission.reset_column_information
>> -
>>       Permission.skip_callback(:save, :after,
>> :update_derived_permissions)
>>       Permission.all.each do |p|
>>         entity = Entity.find(p.entity_id)
>> @@ -75,5 +72,8 @@ class ChangePermissionUser<  ActiveRecord::Migration
>>
>>       remove_column :permissions, :entity_id
>>       remove_column :derived_permissions, :entity_id
>> +
>> +    Permission.reset_column_information
>> +    DerivedPermission.reset_column_information
>>     end
>>   end
>
> ACK, 'rake dc:setup' now passes

Pushed. Thanks for fixing it! Great job!




More information about the aeolus-devel mailing list