activerecord 4.2.9 → 4.2.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4500037107cdc98ddc3db0bac7771c650acf7f68
-  data.tar.gz: 3eb29ccdb7b58d87fa7a1fa5ebe12ab3fcb2537a
+  metadata.gz: ce3bb552111036480d10adace4def3eeca1935ab
+  data.tar.gz: 157e74c06567e32410d53958fa6077916eb902fe
 SHA512:
-  metadata.gz: 6be857910cc7b548e0b71aaf6c9c21d455f78b8d29ec7f1067408989805c94312735ad6c4065d674afec5a38ebbad617ba5f4a39866099db4de35ff764cbc263
-  data.tar.gz: 54dcd7d248f6d6564bc208250227dd2cedaea847382e56c5c6473ec20d28169575afa974026c45c8ff93a76fd19e83b1ce72e393d30b91b76092e87f147b52a4
+  metadata.gz: dde61f494e7197966258b749cdc8036116da0ac2f14c31b11d15731d6b053ac15250cb39a7e97b662098c78aecfa8c8ace22add25ed9f827cd75ab053d632d39
+  data.tar.gz: 224b521f4fa07428ea3557c5589a62b5f164927180a00aa6b73f7dd1bf6025bef7cb25b543f4903ba77bfe54ec578d06a88c77afadbbb7cb2956ae1dc35d3613

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 4.2.10.rc1 (September 20, 2017) ##
+
+*   `Relation#joins` is no longer affected by the target model's
+    `current_scope`, with the exception of `unscoped`.
+
+    Fixes #29338.
+
+    *Sean Griffin*
+
 ## Rails 4.2.9 (June 26, 2017) ##
 
 *   Fix regression caused by `collection_singular_ids=` ignoring different primary key on relationship.

data/lib/active_record/associations/join_dependency/join_association.rb

@@ -53,10 +53,8 @@ module ActiveRecord
             scope_chain_index += 1
 
             klass_scope =
-              if klass.current_scope
-                klass.current_scope.clone.tap { |scope|
-                  scope.joins_values = []
-                }
+              if klass.current_scope && klass.current_scope.values.blank?
+                klass.unscoped
               else
                 klass.send(:build_default_scope, ActiveRecord::Relation.create(klass, table))
               end

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -282,6 +282,14 @@ module ActiveRecord
         0
       end
 
+      def quoted_date(value)
+        if supports_datetime_with_precision? && value.acts_like?(:time) && value.respond_to?(:usec)
+          "#{super}.#{sprintf("%06d", value.usec)}"
+        else
+          super
+        end
+      end
+
       # REFERENTIAL INTEGRITY ====================================
 
       def disable_referential_integrity #:nodoc:

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -74,14 +74,6 @@ module ActiveRecord
         @connection.escape(string)
       end
 
-      def quoted_date(value)
-        if supports_datetime_with_precision? && value.acts_like?(:time) && value.respond_to?(:usec)
-          "#{super}.#{sprintf("%06d", value.usec)}"
-        else
-          super
-        end
-      end
-
       #--
       # CONNECTION MANAGEMENT ====================================
       #++

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -282,6 +282,10 @@ module ActiveRecord
               super
             end
           end
+
+          def has_precision?
+            precision || 0
+          end
         end
 
         class Time < Type::Time # :nodoc:
@@ -328,8 +332,11 @@ module ActiveRecord
 
       def initialize_type_map(m) # :nodoc:
         super
-        m.register_type %r(datetime)i, Fields::DateTime.new
         m.register_type %r(time)i,     Fields::Time.new
+        m.register_type(%r(datetime)i) do |sql_type|
+          precision = extract_precision(sql_type)
+          Fields::DateTime.new(precision: precision)
+        end
       end
 
       def exec_without_stmt(sql, name = 'SQL') # :nodoc:

data/lib/active_record/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.9
+  version: 4.2.10.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 4.2.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 4.2.10.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 4.2.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 4.2.10.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -299,12 +299,12 @@ 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.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).