activerecord 8.0.2.1 → 8.1.0.beta1

data/lib/arel/visitors/sqlite.rb

@@ -4,6 +4,61 @@ module Arel # :nodoc: all
   module Visitors
     class SQLite < Arel::Visitors::ToSql
       private
+        def visit_Arel_Nodes_UpdateStatement(o, collector)
+          collector.retryable = false
+          o = prepare_update_statement(o)
+
+          collector << "UPDATE "
+
+          # UPDATE with JOIN is in the form of:
+          #
+          #   UPDATE t1 AS __active_record_update_alias
+          #   SET ..
+          #   FROM t1 JOIN t2 ON t2.join_id = t1.join_id ..
+          #   WHERE t1.id = __active_record_update_alias.id AND ..
+          if has_join_sources?(o)
+            collector = visit o.relation.left, collector
+            collect_nodes_for o.values, collector, " SET "
+            collector << " FROM "
+            collector = inject_join o.relation.right, collector, " "
+          else
+            collector = visit o.relation, collector
+            collect_nodes_for o.values, collector, " SET "
+          end
+
+          collect_nodes_for o.wheres, collector, " WHERE ", " AND "
+          collect_nodes_for o.orders, collector, " ORDER BY "
+          maybe_visit o.limit, collector
+          maybe_visit o.comment, collector
+        end
+
+        def prepare_update_statement(o)
+          # Sqlite need to be built with the SQLITE_ENABLE_UPDATE_DELETE_LIMIT compile-time option
+          # to support LIMIT/OFFSET/ORDER in UPDATE and DELETE statements.
+          if o.key && has_join_sources?(o) && !has_group_by_and_having?(o) && !has_limit_or_offset_or_orders?(o)
+            # Join clauses cannot reference the target table, so alias the
+            # updated table, place the entire relation in the FROM clause, and
+            # add a self-join (which requires the primary key)
+            stmt = o.clone
+            stmt.relation, stmt.wheres = o.relation.clone, o.wheres.clone
+            stmt.relation.right = [stmt.relation.left, *stmt.relation.right]
+            stmt.relation.left = stmt.relation.left.alias("__active_record_update_alias")
+            Array.wrap(o.key).each do |key|
+              stmt.wheres << key.eq(stmt.relation.left[key.name])
+            end
+            stmt
+          else
+            super
+          end
+        end
+
+        def visit_Arel_Nodes_TableAlias(o, collector)
+          # "AS" is not optional in "{UPDATE | DELETE} table AS alias ..."
+          collector = visit o.relation, collector
+          collector << " AS "
+          collector << quote_table_name(o.name)
+        end
+
         # Locks are not supported in SQLite
         def visit_Arel_Nodes_Lock(o, collector)
           collector
@@ -14,14 +69,6 @@ module Arel # :nodoc: all
           super
         end
 
-        def visit_Arel_Nodes_True(o, collector)
-          collector << "1"
-        end
-
-        def visit_Arel_Nodes_False(o, collector)
-          collector << "0"
-        end
-
         def visit_Arel_Nodes_IsNotDistinctFrom(o, collector)
           collector = visit o.left, collector
           collector << " IS "

data/lib/arel/visitors/to_sql.rb

@@ -35,6 +35,7 @@ module Arel # :nodoc: all
           collect_nodes_for o.wheres, collector, " WHERE ", " AND "
           collect_nodes_for o.orders, collector, " ORDER BY "
           maybe_visit o.limit, collector
+          maybe_visit o.comment, collector
         end
 
         def visit_Arel_Nodes_UpdateStatement(o, collector)
@@ -48,6 +49,7 @@ module Arel # :nodoc: all
           collect_nodes_for o.wheres, collector, " WHERE ", " AND "
           collect_nodes_for o.orders, collector, " ORDER BY "
           maybe_visit o.limit, collector
+          maybe_visit o.comment, collector
         end
 
         def visit_Arel_Nodes_InsertStatement(o, collector)
@@ -75,13 +77,7 @@ module Arel # :nodoc: all
 
         def visit_Arel_Nodes_Exists(o, collector)
           collector << "EXISTS ("
-          collector = visit(o.expressions, collector) << ")"
-          if o.alias
-            collector << " AS "
-            visit o.alias, collector
-          else
-            collector
-          end
+          visit(o.expressions, collector) << ")"
         end
 
         def visit_Arel_Nodes_Casted(o, collector)
@@ -388,13 +384,7 @@ module Arel # :nodoc: all
           collector << o.name
           collector << "("
           collector << "DISTINCT " if o.distinct
-          collector = inject_join(o.expressions, collector, ", ") << ")"
-          if o.alias
-            collector << " AS "
-            visit o.alias, collector
-          else
-            collector
-          end
+          inject_join(o.expressions, collector, ", ") << ")"
         end
 
         def visit_Arel_Nodes_Extract(o, collector)
@@ -998,13 +988,7 @@ module Arel # :nodoc: all
           if o.distinct
             collector << "DISTINCT "
           end
-          collector = inject_join(o.expressions, collector, ", ") << ")"
-          if o.alias
-            collector << " AS "
-            visit o.alias, collector
-          else
-            collector
-          end
+          inject_join(o.expressions, collector, ", ") << ")"
         end
 
         def is_distinct_from(o, collector)

data/lib/arel.rb

@@ -50,7 +50,9 @@ module Arel
   # Use this option only if the SQL is idempotent, as it could be executed
   # more than once.
   def self.sql(sql_string, *positional_binds, retryable: false, **named_binds)
-    if positional_binds.empty? && named_binds.empty?
+    if Arel::Nodes::SqlLiteral === sql_string
+      sql_string
+    elsif positional_binds.empty? && named_binds.empty?
       Arel::Nodes::SqlLiteral.new(sql_string, retryable: retryable)
     else
       Arel::Nodes::BoundSqlLiteral.new sql_string, positional_binds, named_binds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 8.0.2.1
+  version: 8.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,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/deprecation.rb
 - lib/active_record/associations/disable_joins_association_scope.rb
 - lib/active_record/associations/errors.rb
 - lib/active_record/associations/foreign_association.rb
@@ -253,6 +254,7 @@ files:
 - lib/active_record/explain.rb
 - lib/active_record/explain_registry.rb
 - lib/active_record/explain_subscriber.rb
+- lib/active_record/filter_attribute_handler.rb
 - lib/active_record/fixture_set/file.rb
 - lib/active_record/fixture_set/model_metadata.rb
 - lib/active_record/fixture_set/render_context.rb
@@ -279,6 +281,7 @@ files:
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration/compatibility.rb
+- lib/active_record/migration/default_schema_versions_formatter.rb
 - lib/active_record/migration/default_strategy.rb
 - lib/active_record/migration/execution_strategy.rb
 - lib/active_record/migration/join_table.rb
@@ -286,7 +289,6 @@ files:
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
 - lib/active_record/no_touching.rb
-- lib/active_record/normalization.rb
 - lib/active_record/persistence.rb
 - lib/active_record/promise.rb
 - lib/active_record/query_cache.rb
@@ -297,6 +299,7 @@ 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/job_checkpoints.rb
 - lib/active_record/railties/job_runtime.rb
 - lib/active_record/readonly_attributes.rb
 - lib/active_record/reflection.rb
@@ -336,6 +339,7 @@ files:
 - lib/active_record/store.rb
 - lib/active_record/suppressor.rb
 - lib/active_record/table_metadata.rb
+- lib/active_record/tasks/abstract_tasks.rb
 - lib/active_record/tasks/database_tasks.rb
 - lib/active_record/tasks/mysql_database_tasks.rb
 - lib/active_record/tasks/postgresql_database_tasks.rb
@@ -474,10 +478,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.0.2.1/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.0.2.1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.beta1/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.0.2.1/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.beta1/activerecord
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"

data/lib/active_record/normalization.rb

@@ -1,163 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord # :nodoc:
-  module Normalization
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :normalized_attributes, default: Set.new
-
-      before_validation :normalize_changed_in_place_attributes
-    end
-
-    # Normalizes a specified attribute using its declared normalizations.
-    #
-    # ==== Examples
-    #
-    #   class User < ActiveRecord::Base
-    #     normalizes :email, with: -> email { email.strip.downcase }
-    #   end
-    #
-    #   legacy_user = User.find(1)
-    #   legacy_user.email # => " CRUISE-CONTROL@EXAMPLE.COM\n"
-    #   legacy_user.normalize_attribute(:email)
-    #   legacy_user.email # => "cruise-control@example.com"
-    #   legacy_user.save
-    def normalize_attribute(name)
-      # Treat the value as a new, unnormalized value.
-      self[name] = self[name]
-    end
-
-    module ClassMethods
-      # Declares a normalization for one or more attributes. The normalization
-      # is applied when the attribute is assigned or updated, and the normalized
-      # value will be persisted to the database. The normalization is also
-      # applied to the corresponding keyword argument of query methods. This
-      # allows a record to be created and later queried using unnormalized
-      # values.
-      #
-      # However, to prevent confusion, the normalization will not be applied
-      # when the attribute is fetched from the database. This means that if a
-      # record was persisted before the normalization was declared, the record's
-      # attribute will not be normalized until either it is assigned a new
-      # value, or it is explicitly migrated via Normalization#normalize_attribute.
-      #
-      # Because the normalization may be applied multiple times, it should be
-      # _idempotent_. In other words, applying the normalization more than once
-      # should have the same result as applying it only once.
-      #
-      # By default, the normalization will not be applied to +nil+ values. This
-      # behavior can be changed with the +:apply_to_nil+ option.
-      #
-      # Be aware that if your app was created before Rails 7.1, and your app
-      # marshals instances of the targeted model (for example, when caching),
-      # then you should set ActiveRecord.marshalling_format_version to +7.1+ or
-      # higher via either <tt>config.load_defaults 7.1</tt> or
-      # <tt>config.active_record.marshalling_format_version = 7.1</tt>.
-      # Otherwise, +Marshal+ may attempt to serialize the normalization +Proc+
-      # and raise +TypeError+.
-      #
-      # ==== Options
-      #
-      # * +:with+ - Any callable object that accepts the attribute's value as
-      #   its sole argument, and returns it normalized.
-      # * +:apply_to_nil+ - Whether to apply the normalization to +nil+ values.
-      #   Defaults to +false+.
-      #
-      # ==== Examples
-      #
-      #   class User < ActiveRecord::Base
-      #     normalizes :email, with: -> email { email.strip.downcase }
-      #     normalizes :phone, with: -> phone { phone.delete("^0-9").delete_prefix("1") }
-      #   end
-      #
-      #   user = User.create(email: " CRUISE-CONTROL@EXAMPLE.COM\n")
-      #   user.email                  # => "cruise-control@example.com"
-      #
-      #   user = User.find_by(email: "\tCRUISE-CONTROL@EXAMPLE.COM ")
-      #   user.email                  # => "cruise-control@example.com"
-      #   user.email_before_type_cast # => "cruise-control@example.com"
-      #
-      #   User.where(email: "\tCRUISE-CONTROL@EXAMPLE.COM ").count         # => 1
-      #   User.where(["email = ?", "\tCRUISE-CONTROL@EXAMPLE.COM "]).count # => 0
-      #
-      #   User.exists?(email: "\tCRUISE-CONTROL@EXAMPLE.COM ")         # => true
-      #   User.exists?(["email = ?", "\tCRUISE-CONTROL@EXAMPLE.COM "]) # => false
-      #
-      #   User.normalize_value_for(:phone, "+1 (555) 867-5309") # => "5558675309"
-      def normalizes(*names, with:, apply_to_nil: false)
-        decorate_attributes(names) do |name, cast_type|
-          NormalizedValueType.new(cast_type: cast_type, normalizer: with, normalize_nil: apply_to_nil)
-        end
-
-        self.normalized_attributes += names.map(&:to_sym)
-      end
-
-      # Normalizes a given +value+ using normalizations declared for +name+.
-      #
-      # ==== Examples
-      #
-      #   class User < ActiveRecord::Base
-      #     normalizes :email, with: -> email { email.strip.downcase }
-      #   end
-      #
-      #   User.normalize_value_for(:email, " CRUISE-CONTROL@EXAMPLE.COM\n")
-      #   # => "cruise-control@example.com"
-      def normalize_value_for(name, value)
-        type_for_attribute(name).cast(value)
-      end
-    end
-
-    private
-      def normalize_changed_in_place_attributes
-        self.class.normalized_attributes.each do |name|
-          normalize_attribute(name) if attribute_changed_in_place?(name)
-        end
-      end
-
-      class NormalizedValueType < DelegateClass(ActiveModel::Type::Value) # :nodoc:
-        include ActiveModel::Type::SerializeCastValue
-
-        attr_reader :cast_type, :normalizer, :normalize_nil
-        alias :normalize_nil? :normalize_nil
-
-        def initialize(cast_type:, normalizer:, normalize_nil:)
-          @cast_type = cast_type
-          @normalizer = normalizer
-          @normalize_nil = normalize_nil
-          super(cast_type)
-        end
-
-        def cast(value)
-          normalize(super(value))
-        end
-
-        def serialize(value)
-          serialize_cast_value(cast(value))
-        end
-
-        def serialize_cast_value(value)
-          ActiveModel::Type::SerializeCastValue.serialize(cast_type, value)
-        end
-
-        def ==(other)
-          self.class == other.class &&
-            normalize_nil? == other.normalize_nil? &&
-            normalizer == other.normalizer &&
-            cast_type == other.cast_type
-        end
-        alias eql? ==
-
-        def hash
-          [self.class, cast_type, normalizer, normalize_nil?].hash
-        end
-
-        define_method(:inspect, Kernel.instance_method(:inspect))
-
-        private
-          def normalize(value)
-            normalizer.call(value) unless value.nil? && !normalize_nil?
-          end
-      end
-  end
-end