diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-08-27 20:03:46 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-08-27 20:03:46 -0300 |
commit | 6b67df70ab1bc42d9a05571144cdf5614a7d4a6a (patch) | |
tree | dfc105d13590e6d5b50d6fc689e18f77d7a750c2 /activerecord/lib | |
parent | f2c0725d79e29b02e30e7a4827851acc4a766730 (diff) | |
download | rails-6b67df70ab1bc42d9a05571144cdf5614a7d4a6a.tar.gz rails-6b67df70ab1bc42d9a05571144cdf5614a7d4a6a.tar.bz2 rails-6b67df70ab1bc42d9a05571144cdf5614a7d4a6a.zip |
Revert "Revert "Add readonly support for relations.""
This reverts commit f2c0725d79e29b02e30e7a4827851acc4a766730.
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 7 | ||||
-rw-r--r-- | activerecord/lib/active_record/relation.rb | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index c11c049415..402d68c36e 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1722,7 +1722,7 @@ module ActiveRecord #:nodoc: def construct_finder_arel(options = {}, scope = scope(:find)) # TODO add lock to Arel - arel_table(options[:from]). + relation = arel_table(options[:from]). joins(construct_join(options[:joins], scope)). conditions(construct_conditions(options[:conditions], scope)). select(options[:select] || (scope && scope[:select]) || default_select(options[:joins] || (scope && scope[:joins]))). @@ -1730,6 +1730,11 @@ module ActiveRecord #:nodoc: order(construct_order(options[:order], scope)). limit(construct_limit(options[:limit], scope)). offset(construct_offset(options[:offset], scope)) + + relation = relation.readonly if options[:readonly] + + relation + end def construct_finder_sql(options, scope = scope(:find)) diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 570ba3f80d..4b53857d36 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -5,10 +5,20 @@ module ActiveRecord def initialize(klass, relation) @klass, @relation = klass, relation + @readonly = false + end + + def readonly + @readonly = true + self end def to_a - @klass.find_by_sql(@relation.to_sql) + records = @klass.find_by_sql(@relation.to_sql) + + records.each { |record| record.readonly! } if @readonly + + records end def each(&block) |