Fixed: invalid SQL query on User#destroy (#1781).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1755 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/user.rb b/app/models/user.rb
index cabce30051dc21c4f24ec4506989cb28d3d101e7..05a75e1adcef5e287c56725cc84bebb9da584ac5 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -33,7 +33,8 @@ class User < ActiveRecord::Base
     :username => '#{login}'
   }
 
-  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
+  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
+  has_many :members, :dependent => :delete_all
   has_many :projects, :through => :memberships
   has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 3209f261ad311f6ea398712dd702deb26fb82794..80011f4bf2c81c2842ba3a753311ef298aadf06d 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -57,6 +57,12 @@ class UserTest < Test::Unit::TestCase
     assert_equal "john", @admin.login
   end
   
+  def test_destroy
+    User.find(2).destroy
+    assert_nil User.find_by_id(2)
+    assert Member.find_all_by_user_id(2).empty?
+  end
+  
   def test_validate
     @admin.login = ""
     assert !@admin.save