activerecord 6.0.1 → 6.0.3

data/lib/active_record/relation.rb

@@ -385,6 +385,15 @@ module ActiveRecord
     end
     private :compute_cache_version
 
+    # Returns a cache key along with the version.
+    def cache_key_with_version
+      if version = cache_version
+        "#{cache_key}-#{version}"
+      else
+        cache_key
+      end
+    end
+
     # Scope all queries to the current scope.
     #
     #   Comment.where(post_id: 1).scoping do
@@ -479,7 +488,9 @@ module ActiveRecord
 
       if touch
         names = touch if touch != true
-        touch_updates = klass.touch_attributes_with_time(*names)
+        names = Array.wrap(names)
+        options = names.extract_options!
+        touch_updates = klass.touch_attributes_with_time(*names, **options)
         updates.merge!(touch_updates) unless touch_updates.empty?
       end
 

data/lib/active_record/relation/batches.rb

@@ -258,7 +258,6 @@ module ActiveRecord
     end
 
     private
-
       def apply_limits(relation, start, finish)
         relation = apply_start_limit(relation, start) if start
         relation = apply_finish_limit(relation, finish) if finish

data/lib/active_record/relation/calculations.rb

@@ -172,7 +172,7 @@ module ActiveRecord
     #   # SELECT people.id FROM people WHERE people.age = 21 LIMIT 5
     #   # => [2, 3]
     #
-    #   Person.pluck('DATEDIFF(updated_at, created_at)')
+    #   Person.pluck(Arel.sql('DATEDIFF(updated_at, created_at)'))
     #   # SELECT DATEDIFF(updated_at, created_at) FROM people
     #   # => ['0', '27761', '173']
     #

data/lib/active_record/relation/delegation.rb

@@ -60,15 +60,17 @@ module ActiveRecord
           return if method_defined?(method)
 
           if /\A[a-zA-Z_]\w*[!?]?\z/.match?(method)
+            definition = RUBY_VERSION >= "2.7" ? "..." : "*args, &block"
             module_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{method}(*args, &block)
-                scoping { klass.#{method}(*args, &block) }
+              def #{method}(#{definition})
+                scoping { klass.#{method}(#{definition}) }
               end
             RUBY
           else
             define_method(method) do |*args, &block|
               scoping { klass.public_send(method, *args, &block) }
             end
+            ruby2_keywords(method) if respond_to?(:ruby2_keywords, true)
           end
         end
       end
@@ -99,7 +101,6 @@ module ActiveRecord
       end
 
       private
-
         def method_missing(method, *args, &block)
           if @klass.respond_to?(method)
             @klass.generate_relation_method(method)
@@ -108,15 +109,15 @@ module ActiveRecord
             super
           end
         end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
 
     module ClassMethods # :nodoc:
-      def create(klass, *args)
-        relation_class_for(klass).new(klass, *args)
+      def create(klass, *args, **kwargs)
+        relation_class_for(klass).new(klass, *args, **kwargs)
       end
 
       private
-
         def relation_class_for(klass)
           klass.relation_delegate_class(self)
         end

data/lib/active_record/relation/finder_methods.rb

@@ -346,7 +346,6 @@ module ActiveRecord
     end
 
     private
-
       def offset_index
         offset_value || 0
       end

data/lib/active_record/relation/from_clause.rb

@@ -18,6 +18,10 @@ module ActiveRecord
         value.nil?
       end
 
+      def ==(other)
+        self.class == other.class && value == other.value && name == other.name
+      end
+
       def self.empty
         @empty ||= new(nil, nil)
       end

data/lib/active_record/relation/merger.rb

@@ -89,7 +89,6 @@ module ActiveRecord
       end
 
       private
-
         def merge_preloads
           return if other.preload_values.empty? && other.includes_values.empty?
 

data/lib/active_record/relation/predicate_builder.rb

@@ -67,7 +67,7 @@ module ActiveRecord
 
         attributes.flat_map do |key, value|
           if value.is_a?(Hash) && !table.has_column?(key)
-            associated_predicate_builder(key).expand_from_hash(value)
+            table.associated_predicate_builder(key).expand_from_hash(value)
           elsif table.associated_with?(key)
             # Find the foreign key when using queries such as:
             # Post.where(author: author)
@@ -114,10 +114,6 @@ module ActiveRecord
     private
       attr_reader :table
 
-      def associated_predicate_builder(association_name)
-        self.class.new(table.associated_table(association_name))
-      end
-
       def convert_dot_notation_to_hash(attributes)
         dot_notation = attributes.select do |k, v|
           k.include?(".") && !v.is_a?(Hash)

data/lib/active_record/relation/query_methods.rb

@@ -51,8 +51,16 @@ module ActiveRecord
         if not_behaves_as_nor?(opts)
           ActiveSupport::Deprecation.warn(<<~MSG.squish)
             NOT conditions will no longer behave as NOR in Rails 6.1.
-            To continue using NOR conditions, NOT each conditions manually
-            (`#{ opts.keys.map { |key| ".where.not(#{key.inspect} => ...)" }.join }`).
+            To continue using NOR conditions, NOT each condition individually
+            (`#{
+              opts.flat_map { |key, value|
+                if value.is_a?(Hash) && value.size > 1
+                  value.map { |k, v| ".where.not(#{key.inspect} => { #{k.inspect} => ... })" }
+                else
+                  ".where.not(#{key.inspect} => ...)"
+                end
+              }.join
+            }`).
           MSG
           @scope.where_clause += where_clause.invert(:nor)
         else
@@ -64,7 +72,10 @@ module ActiveRecord
 
       private
         def not_behaves_as_nor?(opts)
-          opts.is_a?(Hash) && opts.size > 1
+          return false unless opts.is_a?(Hash)
+
+          opts.any? { |k, v| v.is_a?(Hash) && v.size > 1 } ||
+            opts.size > 1
         end
     end
 
@@ -157,7 +168,7 @@ module ActiveRecord
     end
 
     def eager_load!(*args) # :nodoc:
-      self.eager_load_values += args
+      self.eager_load_values |= args
       self
     end
 
@@ -171,7 +182,7 @@ module ActiveRecord
     end
 
     def preload!(*args) # :nodoc:
-      self.preload_values += args
+      self.preload_values |= args
       self
     end
 
@@ -320,7 +331,7 @@ module ActiveRecord
     def group!(*args) # :nodoc:
       args.flatten!
 
-      self.group_values += args
+      self.group_values |= args
       self
     end
 
@@ -488,7 +499,7 @@ module ActiveRecord
     def joins!(*args) # :nodoc:
       args.compact!
       args.flatten!
-      self.joins_values += args
+      self.joins_values |= args
       self
     end
 
@@ -506,7 +517,7 @@ module ActiveRecord
     def left_outer_joins!(*args) # :nodoc:
       args.compact!
       args.flatten!
-      self.left_outer_joins_values += args
+      self.left_outer_joins_values |= args
       self
     end
 
@@ -1210,7 +1221,9 @@ module ActiveRecord
       end
 
       def table_name_matches?(from)
-        /(?:\A|(?<!FROM)\s)(?:\b#{table.name}\b|#{connection.quote_table_name(table.name)})(?!\.)/i.match?(from.to_s)
+        table_name = Regexp.escape(table.name)
+        quoted_table_name = Regexp.escape(connection.quote_table_name(table.name))
+        /(?:\A|(?<!FROM)\s)(?:\b#{table_name}\b|#{quoted_table_name})(?!\.)/i.match?(from.to_s)
       end
 
       def reverse_sql_order(order_query)

data/lib/active_record/relation/spawn_methods.rb

@@ -67,7 +67,6 @@ module ActiveRecord
     end
 
     private
-
       def relation_with(values)
         result = Relation.create(klass, values: values)
         result.extend(*extending_values) if extending_values.any?

data/lib/active_record/relation/where_clause.rb

@@ -87,7 +87,6 @@ module ActiveRecord
       end
 
       protected
-
         attr_reader :predicates
 
         def referenced_columns

data/lib/active_record/result.rb

@@ -132,7 +132,6 @@ module ActiveRecord
     end
 
     private
-
       def column_type(name, type_overrides = {})
         type_overrides.fetch(name) do
           column_types.fetch(name, Type.default_value)

data/lib/active_record/schema_migration.rb

@@ -31,7 +31,7 @@ module ActiveRecord
           version_options = connection.internal_string_options_for_primary_key
 
           connection.create_table(table_name, id: false) do |t|
-            t.string :version, version_options
+            t.string :version, **version_options
           end
         end
       end

data/lib/active_record/scoping.rb

@@ -95,7 +95,6 @@ module ActiveRecord
       end
 
       private
-
         def raise_invalid_scope_type!(scope_type)
           if !VALID_SCOPE_TYPES.include?(scope_type)
             raise ArgumentError, "Invalid scope type '#{scope_type}' sent to the registry. Scope types must be included in VALID_SCOPE_TYPES"

data/lib/active_record/scoping/default.rb

@@ -44,7 +44,6 @@ module ActiveRecord
         end
 
         private
-
           # Use this macro in your model to set a default scope for all operations on
           # the model.
           #

data/lib/active_record/scoping/named.rb

@@ -31,7 +31,7 @@ module ActiveRecord
               ActiveSupport::Deprecation.warn(<<~MSG.squish)
                 Class level methods will no longer inherit scoping from `#{scope._deprecated_scope_source}`
                 in Rails 6.1. To continue using the scoped relation, pass it into the block directly.
-                To instead access the full set of models, as Rails 6.1 will, use `#{name}.unscoped`.
+                To instead access the full set of models, as Rails 6.1 will, use `#{name}.default_scoped`.
               MSG
             end
 
@@ -53,7 +53,8 @@ module ActiveRecord
           end
         end
 
-        def default_scoped(scope = relation) # :nodoc:
+        # Returns a scope for the model with default scopes.
+        def default_scoped(scope = relation)
           build_default_scope(scope) || scope
         end
 
@@ -204,7 +205,6 @@ module ActiveRecord
         end
 
         private
-
           def valid_scope_name?(name)
             if respond_to?(name, true) && logger
               logger.warn "Creating scope :#{name}. " \

data/lib/active_record/store.rb

@@ -103,7 +103,7 @@ module ActiveRecord
     module ClassMethods
       def store(store_attribute, options = {})
         serialize store_attribute, IndifferentCoder.new(store_attribute, options[:coder])
-        store_accessor(store_attribute, options[:accessors], options.slice(:prefix, :suffix)) if options.has_key? :accessors
+        store_accessor(store_attribute, options[:accessors], **options.slice(:prefix, :suffix)) if options.has_key? :accessors
       end
 
       def store_accessor(store_attribute, *keys, prefix: nil, suffix: nil)

data/lib/active_record/suppressor.rb

@@ -40,11 +40,11 @@ module ActiveRecord
       end
     end
 
-    def save(*) # :nodoc:
+    def save(*, **) # :nodoc:
       SuppressorRegistry.suppressed[self.class.name] ? true : super
     end
 
-    def save!(*) # :nodoc:
+    def save!(*, **) # :nodoc:
       SuppressorRegistry.suppressed[self.class.name] ? true : super
     end
   end

data/lib/active_record/table_metadata.rb

@@ -45,7 +45,7 @@ module ActiveRecord
       association = klass._reflect_on_association(table_name) || klass._reflect_on_association(table_name.to_s.singularize)
 
       if !association && table_name == arel_table.name
-        return self
+        self
       elsif association && !association.polymorphic?
         association_klass = association.klass
         arel_table = association_klass.arel_table.alias(table_name)
@@ -57,6 +57,10 @@ module ActiveRecord
       end
     end
 
+    def associated_predicate_builder(table_name)
+      associated_table(table_name).predicate_builder
+    end
+
     def polymorphic_association?
       association && association.polymorphic?
     end
@@ -69,6 +73,17 @@ module ActiveRecord
       klass.reflect_on_aggregation(aggregation_name)
     end
 
+    protected
+      def predicate_builder
+        if klass
+          predicate_builder = klass.predicate_builder.dup
+          predicate_builder.instance_variable_set(:@table, self)
+          predicate_builder
+        else
+          PredicateBuilder.new(self)
+        end
+      end
+
     private
       attr_reader :klass, :types, :arel_table, :association
   end

data/lib/active_record/tasks/mysql_database_tasks.rb

@@ -69,7 +69,6 @@ module ActiveRecord
       end
 
       private
-
         attr_reader :configuration
 
         def configuration_without_database

data/lib/active_record/tasks/postgresql_database_tasks.rb

@@ -89,7 +89,6 @@ module ActiveRecord
       end
 
       private
-
         attr_reader :configuration
 
         def encoding

data/lib/active_record/tasks/sqlite_database_tasks.rb

@@ -59,7 +59,6 @@ module ActiveRecord
       end
 
       private
-
         attr_reader :configuration, :root
 
         def run_cmd(cmd, args, out)

data/lib/active_record/test_fixtures.rb

@@ -129,6 +129,7 @@ module ActiveRecord
         # When connections are established in the future, begin a transaction too
         @connection_subscriber = ActiveSupport::Notifications.subscribe("!connection.active_record") do |_, _, _, _, payload|
           spec_name = payload[:spec_name] if payload.key?(:spec_name)
+          setup_shared_connection_pool
 
           if spec_name
             begin
@@ -179,7 +180,6 @@ module ActiveRecord
     end
 
     private
-
       # Shares the writing connection pool with connections on
       # other handlers.
       #
@@ -194,6 +194,7 @@ module ActiveRecord
             handler.connection_pool_list.each do |pool|
               name = pool.spec.name
               writing_connection = writing_handler.retrieve_connection_pool(name)
+              return unless writing_connection
               handler.send(:owner_to_pool)[name] = writing_connection
             end
           end

data/lib/active_record/timestamp.rb

@@ -96,7 +96,6 @@ module ActiveRecord
     end
 
   private
-
     def _create_record
       if record_timestamps
         current_time = current_time_from_proper_timezone

data/lib/active_record/touch_later.rb

@@ -9,7 +9,7 @@ module ActiveRecord
       before_commit_without_transaction_enrollment :touch_deferred_attributes
     end
 
-    def touch_later(*names) # :nodoc:
+    def touch_later(*names, **) # :nodoc:
       unless persisted?
         raise ActiveRecordError, <<-MSG.squish
           cannot touch on a new or destroyed record object. Consider using
@@ -41,7 +41,6 @@ module ActiveRecord
     end
 
     private
-
       def surreptitiously_touch(attrs)
         attrs.each { |attr| write_attribute attr, @_touch_time }
         clear_attribute_changes attrs

data/lib/active_record/transactions.rb

@@ -208,8 +208,8 @@ module ActiveRecord
     # Note that "TRUNCATE" is also a MySQL DDL statement!
     module ClassMethods
       # See the ConnectionAdapters::DatabaseStatements#transaction API docs.
-      def transaction(options = {}, &block)
-        connection.transaction(options, &block)
+      def transaction(**options, &block)
+        connection.transaction(**options, &block)
       end
 
       def before_commit(*args, &block) # :nodoc:
@@ -282,7 +282,6 @@ module ActiveRecord
       end
 
       private
-
         def set_options_for_callbacks!(args, enforced_options = {})
           options = args.extract_options!.merge!(enforced_options)
           args << options
@@ -304,22 +303,22 @@ module ActiveRecord
 
     # See ActiveRecord::Transactions::ClassMethods for detailed documentation.
     def transaction(options = {}, &block)
-      self.class.transaction(options, &block)
+      self.class.transaction(**options, &block)
     end
 
     def destroy #:nodoc:
       with_transaction_returning_status { super }
     end
 
-    def save(*) #:nodoc:
+    def save(*, **) #:nodoc:
       with_transaction_returning_status { super }
     end
 
-    def save!(*) #:nodoc:
+    def save!(*, **) #:nodoc:
       with_transaction_returning_status { super }
     end
 
-    def touch(*) #:nodoc:
+    def touch(*, **) #:nodoc:
       with_transaction_returning_status { super }
     end
 
@@ -340,7 +339,7 @@ module ActiveRecord
         _run_commit_callbacks
       end
     ensure
-      @_committed_already_called = false
+      @_committed_already_called = @_trigger_update_callback = @_trigger_destroy_callback = false
     end
 
     # Call the #after_rollback callbacks. The +force_restore_state+ argument indicates if the record
@@ -353,6 +352,7 @@ module ActiveRecord
     ensure
       restore_transaction_record_state(force_restore_state)
       clear_transaction_record_state
+      @_trigger_update_callback = @_trigger_destroy_callback = false if force_restore_state
     end
 
     # Executes +method+ within a transaction and captures its return value as a