From 2e748feb801e87afbc7fad45161234ddb60fcecd Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 18 Feb 2011 10:47:19 -0800 Subject: just use the list of column names to generate attribute methods --- activerecord/lib/active_record/attribute_methods.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 4f4a0a5fee..2c5db51f7f 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -10,7 +10,7 @@ module ActiveRecord # Generates all the attribute related methods for columns in the database # accessors, mutators and query methods. def define_attribute_methods - super(columns_hash.keys) + super(column_names) end # Checks whether the method is defined in the model or any of its subclasses -- cgit v1.2.3 From 6975a41adfa04109e089416a09005425f9562afd Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 18 Feb 2011 18:50:17 +0000 Subject: Remove test which was broken on 1.8. This test is now irrelevant since singular associations no longer return a proxy object. --- activerecord/test/cases/associations_test.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'activerecord') diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb index a1996fcf27..47b8e48582 100644 --- a/activerecord/test/cases/associations_test.rb +++ b/activerecord/test/cases/associations_test.rb @@ -203,14 +203,6 @@ class AssociationProxyTest < ActiveRecord::TestCase assert_equal david.projects, david.projects.reload.reload end end - - if RUBY_VERSION < '1.9' - def test_splat_does_not_invoke_to_a_on_singular_targets - author = posts(:welcome).author - author.reload.target.expects(:to_a).never - [*author] - end - end end class OverridingAssociationsTest < ActiveRecord::TestCase -- cgit v1.2.3