diff options
| author | José Valim <jose.valim@gmail.com> | 2011-04-19 17:56:46 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-04-19 17:58:06 +0200 |
| commit | 30472d4244f08ad861590fb41dd75efb5f274422 (patch) | |
| tree | f71eece83c1650069424dab6112a555a89e943ef /activerecord | |
| parent | d24d938af453d4a8bd0401c8456191530ecee433 (diff) | |
| download | rails-30472d4244f08ad861590fb41dd75efb5f274422.tar.gz rails-30472d4244f08ad861590fb41dd75efb5f274422.tar.bz2 rails-30472d4244f08ad861590fb41dd75efb5f274422.zip | |
Avoid define_method if possible.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/write.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index a248eb3a7b..aef99e3129 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -79,7 +79,7 @@ module ActiveRecord # # The second, slower, branch is necessary to support instances where the database # returns columns with extra stuff in (like 'my_column(omg)'). - if method_name =~ /^[a-zA-Z_]\w*[!?=]?$/ + if method_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ def _#{method_name} #{access_code} diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb index 7661676f8c..c77a3ac145 100644 --- a/activerecord/lib/active_record/attribute_methods/write.rb +++ b/activerecord/lib/active_record/attribute_methods/write.rb @@ -10,7 +10,7 @@ module ActiveRecord module ClassMethods protected def define_method_attribute=(attr_name) - if attr_name =~ /^[a-zA-Z_]\w*[!?=]?$/ + if attr_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP generated_attribute_methods.module_eval("def #{attr_name}=(new_value); write_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__) else generated_attribute_methods.send(:define_method, "#{attr_name}=") do |new_value| |