diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-05-21 17:32:37 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-05-21 17:32:37 +0000 |
commit | 59c8c63ecd751136c5ed6d2e3c04a54af2025eb0 (patch) | |
tree | 050f58c08dff7884b70bb6a7d19fec925e98b632 /activerecord/test/fixtures | |
parent | fa207c24468b3b7c32b3c6d7128ec13a7b7d4a16 (diff) | |
download | rails-59c8c63ecd751136c5ed6d2e3c04a54af2025eb0.tar.gz rails-59c8c63ecd751136c5ed6d2e3c04a54af2025eb0.tar.bz2 rails-59c8c63ecd751136c5ed6d2e3c04a54af2025eb0.zip |
Added :allow_nil option for aggregations (closes #5091) [ian.w.white@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r-- | activerecord/test/fixtures/customer.rb | 4 | ||||
-rw-r--r-- | activerecord/test/fixtures/customers.yml | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/customer.rb b/activerecord/test/fixtures/customer.rb index e23fd03ade..ccbe035931 100644 --- a/activerecord/test/fixtures/customer.rb +++ b/activerecord/test/fixtures/customer.rb @@ -1,7 +1,7 @@ class Customer < ActiveRecord::Base - composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] + composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true composed_of :balance, :class_name => "Money", :mapping => %w(balance amount) - composed_of :gps_location + composed_of :gps_location, :allow_nil => true end class Address diff --git a/activerecord/test/fixtures/customers.yml b/activerecord/test/fixtures/customers.yml index 9169d7d413..f802aac5ea 100644 --- a/activerecord/test/fixtures/customers.yml +++ b/activerecord/test/fixtures/customers.yml @@ -6,3 +6,12 @@ david: address_city: Scary Town address_country: Loony Land gps_location: 35.544623640962634x-105.9309951055148 + +zaphod: + id: 2 + name: Zaphod + balance: 62 + address_street: Avenue Road + address_city: Hamlet Town + address_country: Nation Land + gps_location: NULL
\ No newline at end of file |