From 7b24cf0391ed8916bf12781a179b4ac5995e1690 Mon Sep 17 00:00:00 2001 From: Neeraj Singh Date: Mon, 13 May 2013 11:39:09 -0400 Subject: emphasize that callbacks are called in destroy_all Cleaned up rdoc a bit emphasizing that callbacks are called. Also removed the stress on the fact that records are always removed. If callbacks return false then records will not be deleted. --- .../lib/active_record/associations/collection_association.rb | 8 ++++---- activerecord/lib/active_record/associations/collection_proxy.rb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 2a00ac1386..efd7ecb97c 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -237,11 +237,11 @@ module ActiveRecord end end - # Destroy +records+ and remove them from this association calling - # +before_remove+ and +after_remove+ callbacks. + # Deletes the +records+ and removes them from this association calling + # +before_remove+ , +after_remove+ , +before_destroy+ and +after_destroy+ callbacks. # - # Note that this method will _always_ remove records from the database - # ignoring the +:dependent+ option. + # Note that this method removes records from the database ignoring the + # +:dependent+ option. def destroy(*records) records = find(records) if records.any? { |record| record.kind_of?(Fixnum) || record.kind_of?(String) } delete_or_destroy(records, :destroy) diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 71b64de5ea..e82c195335 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -422,9 +422,9 @@ module ActiveRecord @association.delete_all end - # Deletes the records of the collection directly from the database. - # This will _always_ remove the records ignoring the +:dependent+ - # option. + # Deletes the records of the collection directly from the database + # ignoring the +:dependent+ option. It invokes +before_remove+, + # +after_remove+ , +before_destroy+ and +after_destroy+ callbacks. # # class Person < ActiveRecord::Base # has_many :pets -- cgit v1.2.3 From 87d71b02b85a44ce461e533666ef5f0e43a46531 Mon Sep 17 00:00:00 2001 From: aditya-kapoor Date: Tue, 14 May 2013 00:27:52 +0530 Subject: Added documentation for model migration generation --- .../lib/rails/generators/active_record/model/model_generator.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb index 40e134e626..821df0e0d6 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -12,6 +12,9 @@ module ActiveRecord class_option :parent, :type => :string, :desc => "The parent class for the generated model" class_option :indexes, :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns" + + # creates the migration file for the model first followed by the model file itself + def create_migration_file return unless options[:migration] && options[:parent].nil? attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false @@ -39,6 +42,7 @@ module ActiveRecord protected + # Used by the migration template to determine the parent name of the model def parent_class_name options[:parent] || "ActiveRecord::Base" end -- cgit v1.2.3 From ddf07d21834f4ad88c25334829348f5e4000fea0 Mon Sep 17 00:00:00 2001 From: Anton Kalyaev Date: Tue, 14 May 2013 10:15:32 +0400 Subject: improved doc for ActiveRecord#find_by_sql method (Refs #10599) [ci skip] --- activerecord/lib/active_record/querying.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index f78ccb01aa..3d85898c41 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -14,7 +14,7 @@ module ActiveRecord # Executes a custom SQL query against your database and returns all the results. The results will # be returned as an array with columns requested encapsulated as attributes of the model you call # this method from. If you call Product.find_by_sql then the results will be returned in - # a Product object with the attributes you specified in the SQL query. + # a +Product+ object with the attributes you specified in the SQL query. # # If you call a complicated SQL query which spans multiple tables the columns specified by the # SELECT will be attributes of the model, whether or not they are columns of the corresponding @@ -29,9 +29,10 @@ module ActiveRecord # Post.find_by_sql "SELECT p.title, c.author FROM posts p, comments c WHERE p.id = c.post_id" # # => [#"Ruby Meetup", "first_name"=>"Quentin"}>, ...] # - # # You can use the same string replacement techniques as you can with ActiveRecord#find + # You can use the same string replacement techniques as you can with ActiveRecord::QueryMethods#where: + # # Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date] - # # => [#"The Cheap Man Buys Twice"}>, ...] + # Post.find_by_sql ["SELECT body FROM comments WHERE author = :user_id OR approved_by = :user_id", { :user_id => user_id }] def find_by_sql(sql, binds = []) result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds) column_types = {} -- cgit v1.2.3 From 0fbf31b2000e467f18ebba90efb3a88fa1a4a7c9 Mon Sep 17 00:00:00 2001 From: aditya-kapoor Date: Wed, 15 May 2013 12:28:08 +0530 Subject: Added documentation for ActiveRecord::Associations::Builder::Association class --- activerecord/lib/active_record/associations/builder/association.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 5c37f42794..34684fd71a 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -1,3 +1,7 @@ +# This is the parent Association class which defines certain class variables (valid_options) and +# instance variables (model, name, scope, options, reflection) which would be common across all the associations that we known today in Rails.. +# Every association need to have the values of these variables set and they are used at multiple places + module ActiveRecord::Associations::Builder class Association #:nodoc: class << self -- cgit v1.2.3 From da8fff528ddcf3ea92f5c6cc402105e0403bb74a Mon Sep 17 00:00:00 2001 From: aditya-kapoor Date: Wed, 15 May 2013 15:07:55 +0530 Subject: Added some more documentation for ActiveRecord::Associations::Builder::Association class --- .../lib/active_record/associations/builder/association.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 34684fd71a..456041cce8 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -1,6 +1,17 @@ # This is the parent Association class which defines certain class variables (valid_options) and # instance variables (model, name, scope, options, reflection) which would be common across all the associations that we known today in Rails.. # Every association need to have the values of these variables set and they are used at multiple places +# The heirarchy is defined as follows: +# Association +# - SingularAssociation +# - BelongsTo +# - HasOne +# - CollectionAssociation +# - HasMany +# - HasAndBelongsToMany +# +# The HasMany :Through association is a special case of HasMany association with the :through option set for it +# module ActiveRecord::Associations::Builder class Association #:nodoc: -- cgit v1.2.3 From 90e60aa4694be408b299085cad8b8a6be64df0ac Mon Sep 17 00:00:00 2001 From: aditya-kapoor Date: Wed, 15 May 2013 15:31:53 +0530 Subject: Added some more documentation for define_readers and define_writer of the Association and its inherited classes --- activerecord/lib/active_record/associations/builder/association.rb | 7 +++++++ .../active_record/associations/builder/collection_association.rb | 4 ++++ .../lib/active_record/associations/builder/singular_association.rb | 4 ++++ 3 files changed, 15 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 456041cce8..4b72846ef6 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -73,6 +73,13 @@ module ActiveRecord::Associations::Builder def validate_options options.assert_valid_keys(valid_options) end + + # Defines the setter and getter methods for the association + # class Post < ActiveRecord::Base + # has_many :comments + # end + # + # Post.first.comments and Post.first.comments= methods are defined by this method... def define_accessors define_readers diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index fdead16761..9c6690b721 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -1,3 +1,5 @@ +# This class is inherited by the has_many and has_many_and_belongs_to_many association classes + require 'active_record/associations' module ActiveRecord::Associations::Builder @@ -66,6 +68,8 @@ module ActiveRecord::Associations::Builder model.send("#{full_callback_name}=", Array(options[callback_name.to_sym])) end + # Defines the setter and getter methods for the collection_singular_ids. + def define_readers super diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb index f06426a09d..96ccbeb8a3 100644 --- a/activerecord/lib/active_record/associations/builder/singular_association.rb +++ b/activerecord/lib/active_record/associations/builder/singular_association.rb @@ -1,3 +1,5 @@ +# This class is inherited by the has_one and belongs_to association classes + module ActiveRecord::Associations::Builder class SingularAssociation < Association #:nodoc: def valid_options @@ -13,6 +15,8 @@ module ActiveRecord::Associations::Builder define_constructors if constructable? end + # Defines the (build|create)_association methods for belongs_to or has_one association + def define_constructors mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1 def build_#{name}(*args, &block) -- cgit v1.2.3 From 7f24d3d6956a7775771302d143e3b09de681d12f Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Sun, 19 May 2013 21:32:17 +0530 Subject: copy edits[ci skip] --- .../active_record/associations/builder/association.rb | 19 ++++++++----------- .../generators/active_record/model/model_generator.rb | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 4b72846ef6..6a3658f328 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -1,17 +1,14 @@ -# This is the parent Association class which defines certain class variables (valid_options) and -# instance variables (model, name, scope, options, reflection) which would be common across all the associations that we known today in Rails.. -# Every association need to have the values of these variables set and they are used at multiple places -# The heirarchy is defined as follows: +# This is the parent Association class which defines the variables +# used by all associations. +# +# The hierarchy is defined as follows: # Association # - SingularAssociation -# - BelongsTo -# - HasOne +# - BelongsToAssociation +# - HasOneAssociation # - CollectionAssociation -# - HasMany -# - HasAndBelongsToMany -# -# The HasMany :Through association is a special case of HasMany association with the :through option set for it -# +# - HasManyAssociation +# - HasAndBelongsToManyAssociation module ActiveRecord::Associations::Builder class Association #:nodoc: diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb index 821df0e0d6..7e8d68ce69 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -13,7 +13,7 @@ module ActiveRecord class_option :indexes, :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns" - # creates the migration file for the model first followed by the model file itself + # creates the migration file for the model. def create_migration_file return unless options[:migration] && options[:parent].nil? -- cgit v1.2.3 From 658e9e0f35104c8e47f7442b2fcd9c7b1d405787 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 20 May 2013 17:35:17 -0700 Subject: pass where values to the helper function rather than rely on internal state --- activerecord/lib/active_record/relation/merger.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index eea43aff0e..8e2ae9a9b1 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -137,19 +137,19 @@ module ActiveRecord if values[:where].empty? || relation.where_values.empty? relation.where_values + values[:where] else - sanitized_wheres + values[:where] + sanitized_wheres(relation.where_values, values[:where]) + values[:where] end end # Remove equalities from the existing relation with a LHS which is # present in the relation being merged in. - def sanitized_wheres + def sanitized_wheres(lhs_wheres, rhs_wheres) seen = Set.new - values[:where].each do |w| + rhs_wheres.each do |w| seen << w.left if w.respond_to?(:operator) && w.operator == :== end - relation.where_values.reject do |w| + lhs_wheres.reject do |w| w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left) end end -- cgit v1.2.3 From 3f4f56aed8b2e06817741b266a533228ce594c5b Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 20 May 2013 17:38:05 -0700 Subject: save the where values in variables so we don't need to look them up all the time --- activerecord/lib/active_record/relation/merger.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 8e2ae9a9b1..f689682cfa 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -132,12 +132,13 @@ module ActiveRecord end def merged_wheres - values[:where] ||= [] + rhs_wheres = values[:where] || [] + lhs_wheres = relation.where_values - if values[:where].empty? || relation.where_values.empty? - relation.where_values + values[:where] + if rhs_wheres.empty? || lhs_wheres.empty? + lhs_wheres + rhs_wheres else - sanitized_wheres(relation.where_values, values[:where]) + values[:where] + sanitized_wheres(lhs_wheres, rhs_wheres) + rhs_wheres end end -- cgit v1.2.3 From 52ed881fa296a05374a5a3395f92a653b3721298 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 20 May 2013 17:39:29 -0700 Subject: change method name to reflect what it actually does. --- activerecord/lib/active_record/relation/merger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index f689682cfa..0f54d91d86 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -138,13 +138,13 @@ module ActiveRecord if rhs_wheres.empty? || lhs_wheres.empty? lhs_wheres + rhs_wheres else - sanitized_wheres(lhs_wheres, rhs_wheres) + rhs_wheres + reject_overwrites(lhs_wheres, rhs_wheres) + rhs_wheres end end # Remove equalities from the existing relation with a LHS which is # present in the relation being merged in. - def sanitized_wheres(lhs_wheres, rhs_wheres) + def reject_overwrites(lhs_wheres, rhs_wheres) seen = Set.new rhs_wheres.each do |w| seen << w.left if w.respond_to?(:operator) && w.operator == :== -- cgit v1.2.3 From bff89a2022aedec60929f6d6744eefc84a5c102a Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 20 May 2013 17:49:16 -0700 Subject: eliminate some conditionals --- activerecord/lib/active_record/relation/merger.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 0f54d91d86..98afeb8cc5 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -145,10 +145,10 @@ module ActiveRecord # Remove equalities from the existing relation with a LHS which is # present in the relation being merged in. def reject_overwrites(lhs_wheres, rhs_wheres) - seen = Set.new - rhs_wheres.each do |w| - seen << w.left if w.respond_to?(:operator) && w.operator == :== + nodes = rhs_wheres.find_all do |w| + w.respond_to?(:operator) && w.operator == :== end + seen = Set.new(nodes) { |node| node.left } lhs_wheres.reject do |w| w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left) -- cgit v1.2.3 From 847752a295d411ccff31f3137c140ec0f5445c07 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 20 May 2013 18:02:46 -0700 Subject: partition the where values so we can access the removed ones --- activerecord/lib/active_record/relation/merger.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 98afeb8cc5..58ac239190 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -145,12 +145,17 @@ module ActiveRecord # Remove equalities from the existing relation with a LHS which is # present in the relation being merged in. def reject_overwrites(lhs_wheres, rhs_wheres) + partition_overwrites(lhs_wheres, rhs_wheres).last + end + + def partition_overwrites(lhs_wheres, rhs_wheres) nodes = rhs_wheres.find_all do |w| w.respond_to?(:operator) && w.operator == :== end seen = Set.new(nodes) { |node| node.left } - lhs_wheres.reject do |w| + # returns [deleted, keepers] + lhs_wheres.partition do |w| w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left) end end -- cgit v1.2.3 From 78903731e432dc3ad2a00cb3b30741b962f3afcd Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Tue, 21 May 2013 15:47:57 +0200 Subject: the rake task `db:test:prepare` needs to load the configuration Without loading the configuration the task will not perform any work. --- activerecord/lib/active_record/railties/databases.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 434af3c5f8..f69e9b2217 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -360,7 +360,7 @@ db_namespace = namespace :db do end # desc 'Check for pending migrations and load the test schema' - task :prepare do + task :prepare => :load_config do unless ActiveRecord::Base.configurations.blank? db_namespace['test:load'].invoke end -- cgit v1.2.3 From a483ae6477fab482e95b3415bb9b0cf54f198699 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 21 May 2013 10:35:35 -0700 Subject: push partion logic down and initialization logic up --- activerecord/lib/active_record/relation/merger.rb | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 58ac239190..eb72d551da 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -99,7 +99,10 @@ module ActiveRecord end def merge_multi_values - relation.where_values = merged_wheres + rhs_wheres = values[:where] || [] + lhs_wheres = relation.where_values + + relation.where_values = merged_wheres(lhs_wheres, rhs_wheres) relation.bind_values = merged_binds if values[:reordering] @@ -131,30 +134,23 @@ module ActiveRecord end end - def merged_wheres - rhs_wheres = values[:where] || [] - lhs_wheres = relation.where_values - - if rhs_wheres.empty? || lhs_wheres.empty? - lhs_wheres + rhs_wheres - else - reject_overwrites(lhs_wheres, rhs_wheres) + rhs_wheres - end + def merged_wheres(lhs_wheres, rhs_wheres) + partition_overwrites(lhs_wheres, rhs_wheres).last + rhs_wheres end # Remove equalities from the existing relation with a LHS which is # present in the relation being merged in. - def reject_overwrites(lhs_wheres, rhs_wheres) - partition_overwrites(lhs_wheres, rhs_wheres).last - end - + # returns [things_to_remove, things_to_keep] def partition_overwrites(lhs_wheres, rhs_wheres) + if lhs_wheres.empty? || rhs_wheres.empty? + return [[], lhs_wheres] + end + nodes = rhs_wheres.find_all do |w| w.respond_to?(:operator) && w.operator == :== end seen = Set.new(nodes) { |node| node.left } - # returns [deleted, keepers] lhs_wheres.partition do |w| w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left) end -- cgit v1.2.3 From d2d5f15f0729d00132a240dd9e5169dce5962a0d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 21 May 2013 10:38:51 -0700 Subject: push partitioning up so bind elimination can get the removed wheres --- activerecord/lib/active_record/relation/merger.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index eb72d551da..38f49912d1 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -102,7 +102,9 @@ module ActiveRecord rhs_wheres = values[:where] || [] lhs_wheres = relation.where_values - relation.where_values = merged_wheres(lhs_wheres, rhs_wheres) + _, kept = partition_overwrites(lhs_wheres, rhs_wheres) + + relation.where_values = kept + rhs_wheres relation.bind_values = merged_binds if values[:reordering] @@ -134,10 +136,6 @@ module ActiveRecord end end - def merged_wheres(lhs_wheres, rhs_wheres) - partition_overwrites(lhs_wheres, rhs_wheres).last + rhs_wheres - end - # Remove equalities from the existing relation with a LHS which is # present in the relation being merged in. # returns [things_to_remove, things_to_keep] -- cgit v1.2.3 From 50823452f70341447a010df27dd514fd97bfe8a9 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 21 May 2013 10:55:56 -0700 Subject: remove bind values for where clauses that were removed --- activerecord/lib/active_record/relation/merger.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 38f49912d1..a65ef1898a 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -99,13 +99,15 @@ module ActiveRecord end def merge_multi_values - rhs_wheres = values[:where] || [] lhs_wheres = relation.where_values + rhs_wheres = values[:where] || [] + lhs_binds = relation.bind_values + rhs_binds = values[:bind] || [] - _, kept = partition_overwrites(lhs_wheres, rhs_wheres) + removed, kept = partition_overwrites(lhs_wheres, rhs_wheres) relation.where_values = kept + rhs_wheres - relation.bind_values = merged_binds + relation.bind_values = filter_binds(lhs_binds, removed) + rhs_binds if values[:reordering] # override any order specified in the original relation @@ -128,12 +130,9 @@ module ActiveRecord end end - def merged_binds - if values[:bind] - (relation.bind_values + values[:bind]).uniq(&:first) - else - relation.bind_values - end + def filter_binds(lhs_binds, removed_wheres) + set = Set.new removed_wheres.map { |x| x.left.name } + lhs_binds.dup.delete_if { |col,_| set.include? col.name } end # Remove equalities from the existing relation with a LHS which is -- cgit v1.2.3 From f3ebbeae6eb647767ccd49e25821b1ba33923596 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 21 May 2013 11:01:19 -0700 Subject: avoid creating a set if no where values are removed --- activerecord/lib/active_record/relation/merger.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index a65ef1898a..c114ea0c0d 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -131,6 +131,8 @@ module ActiveRecord end def filter_binds(lhs_binds, removed_wheres) + return lhs_binds if removed_wheres.empty? + set = Set.new removed_wheres.map { |x| x.left.name } lhs_binds.dup.delete_if { |col,_| set.include? col.name } end -- cgit v1.2.3