diff options
author | Frederick Cheung <frederick.cheung@gmail.com> | 2008-12-18 10:41:45 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-18 19:19:36 +0000 |
commit | 9c7fe7c6729bbdde4a22f58e7279463092390330 (patch) | |
tree | bf5681f248d2bc78ec72275a71740f602dba89b8 /activerecord/lib | |
parent | c9ab7098be7bdd748c0f4a49c8ef015b4aad3108 (diff) | |
download | rails-9c7fe7c6729bbdde4a22f58e7279463092390330.tar.gz rails-9c7fe7c6729bbdde4a22f58e7279463092390330.tar.bz2 rails-9c7fe7c6729bbdde4a22f58e7279463092390330.zip |
Don't include table_name twice
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 bc2a88ef7e..3165015f3e 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1771,7 +1771,7 @@ module ActiveRecord tables_in_string(merged_joins.join(' ')) else join_dependency = ActiveRecord::Associations::ClassMethods::InnerJoinDependency.new(self, merged_joins, nil) - [table_name] + join_dependency.join_associations.collect {|join_association| [join_association.aliased_join_table_name, join_association.aliased_table_name]}.flatten.compact + join_dependency.join_associations.collect {|join_association| [join_association.aliased_join_table_name, join_association.aliased_table_name]}.flatten.compact end else tables_in_string(merged_joins) |