aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/car.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-05-12 23:29:07 +0100
committerJon Leighton <j@jonathanleighton.com>2011-05-12 23:29:22 +0100
commit6e466f17c3d0d06cc364c27fd844a66fb4a89aa2 (patch)
treeb78aab20fc12ab65ae10f4daa56c7fd1b34411bb /activerecord/test/models/car.rb
parentb210d9e722aace63909fb1ebe1b1434ded650ead (diff)
downloadrails-6e466f17c3d0d06cc364c27fd844a66fb4a89aa2.tar.gz
rails-6e466f17c3d0d06cc364c27fd844a66fb4a89aa2.tar.bz2
rails-6e466f17c3d0d06cc364c27fd844a66fb4a89aa2.zip
Don't use mass-assignment protection when setting foreign keys or association conditions on singular associations. Fixes #481 (again).
Diffstat (limited to 'activerecord/test/models/car.rb')
-rw-r--r--activerecord/test/models/car.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index de1864345a..76f20b1061 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -4,6 +4,9 @@ class Car < ActiveRecord::Base
has_many :foo_bulbs, :class_name => "Bulb", :conditions => { :name => 'foo' }
has_many :frickinawesome_bulbs, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+ has_one :bulb
+ has_one :frickinawesome_bulb, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+
has_many :tyres
has_many :engines
has_many :wheels, :as => :wheelable