activerecord-yugabytedb-adapter 7.0.4.1 → 7.1.3.4

data/lib/active_record/connection_adapters/yugabytedb_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-gem "yugabyte_ysql", "~> 0.3"
-require "yugabyte_ysql"
+gem "yugabytedb-ysql", "~> 0.3"
+require "ysql"
 
 require_relative "../../arel/visitors/yugabytedb"
 require "active_support/core_ext/object/try"
@@ -22,28 +22,19 @@ require "active_record/connection_adapters/yugabytedb/utils"
 
 module ActiveRecord
   module ConnectionHandling # :nodoc:
+    def yugabytedb_adapter_class
+      ConnectionAdapters::YugabyteDBAdapter
+    end
+
     # Establishes a connection to the database that's used by all Active Record objects
     def yugabytedb_connection(config)
-      conn_params = config.symbolize_keys.compact
-
-      # Map ActiveRecords param names to PGs.
-      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
-      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
-
-      # Forward only valid config params to PG::Connection.connect.
-      valid_conn_param_keys = YugabyteYSQL::Connection.conndefaults_hash.keys + [:requiressl]
-      conn_params.slice!(*valid_conn_param_keys)
-
-      ConnectionAdapters::YugabyteDBAdapter.new(
-        ConnectionAdapters::YugabyteDBAdapter.new_client(conn_params),
-        logger,
-        conn_params,
-        config,
-        )
+      yugabytedb_adapter_class.new(config)
     end
   end
 
   module ConnectionAdapters
+    # = Active Record YugabyteDB Adapter
+    #
     # The PostgreSQL adapter works with the native C (https://github.com/ged/ruby-pg) driver.
     #
     # Options:
@@ -76,18 +67,39 @@ module ActiveRecord
 
       class << self
         def new_client(conn_params)
-          YugabyteYSQL.connect(**conn_params)
-        rescue ::YugabyteYSQL::Error => error
-          if conn_params && conn_params[:dbname] && error.message.include?(conn_params[:dbname])
+          YSQL.connect(**conn_params)
+        rescue ::YSQL::Error => error
+          if conn_params && conn_params[:dbname] == "postgres"
+            raise ActiveRecord::ConnectionNotEstablished, error.message
+          elsif conn_params && conn_params[:dbname] && error.message.include?(conn_params[:dbname])
             raise ActiveRecord::NoDatabaseError.db_error(conn_params[:dbname])
           elsif conn_params && conn_params[:user] && error.message.include?(conn_params[:user])
             raise ActiveRecord::DatabaseConnectionError.username_error(conn_params[:user])
-          elsif conn_params && conn_params[:hostname] && error.message.include?(conn_params[:hostname])
-            raise ActiveRecord::DatabaseConnectionError.hostname_error(conn_params[:hostname])
+          elsif conn_params && conn_params[:host] && error.message.include?(conn_params[:host])
+            raise ActiveRecord::DatabaseConnectionError.hostname_error(conn_params[:host])
           else
             raise ActiveRecord::ConnectionNotEstablished, error.message
           end
         end
+
+        def dbconsole(config, options = {})
+          pg_config = config.configuration_hash
+
+          ENV["PGUSER"]         = pg_config[:username] if pg_config[:username]
+          ENV["PGHOST"]         = pg_config[:host] if pg_config[:host]
+          ENV["PGPORT"]         = pg_config[:port].to_s if pg_config[:port]
+          ENV["PGPASSWORD"]     = pg_config[:password].to_s if pg_config[:password] && options[:include_password]
+          ENV["PGSSLMODE"]      = pg_config[:sslmode].to_s if pg_config[:sslmode]
+          ENV["PGSSLCERT"]      = pg_config[:sslcert].to_s if pg_config[:sslcert]
+          ENV["PGSSLKEY"]       = pg_config[:sslkey].to_s if pg_config[:sslkey]
+          ENV["PGSSLROOTCERT"]  = pg_config[:sslrootcert].to_s if pg_config[:sslrootcert]
+          if pg_config[:variables]
+            ENV["PGOPTIONS"] = pg_config[:variables].filter_map do |name, value|
+              "-c #{name}=#{value.to_s.gsub(/[ \\]/, '\\\\\0')}" unless value == ":default" || value == :default
+            end.join(" ")
+          end
+          find_cmd_and_exec("psql", config.database)
+        end
       end
 
       ##
@@ -97,10 +109,11 @@ module ActiveRecord
       # but significantly increases the risk of data loss if the database
       # crashes. As a result, this should not be used in production
       # environments. If you would like all created tables to be unlogged in
-      # the test environment you can add the following line to your test.rb
-      # file:
+      # the test environment you can add the following to your test.rb file:
       #
-      #   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables = true
+      #   ActiveSupport.on_load(:active_record_postgresqladapter) do
+      #     self.create_unlogged_tables = true
+      #   end
       class_attribute :create_unlogged_tables, default: false
 
       ##
@@ -184,13 +197,17 @@ module ActiveRecord
       end
 
       def supports_partitioned_indexes?
-        database_version >= 110_000 # >= 11.0
+        database_version >= 11_00_00 # >= 11.0
       end
 
       def supports_partial_index?
         true
       end
 
+      def supports_index_include?
+        database_version >= 11_00_00 # >= 11.0
+      end
+
       def supports_expression_index?
         true
       end
@@ -207,6 +224,14 @@ module ActiveRecord
         true
       end
 
+      def supports_exclusion_constraints?
+        true
+      end
+
+      def supports_unique_constraints?
+        true
+      end
+
       def supports_validate_constraints?
         true
       end
@@ -235,25 +260,41 @@ module ActiveRecord
         true
       end
 
+      def supports_restart_db_transaction?
+        database_version >= 12_00_00 # >= 12.0
+      end
+
       def supports_insert_returning?
         true
       end
 
       def supports_insert_on_conflict?
-        database_version >= 90500 # >= 9.5
+        database_version >= 9_05_00 # >= 9.5
       end
       alias supports_insert_on_duplicate_skip? supports_insert_on_conflict?
       alias supports_insert_on_duplicate_update? supports_insert_on_conflict?
       alias supports_insert_conflict_target? supports_insert_on_conflict?
 
       def supports_virtual_columns?
-        database_version >= 120_000 # >= 12.0
+        database_version >= 12_00_00 # >= 12.0
+      end
+
+      def supports_identity_columns? # :nodoc:
+        database_version >= 10_00_00 # >= 10.0
+      end
+
+      def supports_nulls_not_distinct?
+        database_version >= 15_00_00 # >= 15.0
       end
 
       def index_algorithms
         { 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)
@@ -266,80 +307,75 @@ module ActiveRecord
         end
 
         private
-        def dealloc(key)
-          @connection.query "DEALLOCATE #{key}" if connection_active?
-        rescue YugabyteYSQL::Error
-        end
-
-        def connection_active?
-          @connection.status == YugabyteYSQL::CONNECTION_OK
-        rescue YugabyteYSQL::Error
-          false
-        end
+          def dealloc(key)
+            # This is ugly, but safe: the statement pool is only
+            # accessed while holding the connection's lock. (And we
+            # don't need the complication of with_raw_connection because
+            # a reconnect would invalidate the entire statement pool.)
+            if conn = @connection.instance_variable_get(:@raw_connection)
+              conn.query "DEALLOCATE #{key}" if conn.status == YSQL::CONNECTION_OK
+            end
+          rescue YSQL::Error
+          end
       end
 
       # Initializes and connects a YugabyteDB adapter.
-      def initialize(connection, logger, connection_parameters, config)
-        super(connection, logger, config)
+      def initialize(...)
+        super
 
-        @connection_parameters = connection_parameters || {}
+        conn_params = @config.compact
 
-        # @local_tz is initialized as nil to avoid warnings when connect tries to use it
-        @local_tz = nil
-        @max_identifier_length = nil
+        # Map ActiveRecords param names to PGs.
+        conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
+        conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-        configure_connection
-        add_pg_encoders
-        add_pg_decoders
+        # Forward only valid config params to PG::Connection.connect.
+        valid_conn_param_keys = YSQL::Connection.conndefaults_hash.keys + [:requiressl]
+        conn_params.slice!(*valid_conn_param_keys)
 
-        @type_map = Type::HashLookupTypeMap.new
-        initialize_type_map
-        @local_tz = execute("SHOW TIME ZONE", "SCHEMA").first["TimeZone"]
-        @use_insert_returning = @config.key?(:insert_returning) ? self.class.type_cast_config_to_boolean(@config[:insert_returning]) : true
-      end
+        @connection_parameters = conn_params
 
-      def self.database_exists?(config)
-        !!ActiveRecord::Base.yugabytedb_connection(config)
-      rescue ActiveRecord::NoDatabaseError
-        false
+        @max_identifier_length = nil
+        @type_map = nil
+        @raw_connection = nil
+        @notice_receiver_sql_warnings = []
+
+        @use_insert_returning = @config.key?(:insert_returning) ? self.class.type_cast_config_to_boolean(@config[:insert_returning]) : true
       end
 
       # Is this connection alive and ready for queries?
       def active?
         @lock.synchronize do
-          @connection.query ";"
+          return false unless @raw_connection
+          @raw_connection.query ";"
         end
         true
-      rescue YugabyteYSQL::Error
+      rescue YSQL::Error
         false
       end
 
       def reload_type_map # :nodoc:
-        type_map.clear
-        initialize_type_map
-      end
-
-      # Close then reopen the connection.
-      def reconnect!
         @lock.synchronize do
-          super
-          @connection.reset
-          configure_connection
-          reload_type_map
-        rescue YugabyteYSQL::ConnectionBad
-          connect
+          if @type_map
+            type_map.clear
+          else
+            @type_map = Type::HashLookupTypeMap.new
+          end
+
+          initialize_type_map
         end
       end
 
       def reset!
         @lock.synchronize do
-          clear_cache!
-          reset_transaction
-          unless @connection.transaction_status == ::YugabyteYSQL::PQTRANS_IDLE
-            @connection.query "ROLLBACK"
+          return connect! unless @raw_connection
+
+          unless @raw_connection.transaction_status == ::YSQL::PQTRANS_IDLE
+            @raw_connection.query "ROLLBACK"
           end
-          @connection.query "DISCARD ALL"
-          configure_connection
+          @raw_connection.query "DISCARD ALL"
+
+          super
         end
       end
 
@@ -348,14 +384,15 @@ module ActiveRecord
       def disconnect!
         @lock.synchronize do
           super
-          @connection.close rescue nil
+          @raw_connection&.close rescue nil
+          @raw_connection = nil
         end
       end
 
       def discard! # :nodoc:
         super
-        @connection.socket_io.reopen(IO::NULL) rescue nil
-        @connection = nil
+        @raw_connection&.socket_io&.reopen(IO::NULL) rescue nil
+        @raw_connection = nil
       end
 
       def native_database_types # :nodoc:
@@ -364,14 +401,14 @@ module ActiveRecord
 
       def self.native_database_types # :nodoc:
         @native_database_types ||= begin
-                                     types = NATIVE_DATABASE_TYPES.dup
-                                     types[:datetime] = types[datetime_type]
-                                     types
-                                   end
+          types = NATIVE_DATABASE_TYPES.dup
+          types[:datetime] = types[datetime_type]
+          types
+        end
       end
 
       def set_standard_conforming_strings
-        execute("SET standard_conforming_strings = on", "SCHEMA")
+        internal_execute("SET standard_conforming_strings = on")
       end
 
       def supports_ddl_transactions?
@@ -399,7 +436,7 @@ module ActiveRecord
       end
 
       def supports_pgcrypto_uuid?
-        database_version >= 90400 # >= 9.4
+        database_version >= 9_04_00 # >= 9.4
       end
 
       def supports_optimizer_hints?
@@ -431,14 +468,21 @@ module ActiveRecord
         query_value("SELECT pg_advisory_unlock(#{lock_id})")
       end
 
-      def enable_extension(name)
-        exec_query("CREATE EXTENSION IF NOT EXISTS \"#{name}\"").tap {
-          reload_type_map
-        }
+      def enable_extension(name, **)
+        schema, name = name.to_s.split(".").values_at(-2, -1)
+        sql = +"CREATE EXTENSION IF NOT EXISTS \"#{name}\""
+        sql << " SCHEMA #{schema}" if schema
+
+        internal_exec_query(sql).tap { reload_type_map }
       end
 
-      def disable_extension(name)
-        exec_query("DROP EXTENSION IF EXISTS \"#{name}\" CASCADE").tap {
+      # Removes an extension from the database.
+      #
+      # [<tt>:force</tt>]
+      #   Set to +:cascade+ to drop dependent objects as well.
+      #   Defaults to false.
+      def disable_extension(name, force: false)
+        internal_exec_query("DROP EXTENSION IF EXISTS \"#{name}\"#{' CASCADE' if force == :cascade}").tap {
           reload_type_map
         }
       end
@@ -452,7 +496,7 @@ module ActiveRecord
       end
 
       def extensions
-        exec_query("SELECT extname FROM pg_extension", "SCHEMA").cast_values
+        internal_exec_query("SELECT extname FROM pg_extension", "SCHEMA", allow_retry: true, materialize_transactions: false).cast_values
       end
 
       # Returns a list of defined enum types, and their values.
@@ -460,31 +504,97 @@ module ActiveRecord
         query = <<~SQL
           SELECT
             type.typname AS name,
+            type.OID AS oid,
+            n.nspname AS schema,
             string_agg(enum.enumlabel, ',' ORDER BY enum.enumsortorder) AS value
           FROM pg_enum AS enum
-          JOIN pg_type AS type
-            ON (type.oid = enum.enumtypid)
-          GROUP BY type.typname;
+          JOIN pg_type AS type ON (type.oid = enum.enumtypid)
+          JOIN pg_namespace n ON type.typnamespace = n.oid
+          WHERE n.nspname = ANY (current_schemas(false))
+          GROUP BY type.OID, n.nspname, type.typname;
         SQL
-        exec_query(query, "SCHEMA").cast_values
+
+        internal_exec_query(query, "SCHEMA", allow_retry: true, materialize_transactions: false).cast_values.each_with_object({}) do |row, memo|
+          name, schema = row[0], row[2]
+          schema = nil if schema == current_schema
+          full_name = [schema, name].compact.join(".")
+          memo[full_name] = row.last
+        end.to_a
       end
 
       # Given a name and an array of values, creates an enum type.
-      def create_enum(name, values)
-        sql_values = values.map { |s| "'#{s}'" }.join(", ")
+      def create_enum(name, values, **options)
+        sql_values = values.map { |s| quote(s) }.join(", ")
+        scope = quoted_scope(name)
         query = <<~SQL
           DO $$
           BEGIN
               IF NOT EXISTS (
-                SELECT 1 FROM pg_type t
-                WHERE t.typname = '#{name}'
+                SELECT 1
+                FROM pg_type t
+                JOIN pg_namespace n ON t.typnamespace = n.oid
+                WHERE t.typname = #{scope[:name]}
+                  AND n.nspname = #{scope[:schema]}
               ) THEN
-                  CREATE TYPE \"#{name}\" AS ENUM (#{sql_values});
+                  CREATE TYPE #{quote_table_name(name)} AS ENUM (#{sql_values});
               END IF;
           END
           $$;
         SQL
-        exec_query(query)
+        internal_exec_query(query).tap { reload_type_map }
+      end
+
+      # Drops an enum type.
+      #
+      # If the <tt>if_exists: true</tt> option is provided, the enum is dropped
+      # only if it exists. Otherwise, if the enum doesn't exist, an error is
+      # raised.
+      #
+      # The +values+ parameter will be ignored if present. It can be helpful
+      # to provide this in a migration's +change+ method so it can be reverted.
+      # In that case, +values+ will be used by #create_enum.
+      def drop_enum(name, values = nil, **options)
+        query = <<~SQL
+          DROP TYPE#{' IF EXISTS' if options[:if_exists]} #{quote_table_name(name)};
+        SQL
+        internal_exec_query(query).tap { reload_type_map }
+      end
+
+      # Rename an existing enum type to something else.
+      def rename_enum(name, options = {})
+        to = options.fetch(:to) { raise ArgumentError, ":to is required" }
+
+        exec_query("ALTER TYPE #{quote_table_name(name)} RENAME TO #{to}").tap { reload_type_map }
+      end
+
+      # Add enum value to an existing enum type.
+      def add_enum_value(type_name, value, options = {})
+        before, after = options.values_at(:before, :after)
+        sql = +"ALTER TYPE #{quote_table_name(type_name)} ADD VALUE '#{value}'"
+
+        if before && after
+          raise ArgumentError, "Cannot have both :before and :after at the same time"
+        elsif before
+          sql << " BEFORE '#{before}'"
+        elsif after
+          sql << " AFTER '#{after}'"
+        end
+
+        execute(sql).tap { reload_type_map }
+      end
+
+      # Rename enum value on an existing enum type.
+      def rename_enum_value(type_name, options = {})
+        unless database_version >= 10_00_00 # >= 10.0
+          raise ArgumentError, "Renaming enum values is only supported in PostgreSQL 10 or later"
+        end
+
+        from = options.fetch(:from) { raise ArgumentError, ":from is required" }
+        to = options.fetch(:to) { raise ArgumentError, ":to is required" }
+
+        execute("ALTER TYPE #{quote_table_name(type_name)} RENAME VALUE '#{from}' TO '#{to}'").tap {
+          reload_type_map
+        }
       end
 
       # Returns the configured supported identifier length supported by PostgreSQL
@@ -495,16 +605,16 @@ module ActiveRecord
       # Set the authorized user for this session
       def session_auth=(user)
         clear_cache!
-        execute("SET SESSION AUTHORIZATION #{user}")
+        internal_execute("SET SESSION AUTHORIZATION #{user}", nil, materialize_transactions: true)
       end
 
       def use_insert_returning?
         @use_insert_returning
       end
 
-      # Returns the version of the connected PostgreSQL server.
+      # Returns the version of the connected YugabyteDB server.
       def get_database_version # :nodoc:
-        @connection.server_version
+        valid_raw_connection.server_version
       end
       alias :yugabytedb_version :database_version
 
@@ -532,8 +642,8 @@ module ActiveRecord
       end
 
       def check_version # :nodoc:
-        if database_version < 90300 # < 9.3
-          raise "Your version of PostgreSQL (#{database_version}) is too old. Active Record supports PostgreSQL >= 9.3."
+        if database_version < 9_03_00 # < 9.3
+          raise "Your version of YugabyteDB (#{database_version}) is too old. Active Record supports YugabyteDB >= 9.3."
         end
       end
 
@@ -576,10 +686,6 @@ module ActiveRecord
           m.register_type "polygon", OID::SpecializedString.new(:polygon)
           m.register_type "circle", OID::SpecializedString.new(:circle)
 
-          register_class_with_precision m, "time", Type::Time
-          register_class_with_precision m, "timestamp", OID::Timestamp
-          register_class_with_precision m, "timestamptz", OID::TimestampWithTimeZone
-
           m.register_type "numeric" do |_, fmod, sql_type|
             precision = extract_precision(sql_type)
             scale = extract_scale(sql_type)
@@ -608,316 +714,369 @@ module ActiveRecord
       end
 
       private
-      def type_map
-        @type_map ||= Type::HashLookupTypeMap.new
-      end
+        attr_reader :type_map
 
-      def initialize_type_map(m = type_map)
-        self.class.initialize_type_map(m)
-        load_additional_types
-      end
+        def initialize_type_map(m = type_map)
+          self.class.initialize_type_map(m)
 
-      # Extracts the value from a PostgreSQL column default definition.
-      def extract_value_from_default(default)
-        case default
-          # Quoted types
-        when /\A[(B]?'(.*)'.*::"?([\w. ]+)"?(?:\[\])?\z/m
-          # The default 'now'::date is CURRENT_DATE
-          if $1 == "now" && $2 == "date"
-            nil
+          self.class.register_class_with_precision m, "time", Type::Time, timezone: @default_timezone
+          self.class.register_class_with_precision m, "timestamp", OID::Timestamp, timezone: @default_timezone
+          self.class.register_class_with_precision m, "timestamptz", OID::TimestampWithTimeZone
+
+          load_additional_types
+        end
+
+        # Extracts the value from a PostgreSQL column default definition.
+        def extract_value_from_default(default)
+          case default
+            # Quoted types
+          when /\A[(B]?'(.*)'.*::"?([\w. ]+)"?(?:\[\])?\z/m
+            # The default 'now'::date is CURRENT_DATE
+            if $1 == "now" && $2 == "date"
+              nil
+            else
+              $1.gsub("''", "'")
+            end
+            # Boolean types
+          when "true", "false"
+            default
+            # Numeric types
+          when /\A\(?(-?\d+(\.\d*)?)\)?(::bigint)?\z/
+            $1
+            # Object identifier types
+          when /\A-?\d+\z/
+            $1
           else
-            $1.gsub("''", "'")
+            # Anything else is blank, some user type, or some function
+            # and we can't know the value of that, so return nil.
+            nil
           end
-          # Boolean types
-        when "true", "false"
-          default
-          # Numeric types
-        when /\A\(?(-?\d+(\.\d*)?)\)?(::bigint)?\z/
-          $1
-          # Object identifier types
-        when /\A-?\d+\z/
-          $1
-        else
-          # Anything else is blank, some user type, or some function
-          # and we can't know the value of that, so return nil.
-          nil
         end
-      end
-
-      def extract_default_function(default_value, default)
-        default if has_default_function?(default_value, default)
-      end
-
-      def has_default_function?(default_value, default)
-        !default_value && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
-      end
 
-      # See https://www.postgresql.org/docs/current/static/errcodes-appendix.html
-      VALUE_LIMIT_VIOLATION = "22001"
-      NUMERIC_VALUE_OUT_OF_RANGE = "22003"
-      NOT_NULL_VIOLATION    = "23502"
-      FOREIGN_KEY_VIOLATION = "23503"
-      UNIQUE_VIOLATION      = "23505"
-      SERIALIZATION_FAILURE = "40001"
-      DEADLOCK_DETECTED     = "40P01"
-      DUPLICATE_DATABASE    = "42P04"
-      LOCK_NOT_AVAILABLE    = "55P03"
-      QUERY_CANCELED        = "57014"
+        def extract_default_function(default_value, default)
+          default if has_default_function?(default_value, default)
+        end
 
-      def translate_exception(exception, message:, sql:, binds:)
-        return exception unless exception.respond_to?(:result)
+        def has_default_function?(default_value, default)
+          !default_value && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
+        end
 
-        case exception.result.try(:error_field, YugabyteYSQL::PG_DIAG_SQLSTATE)
-        when nil
-          if exception.message.match?(/connection is closed/i)
-            ConnectionNotEstablished.new(exception)
+        # See https://www.postgresql.org/docs/current/static/errcodes-appendix.html
+        VALUE_LIMIT_VIOLATION = "22001"
+        NUMERIC_VALUE_OUT_OF_RANGE = "22003"
+        NOT_NULL_VIOLATION    = "23502"
+        FOREIGN_KEY_VIOLATION = "23503"
+        UNIQUE_VIOLATION      = "23505"
+        SERIALIZATION_FAILURE = "40001"
+        DEADLOCK_DETECTED     = "40P01"
+        DUPLICATE_DATABASE    = "42P04"
+        LOCK_NOT_AVAILABLE    = "55P03"
+        QUERY_CANCELED        = "57014"
+
+        def translate_exception(exception, message:, sql:, binds:)
+          return exception unless exception.respond_to?(:result)
+
+          case exception.result.try(:error_field, YSQL::PG_DIAG_SQLSTATE)
+          when nil
+            if exception.message.match?(/connection is closed/i)
+              ConnectionNotEstablished.new(exception, connection_pool: @pool)
+            elsif exception.is_a?(YSQL::ConnectionBad)
+              # libpq message style always ends with a newline; the pg gem's internal
+              # errors do not. We separate these cases because a pg-internal
+              # ConnectionBad means it failed before it managed to send the query,
+              # whereas a libpq failure could have occurred at any time (meaning the
+              # server may have already executed part or all of the query).
+              if exception.message.end_with?("\n")
+                ConnectionFailed.new(exception, connection_pool: @pool)
+              else
+                ConnectionNotEstablished.new(exception, connection_pool: @pool)
+              end
+            else
+              super
+            end
+          when UNIQUE_VIOLATION
+            RecordNotUnique.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when FOREIGN_KEY_VIOLATION
+            InvalidForeignKey.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when VALUE_LIMIT_VIOLATION
+            ValueTooLong.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when NUMERIC_VALUE_OUT_OF_RANGE
+            RangeError.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when NOT_NULL_VIOLATION
+            NotNullViolation.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when SERIALIZATION_FAILURE
+            SerializationFailure.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when DEADLOCK_DETECTED
+            Deadlocked.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when DUPLICATE_DATABASE
+            DatabaseAlreadyExists.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when LOCK_NOT_AVAILABLE
+            LockWaitTimeout.new(message, sql: sql, binds: binds, connection_pool: @pool)
+          when QUERY_CANCELED
+            QueryCanceled.new(message, sql: sql, binds: binds, connection_pool: @pool)
           else
             super
           end
-        when UNIQUE_VIOLATION
-          RecordNotUnique.new(message, sql: sql, binds: binds)
-        when FOREIGN_KEY_VIOLATION
-          InvalidForeignKey.new(message, sql: sql, binds: binds)
-        when VALUE_LIMIT_VIOLATION
-          ValueTooLong.new(message, sql: sql, binds: binds)
-        when NUMERIC_VALUE_OUT_OF_RANGE
-          RangeError.new(message, sql: sql, binds: binds)
-        when NOT_NULL_VIOLATION
-          NotNullViolation.new(message, sql: sql, binds: binds)
-        when SERIALIZATION_FAILURE
-          SerializationFailure.new(message, sql: sql, binds: binds)
-        when DEADLOCK_DETECTED
-          Deadlocked.new(message, sql: sql, binds: binds)
-        when DUPLICATE_DATABASE
-          DatabaseAlreadyExists.new(message, sql: sql, binds: binds)
-        when LOCK_NOT_AVAILABLE
-          LockWaitTimeout.new(message, sql: sql, binds: binds)
-        when QUERY_CANCELED
-          QueryCanceled.new(message, sql: sql, binds: binds)
-        else
-          super
         end
-      end
 
-      def get_oid_type(oid, fmod, column_name, sql_type = "")
-        if !type_map.key?(oid)
-          load_additional_types([oid])
+        def retryable_query_error?(exception)
+          # We cannot retry anything if we're inside a broken transaction; we need to at
+          # least raise until the innermost savepoint is rolled back
+          @raw_connection&.transaction_status != ::YSQL::PQTRANS_INERROR &&
+            super
         end
 
-        type_map.fetch(oid, fmod, sql_type) {
-          warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
-          Type.default_value.tap do |cast_type|
-            type_map.register_type(oid, cast_type)
+        def get_oid_type(oid, fmod, column_name, sql_type = "")
+          if !type_map.key?(oid)
+            load_additional_types([oid])
           end
-        }
-      end
 
-      def load_additional_types(oids = nil)
-        initializer = OID::TypeMapInitializer.new(type_map)
-        load_types_queries(initializer, oids) do |query|
-          execute_and_clear(query, "SCHEMA", []) do |records|
-            initializer.run(records)
+          type_map.fetch(oid, fmod, sql_type) {
+            warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
+            Type.default_value.tap do |cast_type|
+              type_map.register_type(oid, cast_type)
+            end
+          }
+        end
+
+        def load_additional_types(oids = nil)
+          initializer = OID::TypeMapInitializer.new(type_map)
+          load_types_queries(initializer, oids) do |query|
+            execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |records|
+              initializer.run(records)
+            end
           end
         end
-      end
 
-      def load_types_queries(initializer, oids)
-        query = <<~SQL
+        def load_types_queries(initializer, oids)
+          query = <<~SQL
             SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
             FROM pg_type as t
             LEFT JOIN pg_range as r ON oid = rngtypid
           SQL
-        if oids
-          yield query + "WHERE t.oid IN (%s)" % oids.join(", ")
-        else
-          yield query + initializer.query_conditions_for_known_type_names
-          yield query + initializer.query_conditions_for_known_type_types
-          yield query + initializer.query_conditions_for_array_types
+          if oids
+            yield query + "WHERE t.oid IN (%s)" % oids.join(", ")
+          else
+            yield query + initializer.query_conditions_for_known_type_names
+            yield query + initializer.query_conditions_for_known_type_types
+            yield query + initializer.query_conditions_for_array_types
+          end
         end
-      end
 
-      FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
+        FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
 
-      def execute_and_clear(sql, name, binds, prepare: false, async: false)
-        sql = transform_query(sql)
-        check_if_write_query(sql)
+        def execute_and_clear(sql, name, binds, prepare: false, async: false, allow_retry: false, materialize_transactions: true)
+          sql = transform_query(sql)
+          check_if_write_query(sql)
 
-        if !prepare || without_prepared_statement?(binds)
-          result = exec_no_cache(sql, name, binds, async: async)
-        else
-          result = exec_cache(sql, name, binds, async: async)
-        end
-        begin
-          ret = yield result
-        ensure
-          result.clear
+          if !prepare || without_prepared_statement?(binds)
+            result = exec_no_cache(sql, name, binds, async: async, allow_retry: allow_retry, materialize_transactions: materialize_transactions)
+          else
+            result = exec_cache(sql, name, binds, async: async, allow_retry: allow_retry, materialize_transactions: materialize_transactions)
+          end
+          begin
+            ret = yield result
+          ensure
+            result.clear
+          end
+          ret
         end
-        ret
-      end
 
-      def exec_no_cache(sql, name, binds, async: false)
-        materialize_transactions
-        mark_transaction_written_if_write(sql)
+        def exec_no_cache(sql, name, binds, async:, allow_retry:, materialize_transactions:)
+          mark_transaction_written_if_write(sql)
 
-        # make sure we carry over any changes to ActiveRecord.default_timezone that have been
-        # made since we established the connection
-        update_typemap_for_default_timezone
+          # make sure we carry over any changes to ActiveRecord.default_timezone that have been
+          # made since we established the connection
+          update_typemap_for_default_timezone
 
-        type_casted_binds = type_casted_binds(binds)
-        log(sql, name, binds, type_casted_binds, async: async) do
-          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-            @connection.exec_params(sql, type_casted_binds)
+          type_casted_binds = type_casted_binds(binds)
+          log(sql, name, binds, type_casted_binds, async: async) do
+            with_raw_connection do |conn|
+              result = conn.exec_params(sql, type_casted_binds)
+              verified!
+              result
+            end
           end
         end
-      end
 
-      def exec_cache(sql, name, binds, async: false)
-        materialize_transactions
-        mark_transaction_written_if_write(sql)
-        update_typemap_for_default_timezone
+        def exec_cache(sql, name, binds, async:, allow_retry:, materialize_transactions:)
+          mark_transaction_written_if_write(sql)
+
+          update_typemap_for_default_timezone
 
-        stmt_key = prepare_statement(sql, binds)
-        type_casted_binds = type_casted_binds(binds)
+          with_raw_connection 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
-          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-            @connection.exec_prepared(stmt_key, type_casted_binds)
+            log(sql, name, binds, type_casted_binds, stmt_key, async: async) do
+              result = conn.exec_prepared(stmt_key, type_casted_binds)
+              verified!
+              result
+            end
           end
-        end
-      rescue ActiveRecord::StatementInvalid => e
-        raise unless is_cached_plan_failure?(e)
-
-        # 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)
-        else
-          @lock.synchronize do
-            # outside of transactions we can simply flush this query and retry
-            @statements.delete sql_key(sql)
+        rescue ActiveRecord::StatementInvalid => e
+          raise unless is_cached_plan_failure?(e)
+
+          # 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)
+          else
+            @lock.synchronize do
+              # outside of transactions we can simply flush this query and retry
+              @statements.delete sql_key(sql)
+            end
+            retry
           end
-          retry
         end
-      end
 
-      # Annoyingly, the code for prepared statements whose return value may
-      # have changed is FEATURE_NOT_SUPPORTED.
-      #
-      # This covers various different error types so we need to do additional
-      # work to classify the exception definitively as a
-      # ActiveRecord::PreparedStatementCacheExpired
-      #
-      # Check here for more details:
-      # https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
-      def is_cached_plan_failure?(e)
-        pgerror = e.cause
-        pgerror.result.result_error_field(YugabyteYSQL::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
-          pgerror.result.result_error_field(YugabyteYSQL::PG_DIAG_SOURCE_FUNCTION) == "RevalidateCachedQuery"
-      rescue
-        false
-      end
+        # Annoyingly, the code for prepared statements whose return value may
+        # have changed is FEATURE_NOT_SUPPORTED.
+        #
+        # This covers various different error types so we need to do additional
+        # work to classify the exception definitively as a
+        # ActiveRecord::PreparedStatementCacheExpired
+        #
+        # Check here for more details:
+        # https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
+        def is_cached_plan_failure?(e)
+          pgerror = e.cause
+          pgerror.result.result_error_field(YSQL::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
+            pgerror.result.result_error_field(YSQL::PG_DIAG_SOURCE_FUNCTION) == "RevalidateCachedQuery"
+        rescue
+          false
+        end
 
-      def in_transaction?
-        open_transactions > 0
-      end
+        def in_transaction?
+          open_transactions > 0
+        end
 
-      # Returns the statement identifier for the client side cache
-      # of statements
-      def sql_key(sql)
-        "#{schema_search_path}-#{sql}"
-      end
+        # Returns the statement identifier for the client side cache
+        # of statements
+        def sql_key(sql)
+          "#{schema_search_path}-#{sql}"
+        end
 
-      # Prepare the statement if it hasn't been prepared, return
-      # the statement key.
-      def prepare_statement(sql, binds)
-        @lock.synchronize do
+        # Prepare the statement if it hasn't been prepared, return
+        # the statement key.
+        def prepare_statement(sql, binds, conn)
           sql_key = sql_key(sql)
           unless @statements.key? sql_key
             nextkey = @statements.next_key
             begin
-              @connection.prepare nextkey, sql
+              conn.prepare nextkey, sql
             rescue => e
               raise translate_exception_class(e, sql, binds)
             end
             # Clear the queue
-            @connection.get_last_result
+            conn.get_last_result
             @statements[sql_key] = nextkey
           end
           @statements[sql_key]
         end
-      end
 
-      # Connects to a PostgreSQL server and sets up the adapter depending on the
-      # connected server's characteristics.
-      def connect
-        @connection = self.class.new_client(@connection_parameters)
-        configure_connection
-        add_pg_encoders
-        add_pg_decoders
-      end
+        # Connects to a PostgreSQL server and sets up the adapter depending on the
+        # connected server's characteristics.
+        def connect
+          @raw_connection = self.class.new_client(@connection_parameters)
+        rescue ConnectionNotEstablished => ex
+          raise ex.set_pool(@pool)
+        end
+
+        def reconnect
+          begin
+            @raw_connection&.reset
+          rescue YSQL::ConnectionBad
+            @raw_connection = nil
+          end
 
-      # 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
-        if @config[:encoding]
-          @connection.set_client_encoding(@config[:encoding])
+          connect unless @raw_connection
         end
-        self.client_min_messages = @config[:min_messages] || "warning"
-        self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
 
-        # Use standard-conforming strings so we don't have to do the E'...' dance.
-        set_standard_conforming_strings
+        # 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
+          if @config[:encoding]
+            @raw_connection.set_client_encoding(@config[:encoding])
+          end
+          self.client_min_messages = @config[:min_messages] || "warning"
+          self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
+
+          unless ActiveRecord.db_warnings_action.nil?
+            @raw_connection.set_notice_receiver do |result|
+              message = result.error_field(YSQL::Result::PG_DIAG_MESSAGE_PRIMARY)
+              code = result.error_field(YSQL::Result::PG_DIAG_SQLSTATE)
+              level = result.error_field(YSQL::Result::PG_DIAG_SEVERITY)
+              @notice_receiver_sql_warnings << SQLWarning.new(message, code, level, nil, @pool)
+            end
+          end
 
-        variables = @config.fetch(:variables, {}).stringify_keys
+          # Use standard-conforming strings so we don't have to do the E'...' dance.
+          set_standard_conforming_strings
 
-        # If using Active Record's time zone support configure the connection to return
-        # TIMESTAMP WITH ZONE types in UTC.
-        unless variables["timezone"]
-          if ActiveRecord.default_timezone == :utc
-            variables["timezone"] = "UTC"
-          elsif @local_tz
-            variables["timezone"] = @local_tz
+          variables = @config.fetch(:variables, {}).stringify_keys
+
+          # Set interval output format to ISO 8601 for ease of parsing by ActiveSupport::Duration.parse
+          internal_execute("SET intervalstyle = iso_8601")
+
+          # SET statements from :variables config hash
+          # https://www.postgresql.org/docs/current/static/sql-set.html
+          variables.map do |k, v|
+            if v == ":default" || v == :default
+              # Sets the value to the global or compile default
+              internal_execute("SET SESSION #{k} TO DEFAULT")
+            elsif !v.nil?
+              internal_execute("SET SESSION #{k} TO #{quote(v)}")
+            end
           end
+
+          add_pg_encoders
+          add_pg_decoders
+
+          reload_type_map
         end
 
-        # Set interval output format to ISO 8601 for ease of parsing by ActiveSupport::Duration.parse
-        execute("SET intervalstyle = iso_8601", "SCHEMA")
-
-        # SET statements from :variables config hash
-        # https://www.postgresql.org/docs/current/static/sql-set.html
-        variables.map do |k, v|
-          if v == ":default" || v == :default
-            # Sets the value to the global or compile default
-            execute("SET SESSION #{k} TO DEFAULT", "SCHEMA")
-          elsif !v.nil?
-            execute("SET SESSION #{k} TO #{quote(v)}", "SCHEMA")
+        def reconfigure_connection_timezone
+          variables = @config.fetch(:variables, {}).stringify_keys
+
+          # If it's been directly configured as a connection variable, we don't
+          # need to do anything here; it will be set up by configure_connection
+          # and then never changed.
+          return if variables["timezone"]
+
+          # If using Active Record's time zone support configure the connection
+          # to return TIMESTAMP WITH ZONE types in UTC.
+          if default_timezone == :utc
+            internal_execute("SET SESSION timezone TO 'UTC'")
+          else
+            internal_execute("SET SESSION timezone TO DEFAULT")
           end
         end
-      end
 
-      # Returns the list of a table's column names, data types, and default values.
-      #
-      # The underlying query is roughly:
-      #  SELECT column.name, column.type, default.value, column.comment
-      #    FROM column LEFT JOIN default
-      #      ON column.table_id = default.table_id
-      #     AND column.num = default.column_num
-      #   WHERE column.table_id = get_table_id('table_name')
-      #     AND column.num > 0
-      #     AND NOT column.is_dropped
-      #   ORDER BY column.num
-      #
-      # If the table name is not prefixed with a schema, the database will
-      # take the first match from the schema search path.
-      #
-      # Query implementation notes:
-      #  - format_type includes the column size constraint, e.g. varchar(50)
-      #  - ::regclass is a function that gives the id for a table name
-      def column_definitions(table_name)
-        query(<<~SQL, "SCHEMA")
+        # Returns the list of a table's column names, data types, and default values.
+        #
+        # The underlying query is roughly:
+        #  SELECT column.name, column.type, default.value, column.comment
+        #    FROM column LEFT JOIN default
+        #      ON column.table_id = default.table_id
+        #     AND column.num = default.column_num
+        #   WHERE column.table_id = get_table_id('table_name')
+        #     AND column.num > 0
+        #     AND NOT column.is_dropped
+        #   ORDER BY column.num
+        #
+        # If the table name is not prefixed with a schema, the database will
+        # take the first match from the schema search path.
+        #
+        # Query implementation notes:
+        #  - format_type includes the column size constraint, e.g. varchar(50)
+        #  - ::regclass is a function that gives the id for a table name
+        def column_definitions(table_name)
+          query(<<~SQL, "SCHEMA")
               SELECT a.attname, format_type(a.atttypid, a.atttypmod),
                      pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod,
                      c.collname, col_description(a.attrelid, a.attnum) AS comment,
+                     #{supports_identity_columns? ? 'attidentity' : quote('')} AS identity,
                      #{supports_virtual_columns? ? 'attgenerated' : quote('')} as attgenerated
                 FROM pg_attribute a
                 LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
@@ -927,142 +1086,144 @@ module ActiveRecord
                  AND a.attnum > 0 AND NOT a.attisdropped
                ORDER BY a.attnum
           SQL
-      end
+        end
 
-      def extract_table_ref_from_insert_sql(sql)
-        sql[/into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im]
-        $1.strip if $1
-      end
+        def arel_visitor
+          Arel::Visitors::YugabyteDB.new(self)
+        end
 
-      def arel_visitor # todo
-        Arel::Visitors::YugabyteDB.new(self)
-      end
+        def build_statement_pool
+          StatementPool.new(self, self.class.type_cast_config_to_integer(@config[:statement_limit]))
+        end
 
-      def build_statement_pool
-        StatementPool.new(@connection, self.class.type_cast_config_to_integer(@config[:statement_limit]))
-      end
+        def can_perform_case_insensitive_comparison_for?(column)
+          # NOTE: citext is an exception. It is possible to perform a
+          #       case-insensitive comparison using `LOWER()`, but it is
+          #       unnecessary, as `citext` is case-insensitive by definition.
+          @case_insensitive_cache ||= { "citext" => false }
+          @case_insensitive_cache.fetch(column.sql_type) do
+            @case_insensitive_cache[column.sql_type] = begin
+              sql = <<~SQL
+                SELECT exists(
+                  SELECT * FROM pg_proc
+                  WHERE proname = 'lower'
+                    AND proargtypes = ARRAY[#{quote column.sql_type}::regtype]::oidvector
+                ) OR exists(
+                  SELECT * FROM pg_proc
+                  INNER JOIN pg_cast
+                    ON ARRAY[casttarget]::oidvector = proargtypes
+                  WHERE proname = 'lower'
+                    AND castsource = #{quote column.sql_type}::regtype
+                )
+              SQL
+              execute_and_clear(sql, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |result|
+                result.getvalue(0, 0)
+              end
+            end
+          end
+        end
 
-      def can_perform_case_insensitive_comparison_for?(column)
-        @case_insensitive_cache ||= {}
-        @case_insensitive_cache[column.sql_type] ||= begin
-                                                       sql = <<~SQL
-              SELECT exists(
-                SELECT * FROM pg_proc
-                WHERE proname = 'lower'
-                  AND proargtypes = ARRAY[#{quote column.sql_type}::regtype]::oidvector
-              ) OR exists(
-                SELECT * FROM pg_proc
-                INNER JOIN pg_cast
-                  ON ARRAY[casttarget]::oidvector = proargtypes
-                WHERE proname = 'lower'
-                  AND castsource = #{quote column.sql_type}::regtype
-              )
-            SQL
-                                                       execute_and_clear(sql, "SCHEMA", []) do |result|
-                                                         result.getvalue(0, 0)
-                                                       end
-                                                     end
-      end
+        def add_pg_encoders
+          map = YSQL::TypeMapByClass.new
+          map[Integer] = YSQL::TextEncoder::Integer.new
+          map[TrueClass] = YSQL::TextEncoder::Boolean.new
+          map[FalseClass] = YSQL::TextEncoder::Boolean.new
+          @raw_connection.type_map_for_queries = map
+        end
 
-      def add_pg_encoders
-        map = YugabyteYSQL::TypeMapByClass.new
-        map[Integer] = YugabyteYSQL::TextEncoder::Integer.new
-        map[TrueClass] = YugabyteYSQL::TextEncoder::Boolean.new
-        map[FalseClass] = YugabyteYSQL::TextEncoder::Boolean.new
-        @connection.type_map_for_queries = map
-      end
+        def update_typemap_for_default_timezone
+          if @raw_connection && @mapped_default_timezone != default_timezone && @timestamp_decoder
+            decoder_class = default_timezone == :utc ?
+                              YSQL::TextDecoder::TimestampUtc :
+                              YSQL::TextDecoder::TimestampWithoutTimeZone
 
-      def update_typemap_for_default_timezone
-        if @default_timezone != ActiveRecord.default_timezone && @timestamp_decoder
-          decoder_class = ActiveRecord.default_timezone == :utc ?
-                            YugabyteYSQL::TextDecoder::TimestampUtc :
-                            YugabyteYSQL::TextDecoder::TimestampWithoutTimeZone
+            @timestamp_decoder = decoder_class.new(**@timestamp_decoder.to_h)
+            @raw_connection.type_map_for_results.add_coder(@timestamp_decoder)
 
-          @timestamp_decoder = decoder_class.new(@timestamp_decoder.to_h)
-          @connection.type_map_for_results.add_coder(@timestamp_decoder)
+            @mapped_default_timezone = default_timezone
 
-          @default_timezone = ActiveRecord.default_timezone
+            # if default timezone has changed, we need to reconfigure the connection
+            # (specifically, the session time zone)
+            reconfigure_connection_timezone
 
-          # if default timezone has changed, we need to reconfigure the connection
-          # (specifically, the session time zone)
-          configure_connection
+            true
+          end
         end
-      end
-
-      def add_pg_decoders
-        @default_timezone = nil
-        @timestamp_decoder = nil
-
-        coders_by_name = {
-          "int2" => YugabyteYSQL::TextDecoder::Integer,
-          "int4" => YugabyteYSQL::TextDecoder::Integer,
-          "int8" => YugabyteYSQL::TextDecoder::Integer,
-          "oid" => YugabyteYSQL::TextDecoder::Integer,
-          "float4" => YugabyteYSQL::TextDecoder::Float,
-          "float8" => YugabyteYSQL::TextDecoder::Float,
-          "numeric" => YugabyteYSQL::TextDecoder::Numeric,
-          "bool" => YugabyteYSQL::TextDecoder::Boolean,
-          "timestamp" => YugabyteYSQL::TextDecoder::TimestampUtc,
-          "timestamptz" => YugabyteYSQL::TextDecoder::TimestampWithTimeZone,
-        }
 
-        known_coder_types = coders_by_name.keys.map { |n| quote(n) }
-        query = <<~SQL % known_coder_types.join(", ")
+        def add_pg_decoders
+          @mapped_default_timezone = nil
+          @timestamp_decoder = nil
+
+          coders_by_name = {
+            "int2" => YSQL::TextDecoder::Integer,
+            "int4" => YSQL::TextDecoder::Integer,
+            "int8" => YSQL::TextDecoder::Integer,
+            "oid" => YSQL::TextDecoder::Integer,
+            "float4" => YSQL::TextDecoder::Float,
+            "float8" => YSQL::TextDecoder::Float,
+            "numeric" => YSQL::TextDecoder::Numeric,
+            "bool" => YSQL::TextDecoder::Boolean,
+            "timestamp" => YSQL::TextDecoder::TimestampUtc,
+            "timestamptz" => YSQL::TextDecoder::TimestampWithTimeZone,
+          }
+
+          known_coder_types = coders_by_name.keys.map { |n| quote(n) }
+          query = <<~SQL % known_coder_types.join(", ")
             SELECT t.oid, t.typname
             FROM pg_type as t
             WHERE t.typname IN (%s)
           SQL
-        coders = execute_and_clear(query, "SCHEMA", []) do |result|
-          result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
-        end
+          coders = execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |result|
+            result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
+          end
 
-        map = YugabyteYSQL::TypeMapByOid.new
-        coders.each { |coder| map.add_coder(coder) }
-        @connection.type_map_for_results = map
+          map = YSQL::TypeMapByOid.new
+          coders.each { |coder| map.add_coder(coder) }
+          @raw_connection.type_map_for_results = map
 
-        @type_map_for_results = YugabyteYSQL::TypeMapByOid.new
-        @type_map_for_results.default_type_map = map
-        @type_map_for_results.add_coder(YugabyteYSQL::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
-        @type_map_for_results.add_coder(MoneyDecoder.new(oid: 790, name: "money"))
+          @type_map_for_results = YSQL::TypeMapByOid.new
+          @type_map_for_results.default_type_map = map
+          @type_map_for_results.add_coder(YSQL::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
+          @type_map_for_results.add_coder(MoneyDecoder.new(oid: 790, name: "money"))
 
-        # extract timestamp decoder for use in update_typemap_for_default_timezone
-        @timestamp_decoder = coders.find { |coder| coder.name == "timestamp" }
-        update_typemap_for_default_timezone
-      end
+          # extract timestamp decoder for use in update_typemap_for_default_timezone
+          @timestamp_decoder = coders.find { |coder| coder.name == "timestamp" }
+          update_typemap_for_default_timezone
+        end
 
-      def construct_coder(row, coder_class)
-        return unless coder_class
-        coder_class.new(oid: row["oid"].to_i, name: row["typname"])
-      end
+        def construct_coder(row, coder_class)
+          return unless coder_class
+          coder_class.new(oid: row["oid"].to_i, name: row["typname"])
+        end
 
-      class MoneyDecoder < YugabyteYSQL::SimpleDecoder # :nodoc:
-        TYPE = OID::Money.new
+        class MoneyDecoder < YSQL::SimpleDecoder # :nodoc:
+          TYPE = OID::Money.new
 
-        def decode(value, tuple = nil, field = nil)
-          TYPE.deserialize(value)
+          def decode(value, tuple = nil, field = nil)
+            TYPE.deserialize(value)
+          end
         end
-      end
 
-      ActiveRecord::Type.add_modifier({ array: true }, OID::Array, adapter: :yugabytedb)
-      ActiveRecord::Type.add_modifier({ range: true }, OID::Range, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:bit, OID::Bit, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:bit_varying, OID::BitVarying, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:binary, OID::Bytea, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:cidr, OID::Cidr, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:date, OID::Date, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:datetime, OID::DateTime, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:decimal, OID::Decimal, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:enum, OID::Enum, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:hstore, OID::Hstore, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:inet, OID::Inet, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:interval, OID::Interval, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:jsonb, OID::Jsonb, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:money, OID::Money, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:point, OID::Point, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:legacy_point, OID::LegacyPoint, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:uuid, OID::Uuid, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:vector, OID::Vector, adapter: :yugabytedb)
-      ActiveRecord::Type.register(:xml, OID::Xml, adapter: :yugabytedb)
+        ActiveRecord::Type.add_modifier({ array: true }, OID::Array, adapter: :yugabytedb)
+        ActiveRecord::Type.add_modifier({ range: true }, OID::Range, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:bit, OID::Bit, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:bit_varying, OID::BitVarying, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:binary, OID::Bytea, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:cidr, OID::Cidr, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:date, OID::Date, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:datetime, OID::DateTime, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:decimal, OID::Decimal, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:enum, OID::Enum, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:hstore, OID::Hstore, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:inet, OID::Inet, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:interval, OID::Interval, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:jsonb, OID::Jsonb, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:money, OID::Money, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:point, OID::Point, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:legacy_point, OID::LegacyPoint, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:uuid, OID::Uuid, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:vector, OID::Vector, adapter: :yugabytedb)
+        ActiveRecord::Type.register(:xml, OID::Xml, adapter: :yugabytedb)
     end
     ActiveSupport.run_load_hooks(:active_record_yugabytedbadapter, YugabyteDBAdapter)
   end