Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) [Lars Pind]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
64003677b7
commit
8eb73f43e1
|
@ -1,6 +1,8 @@
|
||||||
|
*1.14.1* (April 6th, 2005)
|
||||||
|
|
||||||
* Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
|
* Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
|
||||||
|
|
||||||
*1.14.1* (April 6th, 2005)
|
* Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) [Lars Pind]
|
||||||
|
|
||||||
* Enable Limit/Offset in Calculations (closes #4558) [lmarlow@yahoo.com]
|
* Enable Limit/Offset in Calculations (closes #4558) [lmarlow@yahoo.com]
|
||||||
|
|
||||||
|
|
|
@ -1988,7 +1988,7 @@ module ActiveRecord #:nodoc:
|
||||||
def execute_callstack_for_multiparameter_attributes(callstack)
|
def execute_callstack_for_multiparameter_attributes(callstack)
|
||||||
errors = []
|
errors = []
|
||||||
callstack.each do |name, values|
|
callstack.each do |name, values|
|
||||||
klass = (self.class.reflect_on_aggregation(name) || column_for_attribute(name)).klass
|
klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
|
||||||
if values.empty?
|
if values.empty?
|
||||||
send(name + "=", nil)
|
send(name + "=", nil)
|
||||||
else
|
else
|
||||||
|
|
|
@ -2,6 +2,7 @@ require 'abstract_unit'
|
||||||
require 'fixtures/topic'
|
require 'fixtures/topic'
|
||||||
require 'fixtures/reply'
|
require 'fixtures/reply'
|
||||||
require 'fixtures/company'
|
require 'fixtures/company'
|
||||||
|
require 'fixtures/customer'
|
||||||
require 'fixtures/developer'
|
require 'fixtures/developer'
|
||||||
require 'fixtures/project'
|
require 'fixtures/project'
|
||||||
require 'fixtures/default'
|
require 'fixtures/default'
|
||||||
|
@ -721,6 +722,14 @@ class BasicsTest < Test::Unit::TestCase
|
||||||
task.attributes = attributes
|
task.attributes = attributes
|
||||||
assert_equal time, task.starting
|
assert_equal time, task.starting
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_multiparameter_assignment_of_aggregation
|
||||||
|
customer = Customer.new
|
||||||
|
address = Address.new("The Street", "The City", "The Country")
|
||||||
|
attributes = { "address(1)" => address.street, "address(2)" => address.city, "address(3)" => address.country }
|
||||||
|
customer.attributes = attributes
|
||||||
|
assert_equal address, customer.address
|
||||||
|
end
|
||||||
|
|
||||||
def test_attributes_on_dummy_time
|
def test_attributes_on_dummy_time
|
||||||
# Oracle and SQL Server do not have a TIME datatype.
|
# Oracle and SQL Server do not have a TIME datatype.
|
||||||
|
|
|
@ -14,6 +14,10 @@ class Address
|
||||||
def close_to?(other_address)
|
def close_to?(other_address)
|
||||||
city == other_address.city && country == other_address.country
|
city == other_address.city && country == other_address.country
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def ==(other)
|
||||||
|
other.is_a?(self.class) && other.street == street && other.city == city && other.country == country
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class Money
|
class Money
|
||||||
|
|
Loading…
Reference in New Issue