diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-18 16:22:50 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-18 16:22:50 -0300 |
| commit | 00418ac96bf5a25d3a7cf760499ec19ad3700007 (patch) | |
| tree | ce9c29df7f37b5b6afa95439db2e7740082b164a /activerecord/lib/active_record | |
| parent | 3927827dbeae477cb29035107fc3ae49bf5fd1cb (diff) | |
| parent | 6975a41adfa04109e089416a09005425f9562afd (diff) | |
| download | rails-00418ac96bf5a25d3a7cf760499ec19ad3700007.tar.gz rails-00418ac96bf5a25d3a7cf760499ec19ad3700007.tar.bz2 rails-00418ac96bf5a25d3a7cf760499ec19ad3700007.zip | |
Merge remote branch 'rails/master' into identity_map
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |