diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
| commit | 7324e46a3fe7be282deeda14783f4170ccf03a3c (patch) | |
| tree | 79968712783f47c816d81e97604f77ff7d920b40 /activerecord/lib/active_record/associations.rb | |
| parent | 1fee2fb996229236fb236bcef423930fdf1dfe2d (diff) | |
| parent | 6e039e863a5d71f2a516be2eef2605be23281290 (diff) | |
| download | rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.gz rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.bz2 rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base/mime_responds.rb
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 41c0394763..eb80f5e8d2 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1668,7 +1668,7 @@ module ActiveRecord def tables_in_string(string) return [] if string.blank? - string.scan(/([\.a-zA-Z_]+).?\./).flatten + string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten end def tables_in_hash(hash) |