From e5d9ad3e2903597e708fcb3ad76f08b4a600d82d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 13 Dec 2005 00:39:51 +0000 Subject: Added option inheritance for find calls on has_and_belongs_to_many and 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 --- activerecord/lib/active_record/associations.rb | 37 ++++++++++++++-------- .../associations/association_proxy.rb | 11 +++++++ .../has_and_belongs_to_many_association.rb | 4 ++- .../associations/has_many_association.rb | 17 +++++----- .../associations/has_many_through_association.rb | 2 ++ 5 files changed, 48 insertions(+), 23 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index c50750352f..07dc28ddff 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -131,9 +131,7 @@ module ActiveRecord # 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 @@ module ActiveRecord # # 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 ActiveRecord # specified but +:counter_sql+, +:counter_sql+ will be generated by replacing SELECT ... FROM with SELECT COUNT(*) FROM. # * :extend - specify a named module for extending the proxy, see "Association extensions". # * :include - specify second-order associations that should be eager loaded when the collection is loaded. + # * :group: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause. + # * :limit: An integer determining the limit on the number of rows that should be returned. + # * :offset: An integer determining the offset from where the rows should be fetched. So at 5, it would skip the first 4 rows. + # * :select: 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 @@ module ActiveRecord # with a manual one # * :extend - anonymous module for extending the proxy, see "Association extensions". # * :include - specify second-order associations that should be eager loaded when the collection is loaded. + # * :group: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause. + # * :limit: An integer determining the limit on the number of rows that should be returned. + # * :offset: An integer determining the offset from where the rows should be fetched. So at 5, it would skip the first 4 rows. + # * :select: 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 @@ module ActiveRecord 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 @@ module ActiveRecord 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? diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 75f9184aa2..c62c042ab2 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -73,6 +73,17 @@ module ActiveRecord 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) diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index 417b0905f4..5b203dcc57 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -49,6 +49,8 @@ module ActiveRecord 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 @@ module ActiveRecord 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 diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index f4a08420b7..5a29ffaa30 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -77,6 +77,8 @@ module ActiveRecord 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 @@ module ActiveRecord 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 @@ module ActiveRecord @target = [] and loaded if count == 0 + if @reflection.options[:limit] + count = [ @reflection.options[:limit], count ].min + end + return count end @@ -171,7 +170,7 @@ module ActiveRecord "#{@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 diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 9ecd6f059e..f6ac03a3e6 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -16,6 +16,8 @@ module ActiveRecord 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) -- cgit v1.2.3