diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-03-06 04:47:58 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-03-06 04:47:58 +0000 |
| commit | c58dff1c9cbdd45df8685e230d1dc91cf1deb6cf (patch) | |
| tree | fc7b0c2a5139b9720ef5f46fe39785128c3a54e5 /activerecord/lib | |
| parent | 5a7722de98bcf4ad932cf2ec15faa47d1d431457 (diff) | |
| download | rails-c58dff1c9cbdd45df8685e230d1dc91cf1deb6cf.tar.gz rails-c58dff1c9cbdd45df8685e230d1dc91cf1deb6cf.tar.bz2 rails-c58dff1c9cbdd45df8685e230d1dc91cf1deb6cf.zip | |
slight change to eager associations table aliasing: use class_reflection, like 'post_comments' or 'tree_children'
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3788 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -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 d31d43c800..9e71c627c5 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1197,7 +1197,7 @@ module ActiveRecord unless join_dependency.table_aliases[aliased_table_name].zero? # if the table name has been used, then use an alias # if the alias has been used, add a '_n' suffix to the end. - @aliased_table_name = "#{parent.table_name}_#{reflection.name}_#{join_dependency.table_aliases[aliased_table_name]}".gsub(/_1$/, '') + @aliased_table_name = "#{parent.active_record.to_s.underscore}_#{reflection.name}_#{join_dependency.table_aliases[aliased_table_name]}".gsub(/_1$/, '') end join_dependency.table_aliases[aliased_table_name] += 1 end |