diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-15 16:31:00 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-15 16:31:00 +0200 |
| commit | 21ff8849bb7d4f1c277d767c7704eb63d8920cc7 (patch) | |
| tree | 5e6b8d278ef14d0ab0089238bbce61bad5423b32 /activerecord/lib/active_record | |
| parent | c42ea2172eb977538cda076942d69eb90e090a26 (diff) | |
| download | rails-21ff8849bb7d4f1c277d767c7704eb63d8920cc7.tar.gz rails-21ff8849bb7d4f1c277d767c7704eb63d8920cc7.tar.bz2 rails-21ff8849bb7d4f1c277d767c7704eb63d8920cc7.zip | |
in regexps, the dot in a character class is not a metacharacter
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index dce9e99d27..a7503ccdc9 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -465,8 +465,8 @@ module ActiveRecord # (2) $12.345.678,12 case data when /^-?\D+[\d,]+\.\d{2}$/ # (1) - data.gsub!(/[^-\d\.]/, '') - when /^-?\D+[\d\.]+,\d{2}$/ # (2) + data.gsub!(/[^-\d.]/, '') + when /^-?\D+[\d.]+,\d{2}$/ # (2) data.gsub!(/[^-\d,]/, '').sub!(/,/, '.') end end diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 04ba5b291e..f129b54f9a 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -379,7 +379,7 @@ module ActiveRecord return [] if string.blank? # always convert table names to downcase as in Oracle quoted table names are in uppercase # ignore raw_sql_ that is used by Oracle adapter as alias for limit/offset subqueries - string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map{ |s| s.downcase }.uniq - ['raw_sql_'] + string.scan(/([a-zA-Z_][.\w]+).?\./).flatten.map{ |s| s.downcase }.uniq - ['raw_sql_'] end end |