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

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

Fixed: invalid SQL query on User#destroy (#1781).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1755 e93f8b46-1217-0410-a6f0-8f06a7374b81
6fc62d39 · Jean-Philippe Lang · 5ef0af67 · 6fc62d39 · 6fc62d39
Commit 6fc62d39 authored Aug 25, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

user.rb app/models/user.rb +2 -1

user_test.rb test/unit/user_test.rb +6 -0

No files found.
--- 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'

--- 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