Permalink
Browse files

Added option inheritance for find calls on has_and_belongs_to_many an…

…d has_many assosociations [DHH] Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [DHH]

Added form_remote_for (form_for meets form_remote_tag) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3287 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f7e39c4 commit e5d9ad3e2903597e708fcb3ad76f08b4a600d82d @dhh dhh committed Dec 13, 2005
View
@@ -1,5 +1,7 @@
*SVN*
+* Added form_remote_for (form_for meets form_remote_tag) [DHH]
+
* Update to script.aculo.us 1.5.0_rc6
* More robust relative url root discovery for SCGI compatibility. This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint. #3070 [Dave Ringoen]
@@ -169,7 +169,13 @@ def form_remote_tag(options = {})
tag("form", options[:html], true)
end
-
+
+ def form_remote_for(object_name, object, options = {}, &proc)
+ concat(form_remote_tag(options), proc.binding)
+ fields_for(object_name, object, &proc)
+ concat(end_form_tag, proc.binding)
+ end
+
# Works like form_remote_tag, but uses form_for semantics.
def form_remote_for(object_name, object, options = {}, &proc)
concat(form_remote_tag(options), proc.binding)
View
@@ -1,5 +1,17 @@
*SVN*
+* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [DHH]. Example:
+
+ class Post
+ has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
+ end
+
+ post.recent_comments.find(:all) # Uses LIMIT 10 and includes authors
+ post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
+ post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
+
+* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [DHH]
+
* MySQL: fixes for the bundled mysql.rb driver. #3160 [Justin Forder]
* SQLServer: fix obscure optimistic locking bug. #3068 [kajism@yahoo.com]
@@ -131,9 +131,7 @@ def clear_association_cache #:nodoc:
# class Account < ActiveRecord::Base
# has_many :people do
# def find_or_create_by_name(name)
- # first_name, *last_name = name.split
- # last_name = last_name.join " "
- #
+ # first_name, last_name = name.split(" ", 2)
# find_or_create_by_first_name_and_last_name(first_name, last_name)
# end
# end
@@ -147,9 +145,7 @@ def clear_association_cache #:nodoc:
#
# module FindOrCreateByNameExtension
# def find_or_create_by_name(name)
- # first_name, *last_name = name.split
- # last_name = last_name.join " "
- #
+ # first_name, last_name = name.split(" ", 2)
# find_or_create_by_first_name_and_last_name(first_name, last_name)
# end
# end
@@ -330,6 +326,11 @@ module ClassMethods
# specified but +:counter_sql+, +:counter_sql+ will be generated by replacing SELECT ... FROM with SELECT COUNT(*) FROM.
# * <tt>:extend</tt> - specify a named module for extending the proxy, see "Association extensions".
# * <tt>:include</tt> - specify second-order associations that should be eager loaded when the collection is loaded.
+ # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
+ # * <tt>:limit</tt>: An integer determining the limit on the number of rows that should be returned.
+ # * <tt>:offset</tt>: An integer determining the offset from where the rows should be fetched. So at 5, it would skip the first 4 rows.
+ # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you for example want to do a join, but not
+ # include the joined columns.
#
# Option examples:
# has_many :comments, :order => "posted_on"
@@ -591,6 +592,11 @@ def belongs_to(association_id, options = {})
# with a manual one
# * <tt>:extend</tt> - anonymous module for extending the proxy, see "Association extensions".
# * <tt>:include</tt> - specify second-order associations that should be eager loaded when the collection is loaded.
+ # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
+ # * <tt>:limit</tt>: An integer determining the limit on the number of rows that should be returned.
+ # * <tt>:offset</tt>: An integer determining the offset from where the rows should be fetched. So at 5, it would skip the first 4 rows.
+ # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you for example want to do a join, but not
+ # include the joined columns.
#
# Option examples:
# has_and_belongs_to_many :projects
@@ -872,10 +878,13 @@ def add_deprecated_api_for_has_many(association_name)
def create_has_many_reflection(association_id, options, &extension)
options.assert_valid_keys(
- :foreign_key, :class_name, :exclusively_dependent, :dependent,
- :conditions, :order, :include, :finder_sql, :counter_sql,
- :before_add, :after_add, :before_remove, :after_remove, :extend,
- :group, :as, :through
+ :class_name, :table_name, :foreign_key,
+ :exclusively_dependent, :dependent,
+ :select, :conditions, :include, :order, :group, :limit, :offset,
+ :as, :through,
+ :finder_sql, :counter_sql,
+ :before_add, :after_add, :before_remove, :after_remove,
+ :extend
)
options[:extend] = create_extension_module(association_id, extension) if block_given?
@@ -916,9 +925,11 @@ def create_belongs_to_reflection(association_id, options)
def create_has_and_belongs_to_many_reflection(association_id, options, &extension)
options.assert_valid_keys(
- :class_name, :table_name, :foreign_key, :association_foreign_key, :conditions, :include,
- :join_table, :finder_sql, :delete_sql, :insert_sql, :order, :uniq, :before_add, :after_add,
- :before_remove, :after_remove, :extend
+ :class_name, :table_name, :join_table, :foreign_key, :association_foreign_key,
+ :select, :conditions, :include, :order, :group, :limit, :offset,
+ :finder_sql, :delete_sql, :insert_sql, :uniq,
+ :before_add, :after_add, :before_remove, :after_remove,
+ :extend
)
options[:extend] = create_extension_module(association_id, extension) if block_given?
@@ -73,6 +73,17 @@ def sanitize_sql(sql)
def extract_options_from_args!(args)
@owner.send(:extract_options_from_args!, args)
end
+
+ def merge_options_from_reflection!(options)
+ options.reverse_merge!(
+ :group => @reflection.options[:group],
+ :limit => @reflection.options[:limit],
+ :offset => @reflection.options[:offset],
+ :joins => @reflection.options[:joins],
+ :include => @reflection.options[:include],
+ :select => @reflection.options[:select]
+ )
+ end
private
def method_missing(method, *args, &block)
@@ -49,6 +49,8 @@ def find(*args)
options[:order] = @reflection.options[:order]
end
+ merge_options_from_reflection!(options)
+
# Pass through args exactly as we received them.
args << options
@reflection.klass.find(*args)
@@ -88,7 +90,7 @@ def find_target
if @reflection.options[:finder_sql]
records = @reflection.klass.find_by_sql(@finder_sql)
else
- records = find(:all, :include => @reflection.options[:include])
+ records = find(:all)
end
@reflection.options[:uniq] ? uniq(records) : records
@@ -77,6 +77,8 @@ def find(*args)
options[:order] = @reflection.options[:order]
end
+ merge_options_from_reflection!(options)
+
# Pass through args exactly as we received them.
args << options
@reflection.klass.find(*args)
@@ -107,14 +109,7 @@ def find_target
if @reflection.options[:finder_sql]
@reflection.klass.find_by_sql(@finder_sql)
else
- @reflection.klass.find(:all,
- :conditions => @finder_sql,
- :order => @reflection.options[:order],
- :limit => @reflection.options[:limit],
- :joins => @reflection.options[:joins],
- :include => @reflection.options[:include],
- :group => @reflection.options[:group]
- )
+ find(:all)
end
end
@@ -129,6 +124,10 @@ def count_records
@target = [] and loaded if count == 0
+ if @reflection.options[:limit]
+ count = [ @reflection.options[:limit], count ].min
+ end
+
return count
end
@@ -171,7 +170,7 @@ def construct_sql
"#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " +
"#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, @owner.class).to_s}'"
@finder_sql << " AND (#{interpolate_sql(@conditions)})" if @conditions
-
+
else
@finder_sql = "#{@reflection.klass.table_name}.#{@reflection.primary_key_name} = #{@owner.quoted_id}"
@finder_sql << " AND (#{interpolate_sql(@conditions)})" if @conditions
@@ -16,6 +16,8 @@ def find(*args)
options[:order] = @reflection.options[:order]
end
+ merge_options_from_reflection!(options)
+
# Pass through args exactly as we received them.
args << options
@reflection.klass.find(*args)
@@ -281,6 +281,12 @@ def test_finding
assert_equal 2, Firm.find(:first).clients.length
end
+ def test_find_many_with_merged_options
+ assert_equal 1, companies(:first_firm).limited_clients.size
+ assert_equal 1, companies(:first_firm).limited_clients.find(:all).size
+ assert_equal 2, companies(:first_firm).limited_clients.find(:all, :limit => nil).size
+ end
+
def test_triple_equality
assert !(Array === Firm.find(:first).clients)
assert Firm.find(:first).clients === Array
@@ -670,7 +676,6 @@ def test_dependence_on_account
assert_equal num_accounts - 1, Account.count
end
-
def test_depends_and_nullify
num_accounts = Account.count
num_companies = Company.count
@@ -1342,6 +1347,11 @@ def test_find_in_association_with_custom_finder_sql_and_string_id
assert_equal developers(:david), projects(:active_record).developers_with_finder_sql.find(developers(:david).id.to_s), "SQL find"
end
+ def test_find_with_merged_options
+ assert_equal 1, projects(:active_record).limited_developers.size
+ assert_equal 1, projects(:active_record).limited_developers.find(:all).size
+ assert_equal 2, projects(:active_record).limited_developers.find(:all, :limit => nil).size
+ end
def test_new_with_values_in_collection
jamis = DeveloperForProjectWithAfterCreateHook.find_by_name('Jamis')
@@ -14,6 +14,7 @@ class Firm < Company
has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
has_many :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => true
has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :exclusively_dependent => true
+ has_many :limited_clients, :class_name => "Client", :order => "id", :limit => 1
has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
has_many :clients_using_counter_sql, :class_name => "Client",
@@ -1,5 +1,6 @@
class Project < ActiveRecord::Base
has_and_belongs_to_many :developers, :uniq => true
+ has_and_belongs_to_many :limited_developers, :class_name => "Developer", :limit => 1
has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id}'

0 comments on commit e5d9ad3

Please sign in to comment.