activerecord 5.2.0.rc1 → 5.2.0.rc2

data/lib/active_record/query_cache.rb

@@ -7,20 +7,20 @@ module ActiveRecord
       # Enable the query cache within the block if Active Record is configured.
       # If it's not, it will execute the given block.
       def cache(&block)
-        if configurations.empty?
-          yield
-        else
+        if connected? || !configurations.empty?
           connection.cache(&block)
+        else
+          yield
         end
       end
 
       # Disable the query cache within the block if Active Record is configured.
       # If it's not, it will execute the given block.
       def uncached(&block)
-        if configurations.empty?
-          yield
-        else
+        if connected? || !configurations.empty?
           connection.uncached(&block)
+        else
+          yield
         end
       end
     end

data/lib/active_record/railties/databases.rake

@@ -229,7 +229,7 @@ db_namespace = namespace :db do
       base_dir = ActiveRecord::Tasks::DatabaseTasks.fixtures_path
 
       Dir["#{base_dir}/**/*.yml"].each do |file|
-        if data = YAML::load(ERB.new(IO.read(file)).result)
+        if data = YAML.load(ERB.new(IO.read(file)).result)
           data.each_key do |key|
             key_id = ActiveRecord::FixtureSet.identify(key)
 

data/lib/active_record/reflection.rb

@@ -193,7 +193,7 @@ module ActiveRecord
         klass_scope       = klass_join_scope(table, predicate_builder)
 
         if type
-          klass_scope.where!(type => foreign_klass.base_class.sti_name)
+          klass_scope.where!(type => foreign_klass.polymorphic_name)
         end
 
         scope_chain_items.inject(klass_scope, &:merge!)
@@ -416,6 +416,9 @@ module ActiveRecord
     # Active Record class.
     class AssociationReflection < MacroReflection #:nodoc:
       def compute_class(name)
+        if polymorphic?
+          raise ArgumentError, "Polymorphic association does not support to compute class."
+        end
         active_record.send(:compute_type, name)
       end
 
@@ -626,9 +629,6 @@ module ActiveRecord
         # +automatic_inverse_of+ method is a valid reflection. We must
         # make sure that the reflection's active_record name matches up
         # with the current reflection's klass name.
-        #
-        # Note: klass will always be valid because when there's a NameError
-        # from calling +klass+, +reflection+ will already be set to false.
         def valid_inverse_reflection?(reflection)
           reflection &&
             klass <= reflection.active_record &&
@@ -732,6 +732,9 @@ module ActiveRecord
       end
 
       private
+        def can_find_inverse_of_automatically?(_)
+          !polymorphic? && super
+        end
 
         def calculate_constructable(macro, options)
           !polymorphic?

data/lib/active_record/relation/calculations.rb

@@ -132,7 +132,7 @@ module ActiveRecord
       if has_include?(column_name)
         relation = apply_join_dependency
 
-        if operation.to_s.downcase == "count" && !distinct_value
+        if operation.to_s.downcase == "count"
           relation.distinct!
           # PostgreSQL: ORDER BY expressions must appear in SELECT list when using DISTINCT
           if (column_name == :all || column_name.nil?) && select_values.empty?

data/lib/active_record/relation/finder_methods.rb

@@ -371,16 +371,16 @@ module ActiveRecord
         relation
       end
 
-      def construct_join_dependency(eager_loading: true)
+      def construct_join_dependency
         including = eager_load_values + includes_values
         joins = joins_values.select { |join| join.is_a?(Arel::Nodes::Join) }
         ActiveRecord::Associations::JoinDependency.new(
-          klass, table, including, alias_tracker(joins), eager_loading: eager_loading
+          klass, table, including, alias_tracker(joins)
         )
       end
 
       def apply_join_dependency(eager_loading: true)
-        join_dependency = construct_join_dependency(eager_loading: eager_loading)
+        join_dependency = construct_join_dependency
         relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
 
         if eager_loading && !using_limitable_reflections?(join_dependency.reflections)

data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb

@@ -25,19 +25,21 @@ module ActiveRecord
       private
         def type_to_ids_mapping
           default_hash = Hash.new { |hsh, key| hsh[key] = [] }
-          values.each_with_object(default_hash) { |value, hash| hash[base_class(value).name] << convert_to_id(value) }
+          values.each_with_object(default_hash) do |value, hash|
+            hash[klass(value).polymorphic_name] << convert_to_id(value)
+          end
         end
 
         def primary_key(value)
-          associated_table.association_join_primary_key(base_class(value))
+          associated_table.association_join_primary_key(klass(value))
         end
 
-        def base_class(value)
+        def klass(value)
           case value
           when Base
-            value.class.base_class
+            value.class
           when Relation
-            value.klass.base_class
+            value.klass
           end
         end
 

data/lib/active_record/relation/predicate_builder/range_handler.rb

@@ -16,15 +16,16 @@ module ActiveRecord
       def call(attribute, value)
         begin_bind = predicate_builder.build_bind_attribute(attribute.name, value.begin)
         end_bind = predicate_builder.build_bind_attribute(attribute.name, value.end)
-        if value.begin.respond_to?(:infinite?) && value.begin.infinite?
-          if value.end.respond_to?(:infinite?) && value.end.infinite?
+
+        if begin_bind.value.infinity?
+          if end_bind.value.infinity?
             attribute.not_in([])
           elsif value.exclude_end?
             attribute.lt(end_bind)
           else
             attribute.lteq(end_bind)
           end
-        elsif value.end.respond_to?(:infinite?) && value.end.infinite?
+        elsif end_bind.value.infinity?
           attribute.gteq(begin_bind)
         elsif value.exclude_end?
           attribute.gteq(begin_bind).and(attribute.lt(end_bind))

data/lib/active_record/relation/query_attribute.rb

@@ -21,6 +21,23 @@ module ActiveRecord
         !value_before_type_cast.is_a?(StatementCache::Substitute) &&
           (value_before_type_cast.nil? || value_for_database.nil?)
       end
+
+      def boundable?
+        return @_boundable if defined?(@_boundable)
+        nil?
+        @_boundable = true
+      rescue ::RangeError
+        @_boundable = false
+      end
+
+      def infinity?
+        _infinity?(value_before_type_cast) || boundable? && _infinity?(value_for_database)
+      end
+
+      private
+        def _infinity?(value)
+          value.respond_to?(:infinite?) && value.infinite?
+        end
     end
   end
 end

data/lib/active_record/validations/uniqueness.rb

@@ -23,7 +23,7 @@ module ActiveRecord
         relation = build_relation(finder_class, attribute, value)
         if record.persisted?
           if finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id_in_database || record.id)
+            relation = relation.where.not(finder_class.primary_key => record.id_in_database)
           else
             raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb
 - lib/active_record/connection_adapters/postgresql/oid/bytea.rb
 - lib/active_record/connection_adapters/postgresql/oid/cidr.rb
+- lib/active_record/connection_adapters/postgresql/oid/date.rb
 - lib/active_record/connection_adapters/postgresql/oid/date_time.rb
 - lib/active_record/connection_adapters/postgresql/oid/decimal.rb
 - lib/active_record/connection_adapters/postgresql/oid/enum.rb
@@ -306,8 +307,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc1/activerecord
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc1/activerecord/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc2/activerecord
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc2/activerecord/CHANGELOG.md
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -326,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).