aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
diff options
context:
space:
mode:
authorvijay <vijaydev.cse@gmail.com>2010-12-10 23:03:31 +0530
committervijay <vijaydev.cse@gmail.com>2010-12-10 23:03:31 +0530
commit6acd1304b15de65e1ab38437357ce63b80f4e7c0 (patch)
treec3dc8d8701a07f3156f8d02d6f2606b23aea159a /activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
parent638b409eb4c75b9187c6cedc9f71e2e38ec84731 (diff)
parentdbf955c03b8d185b7977d90281389cf52d546c5d (diff)
downloadrails-6acd1304b15de65e1ab38437357ce63b80f4e7c0.tar.gz
rails-6acd1304b15de65e1ab38437357ce63b80f4e7c0.tar.bz2
rails-6acd1304b15de65e1ab38437357ce63b80f4e7c0.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb')
-rw-r--r--activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
index 97003c1457..67567f06df 100644
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
+++ b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
@@ -13,7 +13,7 @@ module ActiveRecord
end
def table
- Arel::Table.new(table_name, :engine => arel_engine, :columns => active_record.columns)
+ Arel::Table.new(table_name, arel_engine)
end
def aliased_table_name