activerecord 4.1.12 → 4.1.13.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a37cee4486a59afc3ec2e4595755fe94dcd0590a
-  data.tar.gz: 50b460a2440aa47b459f07b4cd1d0e65a16d5c2d
+  metadata.gz: ba5e328ca51b78cf16618659ee5b14ee4e073ea3
+  data.tar.gz: 961de4084df9b8222d86791076699acdf72b9274
 SHA512:
-  metadata.gz: 5fd3eacbf0f3f9a726b85112fcef0f3dcd7f075ddbfe2a9141a5ea129eec4eb69e7d267effa73a141b8fe8eb5192c136e318036591515c70d7793258ac5e2252
-  data.tar.gz: fa185aba86e7dece57b160ab6a59fe8d1e5bc7f99f4e41011f673e4888e6b5aabfc9fd135b5fbab68f397f7f5bfd1201a3e2240ac3110000ebfa568955b5d656
+  metadata.gz: e8661cded3aebec52b18822698a172ab529b262d9cf3497e61fc51f7925793d0aab5f4cdf16af09b6689453e633ec55da06c893e4f4b1471161e7ee6b89f4141
+  data.tar.gz: 7e62a195a821ec377c76590e42036fcfc48addecf6b73b5f8ac8970a598f918c324f96c4b6e1aab6610c113852d29269956025ac96e3569794d6c0478897a599

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 4.1.13 (August 14, 2015) ##
+
+*   Don't define autosave association callbacks twice from
+    `accepts_nested_attributes_for`.
+
+    Fixes #18704.
+
+    *Sean Griffin*
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   Raises the right exception when declares a has many through

data/lib/active_record/attribute_assignment.rb

@@ -43,7 +43,7 @@ module ActiveRecord
 
     def _assign_attribute(k, v)
       public_send("#{k}=", v)
-    rescue NoMethodError
+    rescue NoMethodError, NameError
       if respond_to?("#{k}=")
         raise
       else

data/lib/active_record/autosave_association.rb

@@ -177,10 +177,8 @@ module ActiveRecord
         # before actually defining them.
         def add_autosave_association_callbacks(reflection)
           save_method = :"autosave_associated_records_for_#{reflection.name}"
-          validation_method = :"validate_associated_records_for_#{reflection.name}"
-          collection = reflection.collection?
 
-          if collection
+          if reflection.collection?
             before_save :before_save_collection_association
 
             define_non_cyclic_method(save_method) { save_collection_association(reflection) }
@@ -204,9 +202,22 @@ module ActiveRecord
             before_save save_method
           end
 
+          define_autosave_validation_callbacks(reflection)
+        end
+
+        def define_autosave_validation_callbacks(reflection)
+          validation_method = :"validate_associated_records_for_#{reflection.name}"
           if reflection.validate? && !method_defined?(validation_method)
-            method = (collection ? :validate_collection_association : :validate_single_association)
-            define_non_cyclic_method(validation_method) { send(method, reflection) }
+            if reflection.collection?
+              method = :validate_collection_association
+            else
+              method = :validate_single_association
+            end
+
+            define_non_cyclic_method(validation_method) do
+              send(method, reflection)
+              true
+            end
             validate validation_method
           end
         end

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -273,7 +273,7 @@ module ActiveRecord
       end
 
       def full_version
-        @full_version ||= @connection.info[:version]
+        @full_version ||= @connection.server_info[:version]
       end
 
       def set_field_encoding field_name

data/lib/active_record/gem_version.rb

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

data/lib/active_record/nested_attributes.rb

@@ -307,7 +307,7 @@ module ActiveRecord
         attr_names.each do |association_name|
           if reflection = _reflect_on_association(association_name)
             reflection.autosave = true
-            add_autosave_association_callbacks(reflection)
+            define_autosave_validation_callbacks(reflection)
 
             nested_attributes_options = self.nested_attributes_options.dup
             nested_attributes_options[association_name.to_sym] = options

data/lib/active_record/railtie.rb

@@ -142,8 +142,8 @@ module ActiveRecord
       ActiveSupport.on_load(:active_record) do
         ActionDispatch::Reloader.send(hook) do
           if ActiveRecord::Base.connected?
-            ActiveRecord::Base.clear_reloadable_connections!
             ActiveRecord::Base.clear_cache!
+            ActiveRecord::Base.clear_reloadable_connections!
           end
         end
       end

data/lib/active_record/relation/query_methods.rb

@@ -867,9 +867,11 @@ module ActiveRecord
 
       # Reorder bind indexes if joins produced bind values
       bvs = arel.bind_values + bind_values
-      arel.ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
-        column = bvs[i].first
-        bp.replace connection.substitute_at(column, i)
+      if bvs.any?
+        arel.ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
+          column = bvs[i].first
+          bp.replace connection.substitute_at(column, i)
+        end
       end
 
       arel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.1.13.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -243,13 +243,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
+has_rdoc: