activerecord 5.1.5 → 5.2.1

data/lib/active_record/type/json.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Type
+    class Json < ActiveModel::Type::Value
+      include ActiveModel::Type::Helpers::Mutable
+
+      def type
+        :json
+      end
+
+      def deserialize(value)
+        return value unless value.is_a?(::String)
+        ActiveSupport::JSON.decode(value) rescue nil
+      end
+
+      def serialize(value)
+        ActiveSupport::JSON.encode(value) unless value.nil?
+      end
+
+      def changed_in_place?(raw_old_value, new_value)
+        deserialize(raw_old_value) != new_value
+      end
+
+      def accessor
+        ActiveRecord::Store::StringKeyedHashAccessor
+      end
+    end
+  end
+end

data/lib/active_record/type/serialized.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Type
     class Serialized < DelegateClass(ActiveModel::Type::Value) # :nodoc:
@@ -49,6 +51,10 @@ module ActiveRecord
         end
       end
 
+      def force_equality?(value)
+        coder.respond_to?(:object_class) && value.is_a?(coder.object_class)
+      end
+
       private
 
         def default_value?(value)

data/lib/active_record/type/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Type
     class Text < ActiveModel::Type::String # :nodoc:

data/lib/active_record/type/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Type
     class Time < ActiveModel::Type::Time

data/lib/active_record/type/type_map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "concurrent/map"
 
 module ActiveRecord

data/lib/active_record/type/unsigned_integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Type
     class UnsignedInteger < ActiveModel::Type::Integer # :nodoc:

data/lib/active_record/type.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require "active_model/type"
 
-require "active_record/type/internal/abstract_json"
 require "active_record/type/internal/timezone"
 
 require "active_record/type/date"
 require "active_record/type/date_time"
 require "active_record/type/decimal_without_scale"
+require "active_record/type/json"
 require "active_record/type/time"
 require "active_record/type/text"
 require "active_record/type/unsigned_integer"
@@ -69,6 +71,7 @@ module ActiveRecord
     register(:decimal, Type::Decimal, override: false)
     register(:float, Type::Float, override: false)
     register(:integer, Type::Integer, override: false)
+    register(:json, Type::Json, override: false)
     register(:string, Type::String, override: false)
     register(:text, Type::Text, override: false)
     register(:time, Type::Time, override: false)

data/lib/active_record/type_caster/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module TypeCaster
     class Connection # :nodoc:

data/lib/active_record/type_caster/map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module TypeCaster
     class Map # :nodoc:
@@ -7,7 +9,7 @@ module ActiveRecord
 
       def type_cast_for_database(attr_name, value)
         return value if value.is_a?(Arel::Nodes::BindParam)
-        type = types.type_for_attribute(attr_name.to_s)
+        type = types.type_for_attribute(attr_name)
         type.serialize(value)
       end
 

data/lib/active_record/type_caster.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/type_caster/map"
 require "active_record/type_caster/connection"
 

data/lib/active_record/validations/absence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Validations
     class AbsenceValidator < ActiveModel::Validations::AbsenceValidator # :nodoc:

data/lib/active_record/validations/associated.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Validations
     class AssociatedValidator < ActiveModel::EachValidator #:nodoc:

data/lib/active_record/validations/length.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Validations
     class LengthValidator < ActiveModel::Validations::LengthValidator # :nodoc:

data/lib/active_record/validations/presence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Validations
     class PresenceValidator < ActiveModel::Validations::PresenceValidator # :nodoc:

data/lib/active_record/validations/uniqueness.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Validations
     class UniquenessValidator < ActiveModel::EachValidator # :nodoc:
@@ -6,6 +8,10 @@ module ActiveRecord
           raise ArgumentError, "#{options[:conditions]} was passed as :conditions but is not callable. " \
                                "Pass a callable instead: `conditions: -> { where(approved: true) }`"
         end
+        unless Array(options[:scope]).all? { |scope| scope.respond_to?(:to_sym) }
+          raise ArgumentError, "#{options[:scope]} is not supported format for :scope option. " \
+            "Pass a symbol or an array of symbols instead: `scope: :user_id`"
+        end
         super({ case_sensitive: true }.merge!(options))
         @klass = options[:class]
       end
@@ -17,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
@@ -50,7 +56,33 @@ module ActiveRecord
       end
 
       def build_relation(klass, attribute, value)
-        klass.unscoped.where!({ attribute => value }, options)
+        if reflection = klass._reflect_on_association(attribute)
+          attribute = reflection.foreign_key
+          value = value.attributes[reflection.klass.primary_key] unless value.nil?
+        end
+
+        if value.nil?
+          return klass.unscoped.where!(attribute => value)
+        end
+
+        # the attribute may be an aliased attribute
+        if klass.attribute_alias?(attribute)
+          attribute = klass.attribute_alias(attribute)
+        end
+
+        attribute_name = attribute.to_s
+        value = klass.predicate_builder.build_bind_attribute(attribute_name, value)
+
+        table = klass.arel_table
+        column = klass.columns_hash[attribute_name]
+
+        comparison = if !options[:case_sensitive]
+          # will use SQL LOWER function before comparison, unless it detects a case insensitive collation
+          klass.connection.case_insensitive_comparison(table, attribute, column, value)
+        else
+          klass.connection.case_sensitive_comparison(table, attribute, column, value)
+        end
+        klass.unscoped.where!(comparison)
       end
 
       def scope_relation(record, relation)
@@ -173,9 +205,7 @@ module ActiveRecord
       #                                      | # Boom! We now have a duplicate
       #                                      | # title!
       #
-      # This could even happen if you use transactions with the 'serializable'
-      # isolation level. The best way to work around this problem is to add a unique
-      # index to the database table using
+      # The best way to work around this problem is to add a unique index to the database table using
       # {connection.add_index}[rdoc-ref:ConnectionAdapters::SchemaStatements#add_index].
       # In the rare case that a race condition occurs, the database will guarantee
       # the field's uniqueness.
@@ -187,7 +217,7 @@ module ActiveRecord
       # can catch it and restart the transaction (e.g. by telling the user
       # that the title already exists, and asking them to re-enter the title).
       # This technique is also known as
-      # {optimistic concurrency control}[http://en.wikipedia.org/wiki/Optimistic_concurrency_control].
+      # {optimistic concurrency control}[https://en.wikipedia.org/wiki/Optimistic_concurrency_control].
       #
       # The bundled ActiveRecord::ConnectionAdapters distinguish unique index
       # constraint errors from other types of database errors by throwing an

data/lib/active_record/validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   # = Active Record \RecordInvalid
   #

data/lib/active_record/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "gem_version"
 
 module ActiveRecord

data/lib/active_record.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# Copyright (c) 2004-2017 David Heinemeier Hansson
+# Copyright (c) 2004-2018 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,14 +27,14 @@ require "active_support"
 require "active_support/rails"
 require "active_model"
 require "arel"
+require "yaml"
 
 require "active_record/version"
-require "active_record/attribute_set"
+require "active_model/attribute_set"
 
 module ActiveRecord
   extend ActiveSupport::Autoload
 
-  autoload :Attribute
   autoload :Base
   autoload :Callbacks
   autoload :Core
@@ -102,6 +104,7 @@ module ActiveRecord
 
     autoload :Result
     autoload :TableMetadata
+    autoload :Type
   end
 
   module Coders
@@ -177,5 +180,9 @@ ActiveSupport.on_load(:active_record) do
 end
 
 ActiveSupport.on_load(:i18n) do
-  I18n.load_path << File.dirname(__FILE__) + "/active_record/locale/en.yml"
+  I18n.load_path << File.expand_path("active_record/locale/en.yml", __dir__)
 end
+
+YAML.load_tags["!ruby/object:ActiveRecord::AttributeSet"] = "ActiveModel::AttributeSet"
+YAML.load_tags["!ruby/object:ActiveRecord::Attribute::FromDatabase"] = "ActiveModel::Attribute::FromDatabase"
+YAML.load_tags["!ruby/object:ActiveRecord::LazyAttributeHash"] = "ActiveModel::LazyAttributeHash"

data/lib/rails/generators/active_record/application_record/application_record_generator.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
+
+module ActiveRecord
+  module Generators # :nodoc:
+    class ApplicationRecordGenerator < ::Rails::Generators::Base # :nodoc:
+      source_root File.expand_path("templates", __dir__)
+
+      # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required.
+      def create_application_record
+        template "application_record.rb", application_record_file_name
+      end
+
+      private
+
+        def application_record_file_name
+          @application_record_file_name ||=
+            if namespaced?
+              "app/models/#{namespaced_path}/application_record.rb"
+            else
+              "app/models/application_record.rb"
+            end
+        end
+    end
+  end
+end

data/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/active_record"
 
 module ActiveRecord
@@ -26,7 +28,7 @@ module ActiveRecord
         def set_local_assigns!
           @migration_template = "migration.rb"
           case file_name
-          when /^(add|remove)_.*_(?:to|from)_(.*)/
+          when /^(add)_.*_to_(.*)/, /^(remove)_.*?_from_(.*)/
             @migration_action = $1
             @table_name       = normalize_table_name($2)
           when /join_table/

data/lib/rails/generators/active_record/migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/migration"
 
 module ActiveRecord

data/lib/rails/generators/active_record/model/model_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/active_record"
 
 module ActiveRecord
@@ -21,13 +23,11 @@ module ActiveRecord
       end
 
       def create_model_file
-        generate_application_record
         template "model.rb", File.join("app/models", class_path, "#{file_name}.rb")
       end
 
       def create_module_file
         return if regular_class_path.empty?
-        generate_application_record
         template "module.rb", File.join("app/models", "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
@@ -39,31 +39,10 @@ module ActiveRecord
           attributes.select { |a| !a.reference? && a.has_index? }
         end
 
-        # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required.
-        def generate_application_record
-          if behavior == :invoke && !application_record_exist?
-            template "application_record.rb", application_record_file_name
-          end
-        end
-
         # Used by the migration template to determine the parent name of the model
         def parent_class_name
           options[:parent] || "ApplicationRecord"
         end
-
-        def application_record_exist?
-          file_exist = nil
-          in_root { file_exist = File.exist?(application_record_file_name) }
-          file_exist
-        end
-
-        def application_record_file_name
-          @application_record_file_name ||= if mountable_engine?
-            "app/models/#{namespaced_path}/application_record.rb"
-          else
-            "app/models/application_record.rb"
-          end
-        end
     end
   end
 end

data/lib/rails/generators/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/named_base"
 require "rails/generators/active_model"
 require "rails/generators/active_record/migration"
@@ -10,7 +12,7 @@ module ActiveRecord
 
       # Set the current directory as base for the inherited generators.
       def self.base_root
-        File.dirname(__FILE__)
+        __dir__
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.1.5
+  version: 5.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 description: Databases on Rails. Build a persistent domain model by mapping database
   tables to Ruby classes. Strong conventions for associations, validations, aggregations,
   migrations, and testing come baked-in.
@@ -95,18 +95,9 @@ files:
 - lib/active_record/associations/join_dependency/join_part.rb
 - lib/active_record/associations/preloader.rb
 - lib/active_record/associations/preloader/association.rb
-- lib/active_record/associations/preloader/belongs_to.rb
-- lib/active_record/associations/preloader/collection_association.rb
-- lib/active_record/associations/preloader/has_many.rb
-- lib/active_record/associations/preloader/has_many_through.rb
-- lib/active_record/associations/preloader/has_one.rb
-- lib/active_record/associations/preloader/has_one_through.rb
-- lib/active_record/associations/preloader/singular_association.rb
 - lib/active_record/associations/preloader/through_association.rb
 - lib/active_record/associations/singular_association.rb
 - lib/active_record/associations/through_association.rb
-- lib/active_record/attribute.rb
-- lib/active_record/attribute/user_provided_default.rb
 - lib/active_record/attribute_assignment.rb
 - lib/active_record/attribute_decorators.rb
 - lib/active_record/attribute_methods.rb
@@ -118,10 +109,6 @@ files:
 - lib/active_record/attribute_methods/serialization.rb
 - lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/write.rb
-- lib/active_record/attribute_mutation_tracker.rb
-- lib/active_record/attribute_set.rb
-- lib/active_record/attribute_set/builder.rb
-- lib/active_record/attribute_set/yaml_encoder.rb
 - lib/active_record/attributes.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
@@ -164,12 +151,12 @@ 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
 - lib/active_record/connection_adapters/postgresql/oid/hstore.rb
 - lib/active_record/connection_adapters/postgresql/oid/inet.rb
-- lib/active_record/connection_adapters/postgresql/oid/json.rb
 - lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
 - lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb
 - lib/active_record/connection_adapters/postgresql/oid/money.rb
@@ -236,7 +223,6 @@ files:
 - lib/active_record/railties/console_sandbox.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
-- lib/active_record/railties/jdbcmysql_error.rb
 - lib/active_record/readonly_attributes.rb
 - lib/active_record/reflection.rb
 - lib/active_record/relation.rb
@@ -249,10 +235,10 @@ files:
 - lib/active_record/relation/merger.rb
 - lib/active_record/relation/predicate_builder.rb
 - lib/active_record/relation/predicate_builder/array_handler.rb
-- lib/active_record/relation/predicate_builder/association_query_handler.rb
+- lib/active_record/relation/predicate_builder/association_query_value.rb
 - lib/active_record/relation/predicate_builder/base_handler.rb
 - lib/active_record/relation/predicate_builder/basic_object_handler.rb
-- lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb
+- lib/active_record/relation/predicate_builder/polymorphic_array_value.rb
 - lib/active_record/relation/predicate_builder/range_handler.rb
 - lib/active_record/relation/predicate_builder/relation_handler.rb
 - lib/active_record/relation/query_attribute.rb
@@ -290,8 +276,8 @@ files:
 - lib/active_record/type/date_time.rb
 - lib/active_record/type/decimal_without_scale.rb
 - lib/active_record/type/hash_lookup_type_map.rb
-- lib/active_record/type/internal/abstract_json.rb
 - lib/active_record/type/internal/timezone.rb
+- lib/active_record/type/json.rb
 - lib/active_record/type/serialized.rb
 - lib/active_record/type/text.rb
 - lib/active_record/type/time.rb
@@ -308,20 +294,21 @@ files:
 - lib/active_record/validations/uniqueness.rb
 - lib/active_record/version.rb
 - lib/rails/generators/active_record.rb
+- lib/rails/generators/active_record/application_record/application_record_generator.rb
+- lib/rails/generators/active_record/application_record/templates/application_record.rb.tt
 - lib/rails/generators/active_record/migration.rb
 - lib/rails/generators/active_record/migration/migration_generator.rb
-- lib/rails/generators/active_record/migration/templates/create_table_migration.rb
-- lib/rails/generators/active_record/migration/templates/migration.rb
+- lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt
+- lib/rails/generators/active_record/migration/templates/migration.rb.tt
 - lib/rails/generators/active_record/model/model_generator.rb
-- lib/rails/generators/active_record/model/templates/application_record.rb
-- lib/rails/generators/active_record/model/templates/model.rb
-- lib/rails/generators/active_record/model/templates/module.rb
+- lib/rails/generators/active_record/model/templates/model.rb.tt
+- lib/rails/generators/active_record/model/templates/module.rb.tt
 homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.1.5/activerecord
-  changelog_uri: https://github.com/rails/rails/blob/v5.1.5/activerecord/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.1/activerecord
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.1/activerecord/CHANGELOG.md
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -340,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 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).

data/lib/active_record/associations/preloader/belongs_to.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class BelongsTo < SingularAssociation #:nodoc:
-        def association_key_name
-          reflection.options[:primary_key] || klass && klass.primary_key
-        end
-
-        def owner_key_name
-          reflection.foreign_key
-        end
-      end
-    end
-  end
-end

data/lib/active_record/associations/preloader/collection_association.rb

@@ -1,17 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class CollectionAssociation < Association #:nodoc:
-        private
-
-          def preload(preloader)
-            associated_records_by_owner(preloader).each do |owner, records|
-              association = owner.association(reflection.name)
-              association.loaded!
-              association.target.concat(records)
-            end
-          end
-      end
-    end
-  end
-end

data/lib/active_record/associations/preloader/has_many.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class HasMany < CollectionAssociation #:nodoc:
-        def association_key_name
-          reflection.foreign_key
-        end
-
-        def owner_key_name
-          reflection.active_record_primary_key
-        end
-      end
-    end
-  end
-end