activerecord 7.1.3.4 → 7.2.0.beta2

data/lib/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -112,7 +112,7 @@ module ActiveRecord
 
             orders = {}
             opclasses = {}
-            include_columns = include ? include.split(",").map(&:strip) : []
+            include_columns = include ? include.split(",").map { |c| Utils.unquote_identifier(c.strip.gsub('""', '"')) } : []
 
             if indkey.include?(0)
               columns = expressions
@@ -209,8 +209,16 @@ module ActiveRecord
         end
 
         # Creates a schema for the given schema name.
-        def create_schema(schema_name)
-          execute "CREATE SCHEMA #{quote_schema_name(schema_name)}"
+        def create_schema(schema_name, force: nil, if_not_exists: nil)
+          if force && if_not_exists
+            raise ArgumentError, "Options `:force` and `:if_not_exists` cannot be used simultaneously."
+          end
+
+          if force
+            drop_schema(schema_name, if_exists: true)
+          end
+
+          execute("CREATE SCHEMA#{' IF NOT EXISTS' if if_not_exists} #{quote_schema_name(schema_name)}")
         end
 
         # Drops the schema for the given schema name.
@@ -400,7 +408,7 @@ module ActiveRecord
               execute "ALTER TABLE #{seq.quoted} RENAME TO #{quote_table_name(new_seq)}"
             end
           end
-          rename_table_indexes(table_name, new_name)
+          rename_table_indexes(table_name, new_name, **options)
         end
 
         def add_column(table_name, column_name, type, **options) # :nodoc:
@@ -522,14 +530,6 @@ module ActiveRecord
         end
 
         def add_foreign_key(from_table, to_table, **options)
-          if options[:deferrable] == true
-            ActiveRecord.deprecator.warn(<<~MSG)
-              `deferrable: true` is deprecated in favor of `deferrable: :immediate`, and will be removed in Rails 7.2.
-            MSG
-
-            options[:deferrable] = :immediate
-          end
-
           assert_valid_deferrable(options[:deferrable])
 
           super
@@ -690,6 +690,10 @@ module ActiveRecord
         #   The constraint name. Defaults to <tt>excl_rails_<identifier></tt>.
         # [<tt>:deferrable</tt>]
         #   Specify whether or not the exclusion constraint should be deferrable. Valid values are +false+ or +:immediate+ or +:deferred+ to specify the default behavior. Defaults to +false+.
+        # [<tt>:using</tt>]
+        #   Specify which index method to use when creating this exclusion constraint (e.g. +:btree+, +:gist+ etc).
+        # [<tt>:where</tt>]
+        #   Specify an exclusion constraint on a subset of the table (internally PostgreSQL creates a partial index for this).
         def add_exclusion_constraint(table_name, expression, **options)
           options = exclusion_constraint_options(table_name, expression, options)
           at = create_alter_table(table_name)

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -20,17 +20,6 @@ require "active_record/connection_adapters/postgresql/type_metadata"
 require "active_record/connection_adapters/postgresql/utils"
 
 module ActiveRecord
-  module ConnectionHandling # :nodoc:
-    def postgresql_adapter_class
-      ConnectionAdapters::PostgreSQLAdapter
-    end
-
-    # Establishes a connection to the database that's used by all Active Record objects
-    def postgresql_connection(config)
-      postgresql_adapter_class.new(config)
-    end
-  end
-
   module ConnectionAdapters
     # = Active Record PostgreSQL Adapter
     #
@@ -133,6 +122,15 @@ module ActiveRecord
       # setting, you should immediately run <tt>bin/rails db:migrate</tt> to update the types in your schema.rb.
       class_attribute :datetime_type, default: :timestamp
 
+      ##
+      # :singleton-method:
+      # Toggles automatic decoding of date columns.
+      #
+      #   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date").class #=> String
+      #   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.decode_dates = true
+      #   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date").class #=> Date
+      class_attribute :decode_dates, default: false
+
       NATIVE_DATABASE_TYPES = {
         primary_key: "bigserial primary key",
         string:      { name: "character varying" },
@@ -290,10 +288,6 @@ module ActiveRecord
         { concurrently: "CONCURRENTLY" }
       end
 
-      def return_value_after_insert?(column) # :nodoc:
-        column.auto_populated?
-      end
-
       class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
         def initialize(connection, max)
           super(max)
@@ -342,6 +336,10 @@ module ActiveRecord
         @use_insert_returning = @config.key?(:insert_returning) ? self.class.type_cast_config_to_boolean(@config[:insert_returning]) : true
       end
 
+      def connected?
+        !(@raw_connection.nil? || @raw_connection.finished?)
+      end
+
       # Is this connection alive and ready for queries?
       def active?
         @lock.synchronize do
@@ -613,7 +611,9 @@ module ActiveRecord
 
       # Returns the version of the connected PostgreSQL server.
       def get_database_version # :nodoc:
-        valid_raw_connection.server_version
+        with_raw_connection do |conn|
+          conn.server_version
+        end
       end
       alias :postgresql_version :database_version
 
@@ -889,10 +889,11 @@ module ActiveRecord
           update_typemap_for_default_timezone
 
           type_casted_binds = type_casted_binds(binds)
-          log(sql, name, binds, type_casted_binds, async: async) do
-            with_raw_connection do |conn|
+          log(sql, name, binds, type_casted_binds, async: async) do |notification_payload|
+            with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
               result = conn.exec_params(sql, type_casted_binds)
               verified!
+              notification_payload[:row_count] = result.count
               result
             end
           end
@@ -903,13 +904,14 @@ module ActiveRecord
 
           update_typemap_for_default_timezone
 
-          with_raw_connection do |conn|
+          with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
             stmt_key = prepare_statement(sql, binds, conn)
             type_casted_binds = type_casted_binds(binds)
 
-            log(sql, name, binds, type_casted_binds, stmt_key, async: async) do
+            log(sql, name, binds, type_casted_binds, stmt_key, async: async) do |notification_payload|
               result = conn.exec_prepared(stmt_key, type_casted_binds)
               verified!
+              notification_payload[:row_count] = result.count
               result
             end
           end
@@ -919,7 +921,7 @@ module ActiveRecord
           # Nothing we can do if we are in a transaction because all commands
           # will raise InFailedSQLTransaction
           if in_transaction?
-            raise ActiveRecord::PreparedStatementCacheExpired.new(e.cause.message)
+            raise ActiveRecord::PreparedStatementCacheExpired.new(e.cause.message, connection_pool: @pool)
           else
             @lock.synchronize do
               # outside of transactions we can simply flush this query and retry
@@ -995,6 +997,8 @@ module ActiveRecord
         # Configures the encoding, verbosity, schema search path, and time zone of the connection.
         # This is called by #connect and should not be called manually.
         def configure_connection
+          super
+
           if @config[:encoding]
             @raw_connection.set_client_encoding(@config[:encoding])
           end
@@ -1165,6 +1169,7 @@ module ActiveRecord
             "timestamp" => PG::TextDecoder::TimestampUtc,
             "timestamptz" => PG::TextDecoder::TimestampWithTimeZone,
           }
+          coders_by_name["date"] = PG::TextDecoder::Date if decode_dates
 
           known_coder_types = coders_by_name.keys.map { |n| quote(n) }
           query = <<~SQL % known_coder_types.join(", ")

data/lib/active_record/connection_adapters/schema_cache.rb

@@ -18,70 +18,62 @@ module ActiveRecord
         @cache_path = cache_path
       end
 
-      def set_schema_cache(cache)
-        @cache = cache
-      end
-
       def clear!
         @cache = empty_cache
 
         nil
       end
 
-      def load!(connection)
-        cache(connection)
+      def load!(pool)
+        cache(pool)
 
         self
       end
 
-      def primary_keys(connection, table_name)
-        cache(connection).primary_keys(connection, table_name)
+      def primary_keys(pool, table_name)
+        cache(pool).primary_keys(pool, table_name)
       end
 
-      def data_source_exists?(connection, name)
-        cache(connection).data_source_exists?(connection, name)
+      def data_source_exists?(pool, name)
+        cache(pool).data_source_exists?(pool, name)
       end
 
-      def add(connection, name)
-        cache(connection).add(connection, name)
+      def add(pool, name)
+        cache(pool).add(pool, name)
       end
 
-      def data_sources(connection, name)
-        cache(connection).data_sources(connection, name)
+      def data_sources(pool, name)
+        cache(pool).data_source_exists?(pool, name)
       end
 
-      def columns(connection, table_name)
-        cache(connection).columns(connection, table_name)
+      def columns(pool, table_name)
+        cache(pool).columns(pool, table_name)
       end
 
-      def columns_hash(connection, table_name)
-        cache(connection).columns_hash(connection, table_name)
+      def columns_hash(pool, table_name)
+        cache(pool).columns_hash(pool, table_name)
       end
 
-      def columns_hash?(connection, table_name)
-        cache(connection).columns_hash?(connection, table_name)
+      def columns_hash?(pool, table_name)
+        cache(pool).columns_hash?(pool, table_name)
       end
 
-      def indexes(connection, table_name)
-        cache(connection).indexes(connection, table_name)
+      def indexes(pool, table_name)
+        cache(pool).indexes(pool, table_name)
       end
 
-      def database_version(connection) # :nodoc:
-        cache(connection).database_version(connection)
+      def version(pool)
+        cache(pool).version(pool)
       end
 
-      def version(connection)
-        cache(connection).version(connection)
+      def size(pool)
+        cache(pool).size
       end
 
-      def size(connection)
-        cache(connection).size
-      end
-
-      def clear_data_source_cache!(connection, name)
+      def clear_data_source_cache!(pool, name)
         return if @cache.nil? && !possible_cache_available?
 
-        cache(connection).clear_data_source_cache!(connection, name)
+        cache(pool).clear_data_source_cache!(pool, name)
       end
 
       def cached?(table_name)
@@ -96,9 +88,9 @@ module ActiveRecord
         @cache&.cached?(table_name)
       end
 
-      def dump_to(connection, filename)
+      def dump_to(pool, filename)
         fresh_cache = empty_cache
-        fresh_cache.add_all(connection)
+        fresh_cache.add_all(pool)
         fresh_cache.dump_to(filename)
 
         @cache = fresh_cache
@@ -111,8 +103,8 @@ module ActiveRecord
           new_cache
         end
 
-        def cache(connection)
-          @cache ||= load_cache(connection) || empty_cache
+        def cache(pool)
+          @cache ||= load_cache(pool) || empty_cache
         end
 
         def possible_cache_available?
@@ -121,7 +113,7 @@ module ActiveRecord
             File.file?(@cache_path)
         end
 
-        def load_cache(connection)
+        def load_cache(pool)
           # Can't load if schema dumps are disabled
           return unless possible_cache_available?
 
@@ -130,11 +122,13 @@ module ActiveRecord
 
           if self.class.check_schema_cache_dump_version
             begin
-              current_version = connection.schema_version
+              pool.with_connection do |connection|
+                current_version = connection.schema_version
 
-              if new_cache.version(connection) != current_version
-                warn "Ignoring #{@cache_path} because it has expired. The current schema version is #{current_version}, but the one in the schema cache file is #{new_cache.schema_version}."
-                return
+                if new_cache.version(connection) != current_version
+                  warn "Ignoring #{@cache_path} because it has expired. The current schema version is #{current_version}, but the one in the schema cache file is #{new_cache.schema_version}."
+                  return
+                end
               end
             rescue ActiveRecordError => error
               warn "Failed to validate the schema cache because of #{error.class}: #{error.message}"
@@ -147,9 +141,25 @@ module ActiveRecord
     end
 
     class BoundSchemaReflection
-      def initialize(abstract_schema_reflection, connection)
+      class FakePool # :nodoc
+        def initialize(connection)
+          @connection = connection
+        end
+
+        def with_connection
+          yield @connection
+        end
+      end
+
+      class << self
+        def for_lone_connection(abstract_schema_reflection, connection) # :nodoc:
+          new(abstract_schema_reflection, FakePool.new(connection))
+        end
+      end
+
+      def initialize(abstract_schema_reflection, pool)
         @schema_reflection = abstract_schema_reflection
-        @connection = connection
+        @pool = pool
       end
 
       def clear!
@@ -157,7 +167,7 @@ module ActiveRecord
       end
 
       def load!
-        @schema_reflection.load!(@connection)
+        @schema_reflection.load!(@pool)
       end
 
       def cached?(table_name)
@@ -165,72 +175,56 @@ module ActiveRecord
       end
 
       def primary_keys(table_name)
-        @schema_reflection.primary_keys(@connection, table_name)
+        @schema_reflection.primary_keys(@pool, table_name)
       end
 
       def data_source_exists?(name)
-        @schema_reflection.data_source_exists?(@connection, name)
+        @schema_reflection.data_source_exists?(@pool, name)
       end
 
       def add(name)
-        @schema_reflection.add(@connection, name)
+        @schema_reflection.add(@pool, name)
       end
 
       def data_sources(name)
-        @schema_reflection.data_sources(@connection, name)
+        @schema_reflection.data_sources(@pool, name)
       end
 
       def columns(table_name)
-        @schema_reflection.columns(@connection, table_name)
+        @schema_reflection.columns(@pool, table_name)
       end
 
       def columns_hash(table_name)
-        @schema_reflection.columns_hash(@connection, table_name)
+        @schema_reflection.columns_hash(@pool, table_name)
       end
 
       def columns_hash?(table_name)
-        @schema_reflection.columns_hash?(@connection, table_name)
+        @schema_reflection.columns_hash?(@pool, table_name)
       end
 
       def indexes(table_name)
-        @schema_reflection.indexes(@connection, table_name)
-      end
-
-      def database_version # :nodoc:
-        @schema_reflection.database_version(@connection)
+        @schema_reflection.indexes(@pool, table_name)
       end
 
       def version
-        @schema_reflection.version(@connection)
+        @schema_reflection.version(@pool)
       end
 
       def size
-        @schema_reflection.size(@connection)
+        @schema_reflection.size(@pool)
       end
 
       def clear_data_source_cache!(name)
-        @schema_reflection.clear_data_source_cache!(@connection, name)
+        @schema_reflection.clear_data_source_cache!(@pool, name)
       end
 
       def dump_to(filename)
-        @schema_reflection.dump_to(@connection, filename)
+        @schema_reflection.dump_to(@pool, filename)
       end
     end
 
     # = Active Record Connection Adapters Schema Cache
     class SchemaCache
-      class << self
-        def new(connection)
-          BoundSchemaReflection.new(SchemaReflection.new(nil), connection)
-        end
-        deprecate new: "use ActiveRecord::ConnectionAdapters::SchemaReflection instead", deprecator: ActiveRecord.deprecator
-
-        def load_from(filename) # :nodoc:
-          BoundSchemaReflection.new(SchemaReflection.new(filename), nil)
-        end
-        deprecate load_from: "use ActiveRecord::ConnectionAdapters::SchemaReflection instead", deprecator: ActiveRecord.deprecator
-      end
-
       def self._load_from(filename) # :nodoc:
         return unless File.file?(filename)
 
@@ -258,13 +252,12 @@ module ActiveRecord
       end
       private_class_method :read
 
-      def initialize
+      def initialize # :nodoc:
         @columns      = {}
         @columns_hash = {}
         @primary_keys = {}
         @data_sources = {}
         @indexes      = {}
-        @database_version = nil
         @version = nil
       end
 
@@ -283,17 +276,15 @@ module ActiveRecord
         coder["data_sources"]     = @data_sources.sort.to_h
         coder["indexes"]          = @indexes.sort.to_h
         coder["version"]          = @version
-        coder["database_version"] = @database_version
       end
 
-      def init_with(coder)
+      def init_with(coder) # :nodoc:
         @columns          = coder["columns"]
         @columns_hash     = coder["columns_hash"]
         @primary_keys     = coder["primary_keys"]
         @data_sources     = coder["data_sources"]
         @indexes          = coder["indexes"] || {}
         @version          = coder["version"]
-        @database_version = coder["database_version"]
 
         unless coder["deduplicated"]
           derive_columns_hash_and_deduplicate_values
@@ -304,78 +295,85 @@ module ActiveRecord
         @columns.key?(table_name)
       end
 
-      def primary_keys(connection, table_name)
+      def primary_keys(pool, table_name)
         @primary_keys.fetch(table_name) do
-          if data_source_exists?(connection, table_name)
-            @primary_keys[deep_deduplicate(table_name)] = deep_deduplicate(connection.primary_key(table_name))
+          pool.with_connection do |connection|
+            if data_source_exists?(pool, table_name)
+              @primary_keys[deep_deduplicate(table_name)] = deep_deduplicate(connection.primary_key(table_name))
+            end
           end
         end
       end
 
       # A cached lookup for table existence.
-      def data_source_exists?(connection, name)
+      def data_source_exists?(pool, name)
         return if ignored_table?(name)
-        prepare_data_sources(connection) if @data_sources.empty?
+
+        if @data_sources.empty?
+          tables_to_cache(pool).each do |source|
+            @data_sources[source] = true
+          end
+        end
+
         return @data_sources[name] if @data_sources.key? name
 
-        @data_sources[deep_deduplicate(name)] = connection.data_source_exists?(name)
+        @data_sources[deep_deduplicate(name)] = pool.with_connection do |connection|
+          connection.data_source_exists?(name)
+        end
       end
 
       # Add internal cache for table with +table_name+.
-      def add(connection, table_name)
-        if data_source_exists?(connection, table_name)
-          primary_keys(connection, table_name)
-          columns(connection, table_name)
-          columns_hash(connection, table_name)
-          indexes(connection, table_name)
+      def add(pool, table_name)
+        pool.with_connection do
+          if data_source_exists?(pool, table_name)
+            primary_keys(pool, table_name)
+            columns(pool, table_name)
+            columns_hash(pool, table_name)
+            indexes(pool, table_name)
+          end
         end
       end
 
-      def data_sources(_connection, name) # :nodoc:
-        @data_sources[name]
-      end
-      deprecate data_sources: :data_source_exists?, deprecator: ActiveRecord.deprecator
-
       # Get the columns for a table
-      def columns(connection, table_name)
+      def columns(pool, table_name)
         if ignored_table?(table_name)
-          raise ActiveRecord::StatementInvalid, "Table '#{table_name}' doesn't exist"
+          raise ActiveRecord::StatementInvalid.new("Table '#{table_name}' doesn't exist", connection_pool: pool)
         end
 
         @columns.fetch(table_name) do
-          @columns[deep_deduplicate(table_name)] = deep_deduplicate(connection.columns(table_name))
+          pool.with_connection do |connection|
+            @columns[deep_deduplicate(table_name)] = deep_deduplicate(connection.columns(table_name))
+          end
         end
       end
 
       # Get the columns for a table as a hash, key is the column name
       # value is the column object.
-      def columns_hash(connection, table_name)
+      def columns_hash(pool, table_name)
         @columns_hash.fetch(table_name) do
-          @columns_hash[deep_deduplicate(table_name)] = columns(connection, table_name).index_by(&:name).freeze
+          @columns_hash[deep_deduplicate(table_name)] = columns(pool, table_name).index_by(&:name).freeze
         end
       end
 
       # Checks whether the columns hash is already cached for a table.
-      def columns_hash?(connection, table_name)
+      def columns_hash?(_pool, table_name)
         @columns_hash.key?(table_name)
       end
 
-      def indexes(connection, table_name)
+      def indexes(pool, table_name)
         @indexes.fetch(table_name) do
-          if data_source_exists?(connection, table_name)
-            @indexes[deep_deduplicate(table_name)] = deep_deduplicate(connection.indexes(table_name))
-          else
-            []
+          pool.with_connection do |connection|
+            if data_source_exists?(pool, table_name)
+              @indexes[deep_deduplicate(table_name)] = deep_deduplicate(connection.indexes(table_name))
+            else
+              []
+            end
           end
         end
       end
 
-      def database_version(connection) # :nodoc:
-        @database_version ||= connection.get_database_version
-      end
-
-      def version(connection)
-        @version ||= connection.schema_version
+      def version(pool)
+        @version ||= pool.with_connection(&:schema_version)
       end
 
       def schema_version
@@ -395,13 +393,14 @@ module ActiveRecord
         @indexes.delete name
       end
 
-      def add_all(connection) # :nodoc:
-        tables_to_cache(connection).each do |table|
-          add(connection, table)
-        end
+      def add_all(pool) # :nodoc:
+        pool.with_connection do
+          tables_to_cache(pool).each do |table|
+            add(pool, table)
+          end
 
-        version(connection)
-        database_version(connection)
+          version(pool)
+        end
       end
 
       def dump_to(filename)
@@ -415,20 +414,22 @@ module ActiveRecord
       end
 
       def marshal_dump # :nodoc:
-        [@version, @columns, {}, @primary_keys, @data_sources, @indexes, @database_version]
+        [@version, @columns, {}, @primary_keys, @data_sources, @indexes]
       end
 
       def marshal_load(array) # :nodoc:
-        @version, @columns, _columns_hash, @primary_keys, @data_sources, @indexes, @database_version = array
+        @version, @columns, _columns_hash, @primary_keys, @data_sources, @indexes, _database_version = array
         @indexes ||= {}
 
         derive_columns_hash_and_deduplicate_values
       end
 
       private
-        def tables_to_cache(connection)
-          connection.data_sources.reject do |table|
-            ignored_table?(table)
+        def tables_to_cache(pool)
+          pool.with_connection do |connection|
+            connection.data_sources.reject do |table|
+              ignored_table?(table)
+            end
           end
         end
 
@@ -459,12 +460,6 @@ module ActiveRecord
           end
         end
 
-        def prepare_data_sources(connection)
-          tables_to_cache(connection).each do |source|
-            @data_sources[source] = true
-          end
-        end
-
         def open(filename)
           FileUtils.mkdir_p(File.dirname(filename))