diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-31 06:54:06 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-31 06:54:06 +0000 |
| commit | dd664c33b73adef336c78a5db4b67ad6cbbefb9f (patch) | |
| tree | f5bf84860c75c7699bc200271e46ca92f964506b /activerecord/lib/active_record | |
| parent | 63ad8b4d190bff91df520d529e75ad2b7bd25d53 (diff) | |
| download | rails-dd664c33b73adef336c78a5db4b67ad6cbbefb9f.tar.gz rails-dd664c33b73adef336c78a5db4b67ad6cbbefb9f.tar.bz2 rails-dd664c33b73adef336c78a5db4b67ad6cbbefb9f.zip | |
r4880@ks: jeremy | 2006-07-30 23:52:59 -0700
Only set method_name = md.pre_match if the pre_match is an attribute. Plays nicely with other ? suffixed attribute methods.
r4881@ks: jeremy | 2006-07-30 23:53:37 -0700
Heavier testing for attribute method suffixes.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 820e6a80ce..e90c65ee07 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1763,7 +1763,8 @@ module ActiveRecord #:nodoc: method_name = method_id.to_s if @attributes.include?(method_name) or (md = /\?$/.match(method_name) and - @attributes.include?(method_name = md.pre_match)) + @attributes.include?(query_method_name = md.pre_match) and + method_name = query_method_name) define_read_methods if self.class.read_methods.empty? && self.class.generate_read_methods md ? query_attribute(method_name) : read_attribute(method_name) elsif self.class.primary_key.to_s == method_name |