mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Add Model.readonly and association_collection#readonly finder method
This commit is contained in:
@@ -1,5 +1,10 @@
|
||||
*Edge*
|
||||
|
||||
* Add Model.readonly and association_collection#readonly finder method. [Pratik Naik]
|
||||
|
||||
Post.readonly.to_a # Load all posts in readonly mode
|
||||
@user.items.readonly(false).to_a # Load all the user items in writable mode
|
||||
|
||||
* Add .lock finder method [Pratik Naik]
|
||||
|
||||
User.lock.where(:name => 'lifo').to_a
|
||||
|
||||
@@ -21,7 +21,7 @@ module ActiveRecord
|
||||
construct_sql
|
||||
end
|
||||
|
||||
delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :lock, :to => :scoped
|
||||
delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :lock, :readonly, :to => :scoped
|
||||
|
||||
def select(select = nil, &block)
|
||||
if block_given?
|
||||
|
||||
@@ -652,7 +652,7 @@ module ActiveRecord #:nodoc:
|
||||
end
|
||||
end
|
||||
|
||||
delegate :select, :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :lock, :to => :scoped
|
||||
delegate :select, :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :lock, :readonly, :to => :scoped
|
||||
|
||||
# A convenience wrapper for <tt>find(:first, *args)</tt>. You can pass in all the
|
||||
# same arguments to this method as you can to <tt>find(:first)</tt>.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
module ActiveRecord
|
||||
class Relation
|
||||
delegate :to_sql, :to => :relation
|
||||
delegate :length, :collect, :map, :each, :to => :to_a
|
||||
delegate :length, :collect, :map, :each, :all?, :to => :to_a
|
||||
attr_reader :relation, :klass, :associations_to_preload, :eager_load_associations
|
||||
|
||||
def initialize(klass, relation, readonly = false, preload = [], eager_load = [])
|
||||
|
||||
@@ -33,19 +33,20 @@ class ReadOnlyTest < ActiveRecord::TestCase
|
||||
|
||||
def test_find_with_readonly_option
|
||||
Developer.find(:all).each { |d| assert !d.readonly? }
|
||||
Developer.find(:all, :readonly => false).each { |d| assert !d.readonly? }
|
||||
Developer.find(:all, :readonly => true).each { |d| assert d.readonly? }
|
||||
Developer.readonly(false).each { |d| assert !d.readonly? }
|
||||
Developer.readonly(true).each { |d| assert d.readonly? }
|
||||
Developer.readonly.each { |d| assert d.readonly? }
|
||||
end
|
||||
|
||||
|
||||
def test_find_with_joins_option_implies_readonly
|
||||
# Blank joins don't count.
|
||||
Developer.find(:all, :joins => ' ').each { |d| assert !d.readonly? }
|
||||
Developer.find(:all, :joins => ' ', :readonly => false).each { |d| assert !d.readonly? }
|
||||
Developer.joins(' ').each { |d| assert !d.readonly? }
|
||||
Developer.joins(' ').readonly(false).each { |d| assert !d.readonly? }
|
||||
|
||||
# Others do.
|
||||
Developer.find(:all, :joins => ', projects').each { |d| assert d.readonly? }
|
||||
Developer.find(:all, :joins => ', projects', :readonly => false).each { |d| assert !d.readonly? }
|
||||
Developer.joins(', projects').each { |d| assert d.readonly? }
|
||||
Developer.joins(', projects').readonly(false).each { |d| assert !d.readonly? }
|
||||
end
|
||||
|
||||
|
||||
@@ -54,7 +55,7 @@ class ReadOnlyTest < ActiveRecord::TestCase
|
||||
assert !dev.projects.empty?
|
||||
assert dev.projects.all?(&:readonly?)
|
||||
assert dev.projects.find(:all).all?(&:readonly?)
|
||||
assert dev.projects.find(:all, :readonly => true).all?(&:readonly?)
|
||||
assert dev.projects.readonly(true).all?(&:readonly?)
|
||||
end
|
||||
|
||||
def test_has_many_find_readonly
|
||||
@@ -62,7 +63,7 @@ class ReadOnlyTest < ActiveRecord::TestCase
|
||||
assert !post.comments.empty?
|
||||
assert !post.comments.any?(&:readonly?)
|
||||
assert !post.comments.find(:all).any?(&:readonly?)
|
||||
assert post.comments.find(:all, :readonly => true).all?(&:readonly?)
|
||||
assert post.comments.readonly(true).all?(&:readonly?)
|
||||
end
|
||||
|
||||
def test_has_many_with_through_is_not_implicitly_marked_readonly
|
||||
@@ -73,14 +74,14 @@ class ReadOnlyTest < ActiveRecord::TestCase
|
||||
def test_readonly_scoping
|
||||
Post.with_scope(:find => { :conditions => '1=1' }) do
|
||||
assert !Post.find(1).readonly?
|
||||
assert Post.find(1, :readonly => true).readonly?
|
||||
assert !Post.find(1, :readonly => false).readonly?
|
||||
assert Post.readonly(true).find(1).readonly?
|
||||
assert !Post.readonly(false).find(1).readonly?
|
||||
end
|
||||
|
||||
Post.with_scope(:find => { :joins => ' ' }) do
|
||||
assert !Post.find(1).readonly?
|
||||
assert Post.find(1, :readonly => true).readonly?
|
||||
assert !Post.find(1, :readonly => false).readonly?
|
||||
assert Post.readonly.find(1).readonly?
|
||||
assert !Post.readonly(false).find(1).readonly?
|
||||
end
|
||||
|
||||
# Oracle barfs on this because the join includes unqualified and
|
||||
@@ -88,15 +89,15 @@ class ReadOnlyTest < ActiveRecord::TestCase
|
||||
unless current_adapter?(:OracleAdapter)
|
||||
Post.with_scope(:find => { :joins => ', developers' }) do
|
||||
assert Post.find(1).readonly?
|
||||
assert Post.find(1, :readonly => true).readonly?
|
||||
assert !Post.find(1, :readonly => false).readonly?
|
||||
assert Post.readonly.find(1).readonly?
|
||||
assert !Post.readonly(false).find(1).readonly?
|
||||
end
|
||||
end
|
||||
|
||||
Post.with_scope(:find => { :readonly => true }) do
|
||||
assert Post.find(1).readonly?
|
||||
assert Post.find(1, :readonly => true).readonly?
|
||||
assert !Post.find(1, :readonly => false).readonly?
|
||||
assert Post.readonly.find(1).readonly?
|
||||
assert !Post.readonly(false).find(1).readonly?
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user