activerecord 5.0.4 → 5.0.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eca3e3f02b5c620934a1b3ab183e14a4609e771
-  data.tar.gz: 6fe3749bd3cd13730eb11a9bdd58df62409dd294
+  metadata.gz: b4042b908218970c6108733c2c25bdc9cc356eda
+  data.tar.gz: 2c662c7c3272436fe8fa5db90d0fad2057a38d24
 SHA512:
-  metadata.gz: cf64a336b40fe95cdcd07c147e74ffbc1a6ce52a74a5f1d1ff1b7924825c520b7965fe4a8c57285b6fc3e114447f8ad51e5f1f1512681cd699d336ebc502be8d
-  data.tar.gz: c09c508e3ea5b0eca89ed3f5d60a52376a9f9d3853c8b07ee41d1426d1d0c28127fdecf5d645bbb37f5b09d024dae83d30d50fa47275cd1960ed3844dc518781
+  metadata.gz: 97283df40ca9a7c95eb62eead19a2f4be440257d3cf2f37bc32d5aa7e79d287e2c7be55e89c5aafd95c9c795f1d2a8241e9ff001a8bd610460f388819ee82527
+  data.tar.gz: 42ccb2c1873ab975b3a0589eac5ae7c0ece7fea02ad70134360e088574eab7b29ae05841c5a2cc7ad60ba98be20e987e954df9c879ad735d7f1097644ca2cf48

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 5.0.5.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*
+
+
 ## Rails 5.0.4 (June 19, 2017) ##
 
 *   Restore previous behavior of collection proxies: their values can have

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

@@ -55,8 +55,8 @@ module ActiveRecord
             scope_chain_index += 1
 
             klass_scope =
-              if klass.current_scope
-                klass.current_scope.clone
+              if klass.current_scope && klass.current_scope.values.empty?
+                klass.unscoped
               else
                 relation = ActiveRecord::Relation.create(
                   klass,

data/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -986,7 +986,7 @@ module ActiveRecord
 
       def dump_schema_information #:nodoc:
         versions = ActiveRecord::SchemaMigration.order('version').pluck(:version)
-        insert_versions_sql(versions)
+        insert_versions_sql(versions) if versions.any?
       end
 
       def insert_versions_sql(versions) # :nodoc:

data/lib/active_record/gem_version.rb

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 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.0.4
+        version: 5.0.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -323,9 +323,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