activerecord 6.1.7.2 → 7.0.4.2

data/lib/arel/visitors/mysql.rb

@@ -58,11 +58,17 @@ module Arel # :nodoc: all
           infix_value o, collector, " NOT REGEXP "
         end
 
+        # no-op
+        def visit_Arel_Nodes_NullsFirst(o, collector)
+          visit o.expr, collector
+        end
+
         # In the simple case, MySQL allows us to place JOINs directly into the UPDATE
         # query. However, this does not allow for LIMIT, OFFSET and ORDER. To support
         # these, we must use a subquery.
         def prepare_update_statement(o)
-          if o.offset || has_join_sources?(o) && has_limit_or_offset_or_orders?(o)
+          if o.offset || has_group_by_and_having?(o) ||
+            has_join_sources?(o) && has_limit_or_offset_or_orders?(o)
             super
           else
             o
@@ -70,7 +76,7 @@ module Arel # :nodoc: all
         end
         alias :prepare_delete_statement :prepare_update_statement
 
-        # MySQL is too stupid to create a temporary table for use subquery, so we have
+        # MySQL doesn't automatically create a temporary table for use subquery, so we have
         # to give it some prompting in the form of a subsubquery.
         def build_subselect(key, o)
           subselect = super

data/lib/arel/visitors/postgresql.rb

@@ -78,16 +78,6 @@ module Arel # :nodoc: all
           visit o.right, collector
         end
 
-        def visit_Arel_Nodes_NullsFirst(o, collector)
-          visit o.expr, collector
-          collector << " NULLS FIRST"
-        end
-
-        def visit_Arel_Nodes_NullsLast(o, collector)
-          visit o.expr, collector
-          collector << " NULLS LAST"
-        end
-
         BIND_BLOCK = proc { |i| "$#{i}" }
         private_constant :BIND_BLOCK
 

data/lib/arel/visitors/to_sql.rb

@@ -103,7 +103,7 @@ module Arel # :nodoc: all
             row.each_with_index do |value, k|
               collector << ", " unless k == 0
               case value
-              when Nodes::SqlLiteral, Nodes::BindParam
+              when Nodes::SqlLiteral, Nodes::BindParam, ActiveModel::Attribute
                 collector = visit(value, collector)
               else
                 collector << quote(value).to_s
@@ -135,6 +135,8 @@ module Arel # :nodoc: all
           visit_Arel_Nodes_SelectOptions(o, collector)
         end
 
+        # The Oracle enhanced adapter uses this private method,
+        # see https://github.com/rsim/oracle-enhanced/issues/2186
         def visit_Arel_Nodes_SelectOptions(o, collector)
           collector = maybe_visit o.limit, collector
           collector = maybe_visit o.offset, collector
@@ -243,6 +245,13 @@ module Arel # :nodoc: all
           collector << ")"
         end
 
+        def visit_Arel_Nodes_Filter(o, collector)
+          visit o.left, collector
+          collector << " FILTER (WHERE "
+          visit o.right, collector
+          collector << ")"
+        end
+
         def visit_Arel_Nodes_Rows(o, collector)
           if o.expr
             collector << "ROWS "
@@ -357,6 +366,17 @@ module Arel # :nodoc: all
           visit(o.expr, collector) << " DESC"
         end
 
+        # NullsFirst is available on all but MySQL, where it is redefined.
+        def visit_Arel_Nodes_NullsFirst(o, collector)
+          visit o.expr, collector
+          collector << " NULLS FIRST"
+        end
+
+        def visit_Arel_Nodes_NullsLast(o, collector)
+          visit o.expr, collector
+          collector << " NULLS LAST"
+        end
+
         def visit_Arel_Nodes_Group(o, collector)
           visit o.expr, collector
         end
@@ -412,24 +432,48 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_GreaterThanOrEqual(o, collector)
+          case unboundable?(o.right)
+          when 1
+            return collector << "1=0"
+          when -1
+            return collector << "1=1"
+          end
           collector = visit o.left, collector
           collector << " >= "
           visit o.right, collector
         end
 
         def visit_Arel_Nodes_GreaterThan(o, collector)
+          case unboundable?(o.right)
+          when 1
+            return collector << "1=0"
+          when -1
+            return collector << "1=1"
+          end
           collector = visit o.left, collector
           collector << " > "
           visit o.right, collector
         end
 
         def visit_Arel_Nodes_LessThanOrEqual(o, collector)
+          case unboundable?(o.right)
+          when 1
+            return collector << "1=1"
+          when -1
+            return collector << "1=0"
+          end
           collector = visit o.left, collector
           collector << " <= "
           visit o.right, collector
         end
 
         def visit_Arel_Nodes_LessThan(o, collector)
+          case unboundable?(o.right)
+          when 1
+            return collector << "1=1"
+          when -1
+            return collector << "1=0"
+          end
           collector = visit o.left, collector
           collector << " < "
           visit o.right, collector
@@ -585,7 +629,7 @@ module Arel # :nodoc: all
 
         def visit_Arel_Nodes_Assignment(o, collector)
           case o.right
-          when Arel::Nodes::Node, Arel::Attributes::Attribute
+          when Arel::Nodes::Node, Arel::Attributes::Attribute, ActiveModel::Attribute
             collector = visit o.left, collector
             collector << " = "
             visit o.right, collector
@@ -695,6 +739,10 @@ module Arel # :nodoc: all
 
         def bind_block; BIND_BLOCK; end
 
+        def visit_ActiveModel_Attribute(o, collector)
+          collector.add_bind(o, &bind_block)
+        end
+
         def visit_Arel_Nodes_BindParam(o, collector)
           collector.add_bind(o.value, &bind_block)
         end
@@ -793,6 +841,10 @@ module Arel # :nodoc: all
           o.limit || o.offset || !o.orders.empty?
         end
 
+        def has_group_by_and_having?(o)
+          !o.groups.empty? && !o.havings.empty?
+        end
+
         # The default strategy for an UPDATE with joins is to use a subquery. This doesn't work
         # on MySQL (even when aliasing the tables), but MySQL allows using JOIN directly in
         # an UPDATE statement, so in the MySQL visitor we redefine this to do that.
@@ -804,6 +856,8 @@ module Arel # :nodoc: all
             stmt.orders = []
             stmt.wheres = [Nodes::In.new(o.key, [build_subselect(o.key, o)])]
             stmt.relation = o.relation.left if has_join_sources?(o)
+            stmt.groups = o.groups unless o.groups.empty?
+            stmt.havings = o.havings unless o.havings.empty?
             stmt
           else
             o
@@ -818,6 +872,8 @@ module Arel # :nodoc: all
           core.froms       = o.relation
           core.wheres      = o.wheres
           core.projections = [key]
+          core.groups      = o.groups unless o.groups.empty?
+          core.havings     = o.havings unless o.havings.empty?
           stmt.limit       = o.limit
           stmt.offset      = o.offset
           stmt.orders      = o.orders

data/lib/arel.rb

@@ -7,6 +7,7 @@ require "arel/factory_methods"
 
 require "arel/expressions"
 require "arel/predications"
+require "arel/filter_predications"
 require "arel/window_predications"
 require "arel/math"
 require "arel/alias_predication"
@@ -29,7 +30,7 @@ module Arel
 
   # Wrap a known-safe SQL string for passing to query methods, e.g.
   #
-  #   Post.order(Arel.sql("length(title)")).last
+  #   Post.order(Arel.sql("REPLACE(title, 'misc', 'zzzz') asc")).pluck(:id)
   #
   # Great caution should be taken to avoid SQL injection vulnerabilities.
   # This method should not be used with unsafe values such as request

data/lib/rails/generators/active_record/application_record/templates/application_record.rb.tt

@@ -1,5 +1,5 @@
 <% module_namespacing do -%>
 class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
+  primary_abstract_class
 end
 <% end -%>

data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt

@@ -2,6 +2,6 @@
 class <%= abstract_class_name %> < ApplicationRecord
   self.abstract_class = true
 
-  connects_to database: { <%= ActiveRecord::Base.writing_role %>: :<%= database -%> }
+  connects_to database: { <%= ActiveRecord.writing_role %>: :<%= database -%> }
 end
 <% end -%>

data/lib/rails/generators/active_record/model/templates/model.rb.tt

@@ -1,7 +1,7 @@
 <% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
 <% attributes.select(&:reference?).each do |attribute| -%>
-  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+  belongs_to :<%= attribute.name %><%= ", polymorphic: true" if attribute.polymorphic? %>
 <% end -%>
 <% attributes.select(&:rich_text?).each do |attribute| -%>
   has_rich_text :<%= attribute.name %>

data/lib/rails/generators/active_record/model/templates/module.rb.tt

@@ -1,7 +1,7 @@
 <% module_namespacing do -%>
-module <%= class_path.map(&:camelize).join('::') %>
+module <%= class_path.map(&:camelize).join("::") %>
   def self.table_name_prefix
-    '<%= namespaced? ? namespaced_class_path.join('_') : class_path.join('_') %>_'
+    "<%= namespaced? ? namespaced_class_path.join("_") : class_path.join("_") %>_"
   end
 end
 <% end -%>

data/lib/rails/generators/active_record/multi_db/multi_db_generator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
+
+module ActiveRecord
+  module Generators # :nodoc:
+    class MultiDbGenerator < ::Rails::Generators::Base # :nodoc:
+      source_root File.expand_path("templates", __dir__)
+
+      def create_multi_db
+        filename = "multi_db.rb"
+        template filename, "config/initializers/#{filename}"
+      end
+    end
+  end
+end

data/lib/rails/generators/active_record/multi_db/templates/multi_db.rb.tt

@@ -0,0 +1,44 @@
+# Multi-db Configuration
+#
+# This file is used for configuration settings related to multiple databases.
+#
+# Enable Database Selector
+#
+# Inserts middleware to perform automatic connection switching.
+# The `database_selector` hash is used to pass options to the DatabaseSelector
+# middleware. The `delay` is used to determine how long to wait after a write
+# to send a subsequent read to the primary.
+#
+# The `database_resolver` class is used by the middleware to determine which
+# database is appropriate to use based on the time delay.
+#
+# The `database_resolver_context` class is used by the middleware to set
+# timestamps for the last write to the primary. The resolver uses the context
+# class timestamps to determine how long to wait before reading from the
+# replica.
+#
+# By default Rails will store a last write timestamp in the session. The
+# DatabaseSelector middleware is designed as such you can define your own
+# strategy for connection switching and pass that into the middleware through
+# these configuration options.
+#
+# Rails.application.configure do
+#   config.active_record.database_selector = { delay: 2.seconds }
+#   config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+#   config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
+# end
+#
+# Enable Shard Selector
+#
+# Inserts middleware to perform automatic shard swapping. The `shard_selector` hash
+# can be used to pass options to the `ShardSelector` middleware. The `lock` option is
+# used to determine whether shard swapping should be prohibited for the request.
+#
+# The `shard_resolver` option is used by the middleware to determine which shard
+# to switch to. The application must provide a mechanism for finding the shard name
+# in a proc. See guides for an example.
+#
+# Rails.application.configure do
+#   config.active_record.shard_selector = { lock: true }
+#   config.active_record.shard_resolver = ->(request) { Tenant.find_by!(host: request.host).shard }
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 6.1.7.2
+  version: 7.0.4.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.2
+        version: 7.0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.2
+        version: 7.0.4.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.2
+        version: 7.0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.2
+        version: 7.0.4.2
 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.
@@ -70,6 +70,7 @@ files:
 - lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/collection_association.rb
 - lib/active_record/associations/collection_proxy.rb
+- lib/active_record/associations/disable_joins_association_scope.rb
 - lib/active_record/associations/foreign_association.rb
 - lib/active_record/associations/has_many_association.rb
 - lib/active_record/associations/has_many_through_association.rb
@@ -81,9 +82,12 @@ 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/batch.rb
+- lib/active_record/associations/preloader/branch.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/asynchronous_queries_tracker.rb
 - lib/active_record/attribute_assignment.rb
 - lib/active_record/attribute_methods.rb
 - lib/active_record/attribute_methods/before_type_cast.rb
@@ -101,7 +105,10 @@ files:
 - lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
 - lib/active_record/connection_adapters.rb
+- lib/active_record/connection_adapters/abstract/connection_handler.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
+- lib/active_record/connection_adapters/abstract/connection_pool/queue.rb
+- lib/active_record/connection_adapters/abstract/connection_pool/reaper.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
 - lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -153,6 +160,8 @@ files:
 - lib/active_record/connection_adapters/postgresql/oid/point.rb
 - lib/active_record/connection_adapters/postgresql/oid/range.rb
 - lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
+- lib/active_record/connection_adapters/postgresql/oid/timestamp.rb
+- lib/active_record/connection_adapters/postgresql/oid/timestamp_with_time_zone.rb
 - lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
 - lib/active_record/connection_adapters/postgresql/oid/uuid.rb
 - lib/active_record/connection_adapters/postgresql/oid/vector.rb
@@ -187,7 +196,35 @@ files:
 - lib/active_record/database_configurations/url_config.rb
 - lib/active_record/delegated_type.rb
 - lib/active_record/destroy_association_async_job.rb
+- lib/active_record/disable_joins_association_relation.rb
 - lib/active_record/dynamic_matchers.rb
+- lib/active_record/encryption.rb
+- lib/active_record/encryption/cipher.rb
+- lib/active_record/encryption/cipher/aes256_gcm.rb
+- lib/active_record/encryption/config.rb
+- lib/active_record/encryption/configurable.rb
+- lib/active_record/encryption/context.rb
+- lib/active_record/encryption/contexts.rb
+- lib/active_record/encryption/derived_secret_key_provider.rb
+- lib/active_record/encryption/deterministic_key_provider.rb
+- lib/active_record/encryption/encryptable_record.rb
+- lib/active_record/encryption/encrypted_attribute_type.rb
+- lib/active_record/encryption/encrypted_fixtures.rb
+- lib/active_record/encryption/encrypting_only_encryptor.rb
+- lib/active_record/encryption/encryptor.rb
+- lib/active_record/encryption/envelope_encryption_key_provider.rb
+- lib/active_record/encryption/errors.rb
+- lib/active_record/encryption/extended_deterministic_queries.rb
+- lib/active_record/encryption/extended_deterministic_uniqueness_validator.rb
+- lib/active_record/encryption/key.rb
+- lib/active_record/encryption/key_generator.rb
+- lib/active_record/encryption/key_provider.rb
+- lib/active_record/encryption/message.rb
+- lib/active_record/encryption/message_serializer.rb
+- lib/active_record/encryption/null_encryptor.rb
+- lib/active_record/encryption/properties.rb
+- lib/active_record/encryption/read_only_null_encryptor.rb
+- lib/active_record/encryption/scheme.rb
 - lib/active_record/enum.rb
 - lib/active_record/errors.rb
 - lib/active_record/explain.rb
@@ -199,6 +236,7 @@ files:
 - lib/active_record/fixture_set/table_row.rb
 - lib/active_record/fixture_set/table_rows.rb
 - lib/active_record/fixtures.rb
+- lib/active_record/future_result.rb
 - lib/active_record/gem_version.rb
 - lib/active_record/inheritance.rb
 - lib/active_record/insert_all.rb
@@ -212,6 +250,7 @@ files:
 - lib/active_record/middleware/database_selector.rb
 - lib/active_record/middleware/database_selector/resolver.rb
 - lib/active_record/middleware/database_selector/resolver/session.rb
+- lib/active_record/middleware/shard_selector.rb
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration/compatibility.rb
@@ -222,6 +261,7 @@ files:
 - lib/active_record/null_relation.rb
 - lib/active_record/persistence.rb
 - lib/active_record/query_cache.rb
+- lib/active_record/query_logs.rb
 - lib/active_record/querying.rb
 - lib/active_record/railtie.rb
 - lib/active_record/railties/console_sandbox.rb
@@ -312,6 +352,7 @@ files:
 - lib/arel/errors.rb
 - lib/arel/expressions.rb
 - lib/arel/factory_methods.rb
+- lib/arel/filter_predications.rb
 - lib/arel/insert_manager.rb
 - lib/arel/math.rb
 - lib/arel/nodes.rb
@@ -328,6 +369,7 @@ files:
 - lib/arel/nodes/equality.rb
 - lib/arel/nodes/extract.rb
 - lib/arel/nodes/false.rb
+- lib/arel/nodes/filter.rb
 - lib/arel/nodes/full_outer_join.rb
 - lib/arel/nodes/function.rb
 - lib/arel/nodes/grouping.rb
@@ -385,15 +427,17 @@ files:
 - lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt
 - lib/rails/generators/active_record/model/templates/model.rb.tt
 - lib/rails/generators/active_record/model/templates/module.rb.tt
+- lib/rails/generators/active_record/multi_db/multi_db_generator.rb
+- lib/rails/generators/active_record/multi_db/templates/multi_db.rb.tt
 homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.2/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.7.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.4.2/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.4.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.2/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.4.2/activerecord
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
@@ -405,7 +449,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="