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

Make relation a private method.

Browse source
This commit is contained in:
José Valim 2010-06-30 19:38:20 +02:00
parent c63cf7bf0d
commit 57d750edf7
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activerecord/lib/active_record/base.rb
View file

@ -896,11 +896,6 @@ module ActiveRecord #:nodoc:
store_full_sti_class ? name : name.demodulize
end
def relation
@relation ||= Relation.new(self, arel_table)
finder_needs_type_condition? ? @relation.where(type_condition) : @relation
end
def arel_table
@arel_table ||= Arel::Table.new(table_name, :engine => arel_engine)
end
@ -941,6 +936,12 @@ module ActiveRecord #:nodoc:
end
private
def relation #:nodoc:
@relation ||= Relation.new(self, arel_table)
finder_needs_type_condition? ? @relation.where(type_condition) : @relation
end
# Finder methods must instantiate through this method to work with the
# single-table inheritance model that makes it possible to create
# objects of different types from the same table.

2
activerecord/lib/active_record/named_scope.rb
View file

@ -29,7 +29,7 @@ module ActiveRecord
if options.present?
scoped.apply_finder_options(options)
else
current_scoped_methods ? unscoped.merge(current_scoped_methods) : unscoped.clone
current_scoped_methods ? relation.merge(current_scoped_methods) : relation.clone
end
end