activerecord 5.1.2 → 5.1.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69234c2130839f7ca6eb9c8654e62eda6f860ae8
-  data.tar.gz: 92df85fd0835d3b764b4b7fe60a76c9058b3c7a5
+  metadata.gz: 2235bab758b26132975903eb55a7f74d34019f9e
+  data.tar.gz: 5da80bcac453255f9d1da49f4a32722edd894d7d
 SHA512:
-  metadata.gz: ab0677c62425e52fb57763219a4c5d72b2200fa81894f2a0a5207488b61c5ec01cc7184351ebf5f55cf4a51eb6c33f363156a3730055f1cbf82a205630d631e4
-  data.tar.gz: f3b5a917ead57f96baf20637df063fdaec2935b93cbc6124b7158424ebc83fdf202938617cf4b4d2e53614eecaaccdac5762d76da27a5ec4448d283818cb439b
+  metadata.gz: aec867ebce19311b4f1617064d94057bcf78e0de5383c43b2ccaf4a733bc9c776ef4aa73b1353662fa87eb76a7a1db49ac1367cfe639a3b3b46560c0da648715
+  data.tar.gz: 9fcebfae2cb8040cb7f4930f85ea11ce86d24716caba8c665ec35ca57acd7eb4690c6f03a28af23a7d0b37f44747db37d692b316efd13b8654dfe95560bdb71b

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## Rails 5.1.3.rc1 (July 19, 2017) ##
+
+*   `Relation#joins` is no longer affected by the target model's
+    `current_scope`, with the exception of `unscoped`.
+
+    Fixes #29338.
+
+    *Sean Griffin*
+
+*   Previously, when building records using a `has_many :through` association,
+    if the child records were deleted before the parent was saved, they would
+    still be persisted. Now, if child records are deleted before the parent is saved
+    on a `has_many :through` association, the child records will not be persisted.
+
+    *Tobias Kraze*
+
+
 ## Rails 5.1.2 (June 26, 2017) ##
 
 *   Restore previous behavior of collection proxies: their values can have

data/lib/active_record/associations/alias_tracker.rb

@@ -6,21 +6,21 @@ module ActiveRecord
     class AliasTracker # :nodoc:
       attr_reader :aliases
 
-      def self.create(connection, initial_table, type_caster)
+      def self.create(connection, initial_table)
         aliases = Hash.new(0)
         aliases[initial_table] = 1
-        new connection, aliases, type_caster
+        new(connection, aliases)
       end
 
-      def self.create_with_joins(connection, initial_table, joins, type_caster)
+      def self.create_with_joins(connection, initial_table, joins)
         if joins.empty?
-          create(connection, initial_table, type_caster)
+          create(connection, initial_table)
         else
           aliases = Hash.new { |h, k|
             h[k] = initial_count_for(connection, k, joins)
           }
           aliases[initial_table] = 1
-          new connection, aliases, type_caster
+          new(connection, aliases)
         end
       end
 
@@ -53,17 +53,16 @@ module ActiveRecord
       end
 
       # table_joins is an array of arel joins which might conflict with the aliases we assign here
-      def initialize(connection, aliases, type_caster)
+      def initialize(connection, aliases)
         @aliases    = aliases
         @connection = connection
-        @type_caster = type_caster
       end
 
-      def aliased_table_for(table_name, aliased_name)
+      def aliased_table_for(table_name, aliased_name, type_caster)
         if aliases[table_name].zero?
           # If it's zero, we can have our table_name
           aliases[table_name] = 1
-          Arel::Table.new(table_name, type_caster: @type_caster)
+          Arel::Table.new(table_name, type_caster: type_caster)
         else
           # Otherwise, we need to use an alias
           aliased_name = @connection.table_alias_for(aliased_name)
@@ -76,7 +75,7 @@ module ActiveRecord
           else
             aliased_name
           end
-          Arel::Table.new(table_name, type_caster: @type_caster).alias(table_alias)
+          Arel::Table.new(table_name, type_caster: type_caster).alias(table_alias)
         end
       end
 

data/lib/active_record/associations/association_scope.rb

@@ -21,7 +21,7 @@ module ActiveRecord
         reflection = association.reflection
         scope = klass.unscoped
         owner = association.owner
-        alias_tracker = AliasTracker.create connection, association.klass.table_name, klass.type_caster
+        alias_tracker = AliasTracker.create connection, association.klass.table_name
         chain_head, chain_tail = get_chain(reflection, association, alias_tracker)
 
         scope.extending! reflection.extensions
@@ -112,7 +112,11 @@ module ActiveRecord
           runtime_reflection = Reflection::RuntimeReflection.new(reflection, association)
           previous_reflection = runtime_reflection
           reflection.chain.drop(1).each do |refl|
-            alias_name = tracker.aliased_table_for(refl.table_name, refl.alias_candidate(name))
+            alias_name = tracker.aliased_table_for(
+              refl.table_name,
+              refl.alias_candidate(name),
+              refl.klass.type_caster
+            )
             proxy = ReflectionProxy.new(refl, alias_name)
             previous_reflection.next = proxy
             previous_reflection = proxy

data/lib/active_record/associations/collection_association.rb

@@ -44,10 +44,7 @@ module ActiveRecord
         if loaded?
           target.pluck(reflection.association_primary_key)
         else
-          @association_ids ||= (
-            column = "#{reflection.quoted_table_name}.#{reflection.association_primary_key}"
-            scope.pluck(column)
-          )
+          @association_ids ||= scope.pluck(reflection.association_primary_key)
         end
       end
 

data/lib/active_record/associations/has_many_through_association.rb

@@ -109,6 +109,11 @@ module ActiveRecord
           record
         end
 
+        def remove_records(existing_records, records, method)
+          super
+          delete_through_records(records)
+        end
+
         def target_reflection_has_associated_record?
           !(through_reflection.belongs_to? && owner[through_reflection.foreign_key].blank?)
         end

data/lib/active_record/associations/join_dependency.rb

@@ -93,7 +93,7 @@ module ActiveRecord
       #    joins # =>  []
       #
       def initialize(base, associations, joins, eager_loading: true)
-        @alias_tracker = AliasTracker.create_with_joins(base.connection, base.table_name, joins, base.type_caster)
+        @alias_tracker = AliasTracker.create_with_joins(base.connection, base.table_name, joins)
         @eager_loading = eager_loading
         tree = self.class.make_tree associations
         @join_root = JoinBase.new base, build(tree, base)
@@ -202,7 +202,8 @@ module ActiveRecord
           node.reflection.chain.map { |reflection|
             alias_tracker.aliased_table_for(
               reflection.table_name,
-              table_alias_for(reflection, parent, reflection != node.reflection)
+              table_alias_for(reflection, parent, reflection != node.reflection),
+              reflection.klass.type_caster
             )
           }
         end

data/lib/active_record/attribute_mutation_tracker.rb

@@ -26,6 +26,7 @@ module ActiveRecord
     end
 
     def change_to_attribute(attr_name)
+      attr_name = attr_name.to_s
       if changed?(attr_name)
         [attributes[attr_name].original_value, attributes.fetch_value(attr_name)]
       end
@@ -44,7 +45,7 @@ module ActiveRecord
     end
 
     def changed_in_place?(attr_name)
-      attributes[attr_name].changed_in_place?
+      attributes[attr_name.to_s].changed_in_place?
     end
 
     def forget_change(attr_name)
@@ -54,7 +55,7 @@ module ActiveRecord
     end
 
     def original_value(attr_name)
-      attributes[attr_name].original_value
+      attributes[attr_name.to_s].original_value
     end
 
     def force_change(attr_name)

data/lib/active_record/gem_version.rb

@@ -7,8 +7,8 @@ module ActiveRecord
   module VERSION
     MAJOR = 5
     MINOR = 1
-    TINY  = 2
-    PRE   = nil
+    TINY  = 3
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_record/reflection.rb

@@ -197,10 +197,8 @@ module ActiveRecord
       end
 
       def klass_join_scope(table, predicate_builder) # :nodoc:
-        if klass.current_scope
-          klass.current_scope.clone.tap { |scope|
-            scope.joins_values = scope.left_outer_joins_values = [].freeze
-          }
+        if klass.current_scope && klass.current_scope.values.empty?
+          klass.unscoped
         else
           relation = ActiveRecord::Relation.create(
             klass,

data/lib/active_record/relation.rb

@@ -332,7 +332,7 @@ module ActiveRecord
     # Please check unscoped if you want to remove all previous scopes (including
     # the default_scope) during the execution of a block.
     def scoping
-      previous, klass.current_scope = klass.current_scope, self
+      previous, klass.current_scope = klass.current_scope(true), self
       yield
     ensure
       klass.current_scope = previous

data/lib/active_record/scoping.rb

@@ -10,8 +10,8 @@ module ActiveRecord
     end
 
     module ClassMethods
-      def current_scope #:nodoc:
-        ScopeRegistry.value_for(:current_scope, self)
+      def current_scope(skip_inherited_scope = false) # :nodoc:
+        ScopeRegistry.value_for(:current_scope, self, skip_inherited_scope)
       end
 
       def current_scope=(scope) #:nodoc:
@@ -75,8 +75,9 @@ module ActiveRecord
       end
 
       # Obtains the value for a given +scope_type+ and +model+.
-      def value_for(scope_type, model)
+      def value_for(scope_type, model, skip_inherited_scope = false)
         raise_invalid_scope_type!(scope_type)
+        return @registry[scope_type][model.name] if skip_inherited_scope
         klass = model
         base = model.base_class
         while klass <= base

data/lib/active_record/tasks/database_tasks.rb

@@ -260,7 +260,7 @@ module ActiveRecord
       def check_schema_file(filename)
         unless File.exist?(filename)
           message = %{#{filename} doesn't exist yet. Run `rails db:migrate` to create it, then try again.}
-          message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails)
+          message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails.root)
           Kernel.abort message
         end
       end

data/lib/active_record/tasks/mysql_database_tasks.rb

@@ -59,8 +59,8 @@ module ActiveRecord
         args.concat(["--no-data"])
         args.concat(["--routines"])
         args.concat(["--skip-comments"])
-        args.concat(Array(extra_flags)) if extra_flags
         args.concat(["#{configuration['database']}"])
+        args.unshift(*extra_flags) if extra_flags
 
         run_cmd("mysqldump", args, "dumping")
       end
@@ -69,7 +69,7 @@ module ActiveRecord
         args = prepare_command_options
         args.concat(["--execute", %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}])
         args.concat(["--database", "#{configuration['database']}"])
-        args.concat(Array(extra_flags)) if extra_flags
+        args.unshift(*extra_flags) if extra_flags
 
         run_cmd("mysql", args, "loading")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -333,9 +333,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12