kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Give preference to to_a over arel from Relation#method_missing

Browse source
This commit is contained in:
Pratik Naik 2010-01-19 22:52:08 +05:30
parent 9465b84b54
commit dbce07b81d
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/locking/optimistic.rb
View file

@ -81,8 +81,8 @@ module ActiveRecord
relation = self.class.unscoped relation = self.class.unscoped
affected_rows = relation.where( affected_rows = relation.where(
relation[self.class.primary_key].eq(quoted_id).and( relation.table[self.class.primary_key].eq(quoted_id).and(
relation[self.class.locking_column].eq(quote_value(previous_value)) relation.table[self.class.locking_column].eq(quote_value(previous_value))
) )
).update(arel_attributes_values(false, false, attribute_names)) ).update(arel_attributes_values(false, false, attribute_names))

7
activerecord/lib/active_record/relation.rb
View file

@ -8,6 +8,7 @@ module ActiveRecord
include FinderMethods, Calculations, SpawnMethods, QueryMethods include FinderMethods, Calculations, SpawnMethods, QueryMethods
delegate :length, :collect, :map, :each, :all?, :include?, :to => :to_a delegate :length, :collect, :map, :each, :all?, :include?, :to => :to_a
delegate :insert, :update, :where_clause, :to => :arel
attr_reader :table, :klass attr_reader :table, :klass
@ -139,10 +140,10 @@ module ActiveRecord
protected protected
def method_missing(method, *args, &block) def method_missing(method, *args, &block)
if arel.respond_to?(method) if Array.method_defined?(method)
arel.send(method, *args, &block)
elsif Array.method_defined?(method)
to_a.send(method, *args, &block) to_a.send(method, *args, &block)
elsif arel.respond_to?(method)
arel.send(method, *args, &block)
elsif match = DynamicFinderMatch.match(method) elsif match = DynamicFinderMatch.match(method)
attributes = match.attribute_names attributes = match.attribute_names
super unless @klass.send(:all_attributes_exists?, attributes) super unless @klass.send(:all_attributes_exists?, attributes)

6
activerecord/test/cases/named_scope_test.rb
View file

@ -379,6 +379,12 @@ class NamedScopeTest < ActiveRecord::TestCase
def test_deprecated_named_scope_method def test_deprecated_named_scope_method
assert_deprecated('named_scope has been deprecated') { Topic.named_scope :deprecated_named_scope } assert_deprecated('named_scope has been deprecated') { Topic.named_scope :deprecated_named_scope }
end end
def test_index_on_named_scope
approved = Topic.approved.order('id ASC')
assert_equal topics(:second), approved[0]
assert approved.loaded?
end
end end
class DynamicScopeMatchTest < ActiveRecord::TestCase class DynamicScopeMatchTest < ActiveRecord::TestCase