diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-01 23:34:15 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-01 23:34:15 +0530 |
| commit | fc94c03c1d509eda7f87ab216e8d1115afbfd1ed (patch) | |
| tree | 3bf2fae3982cd5a2a8db6d7eada59c02ebe36466 /activerecord/lib | |
| parent | d200d080041bc4cefba8a8d39943b233ee2630a0 (diff) | |
| download | rails-fc94c03c1d509eda7f87ab216e8d1115afbfd1ed.tar.gz rails-fc94c03c1d509eda7f87ab216e8d1115afbfd1ed.tar.bz2 rails-fc94c03c1d509eda7f87ab216e8d1115afbfd1ed.zip | |
Remove unncessary arguments passed to arel_table
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 052197f7ad..dc1fa08941 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1751,7 +1751,7 @@ module ActiveRecord def construct_finder_sql_for_association_limiting(options, join_dependency) scope = scope(:find) - relation = arel_table(options[:from]) + relation = arel_table for association in join_dependency.join_associations relation = association.join_relation(relation) @@ -1764,6 +1764,7 @@ module ActiveRecord order(construct_order(options[:order], scope)). limit(construct_limit(options[:limit], scope)). offset(construct_limit(options[:offset], scope)). + from(options[:from]). select(connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", construct_order(options[:order], scope(:find)).join(","))) relation.to_sql diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 986bc7009b..7911370332 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -78,7 +78,7 @@ module ActiveRecord attribute_names.uniq! begin - arel_table = self.class.arel_table(self.class.table_name) + arel_table = self.class.arel_table affected_rows = arel_table.where( arel_table[self.class.primary_key].eq(quoted_id).and( |