aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorGraeme Porteous <graeme@rgbp.co.uk>2009-07-11 20:04:18 +0200
committerEloy Duran <eloy.de.enige@gmail.com>2009-09-12 16:03:32 +0200
commitc01be9de322ba846923340e41e69821d01541610 (patch)
treee73d2aea62c53df7d1373f011ecfcd9abb70ae43 /activerecord/test/schema
parent3091252abaafd15bc085f0be2b17829bebb6522c (diff)
downloadrails-c01be9de322ba846923340e41e69821d01541610.tar.gz
rails-c01be9de322ba846923340e41e69821d01541610.tar.bz2
rails-c01be9de322ba846923340e41e69821d01541610.zip
Fix has_one with foreign_key and primary_key association bug which caused the associated object being lost when saving the owner. [#1756 state:resolved]
Mixed in a bit from patch by ransom-briggs. [#2813 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 9ab4cf6f43..15e5e12d03 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -22,6 +22,7 @@ ActiveRecord::Schema.define do
# unless the ordering matters. In which case, define them below
create_table :accounts, :force => true do |t|
t.integer :firm_id
+ t.string :firm_name
t.integer :credit_limit
end