active_record_proxy_adapters 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38a1c803b775efa6be98d75f5ba3b7e2851724256a5c738fc6706d69e7ecf1cb
-  data.tar.gz: b0d6768c564347b4187b4ea3a66e0facc6dbf242ec59cb92a4ce7fd7d9182d73
+  metadata.gz: 5312effcf68a3305eb5e7804440112433f5b6837d6b71e7d122145eac4741619
+  data.tar.gz: 50586657daa02e76dfffebbe1faf8df5093198471faf847cec97cd16634c0c17
 SHA512:
-  metadata.gz: 0e076ea30e7860afcae92bfe7156b49bd39f7c644fdc1195191decf960eb6d534c053d16322db1c78e09daad5a766492cf57ba844620ccf8c3de5a87e2aa2b45
-  data.tar.gz: 101005780f17799ee9c34560c7f99893ee8d0e19194c6b5922e48cf5aec2a4af24eafba0691bff380e71623068b7b16a87c27d78849573dd4fae19f6a6c4687d
+  metadata.gz: 707b80a3618328639126d13f3f76bb8123105019b3e30c75f15c66a66a88d49aa5de4301fe70b25ff5356ef37e54ebff896f4cab0160cadbb79d08ae9cf0dc4e
+  data.tar.gz: 6b84984e33cf87abe9a12f5553bccffc32e2a9563a0c859c488cdae4be4c3a019ffce01242648620c67bb85a16dc61d982f0be8ecba83943f01c718e067743dc

data/.rspec

@@ -0,0 +1,4 @@
+--format documentation
+--color
+--order random
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,16 @@
+require:
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 3.1
+  NewCops: enable
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+RSpec/NestedGroups:
+  Enabled: true
+  Max: 5

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+## [Unreleased]
+
+## [0.2.0] - 2024-12-24
+
+- Add custom log subscriber to tag queries based on the adapter being used (68b8c1f4191388eb957bf12e0f84289da667e940)
+
+## [0.1.3] - 2024-12-24
+
+- Fix replica connection pool getter when database configurations have multiple replicas (ea5a33997da45ac073f166b3fbd2d12426053cd6)
+- Retrieve replica pool without checking out a connection (6470ef58e851082ae1f7a860ecdb5b451ef903c8)
+
+## [0.1.2] - 2024-12-16
+
+- Fix CTE regex matcher (4b1d10bfd952fb1f5b102de8cc1a5bd05d25f5e9)
+
+## [0.1.1] - 2024-11-27
+
+- Enable RubyGems MFA (2a71b1f4354fb966cc0aa68231ca5837814e07ee)
+
+## [0.1.0] - 2024-11-19
+
+- Add PostgreSQLProxyAdapter (2b3bb9f7359139519b32af3018ceb07fed8c6b33)
+
+## [0.1.0.rc2] - 2024-10-28
+
+- Add PostgreSQLProxyAdapter (2b3bb9f7359139519b32af3018ceb07fed8c6b33)

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

data/Dockerfile

@@ -0,0 +1,18 @@
+ARG RUBY_VERSION=3.2.3
+ARG DOCKER_REGISTRY=docker.io
+FROM $DOCKER_REGISTRY/ruby:$RUBY_VERSION-alpine
+ARG RAILS_VERSION="~> 6.1.0"
+ENV RAILS_VERSION=$RAILS_VERSION
+
+RUN apk --update add \
+    build-base \
+    git \
+    postgresql-dev \
+    postgresql-client
+RUN gem install bundler -v 2.5.13
+
+COPY . /app
+WORKDIR /app
+
+RUN bundle install
+

data/README.md

@@ -1,7 +1,5 @@
 # ActiveRecordProxyAdapters
 
-[![Run Test Suite](https://github.com/Nasdaq/active_record_proxy_adapters/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/Nasdaq/active_record_proxy_adapters/actions/workflows/test.yml)
-
 A set of ActiveRecord adapters that leverage Rails native multiple database setup to allow automatic connection switching from _one_ primary pool to _one_ replica pool at the database statement level.
 
 ## Installation

data/db/postgresql_structure.sql

@@ -0,0 +1,76 @@
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- Name: public; Type: SCHEMA; Schema: -; Owner: -
+--
+
+-- *not* creating schema, since initdb creates it
+
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: users; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.users (
+    id integer NOT NULL,
+    name text NOT NULL,
+    email text NOT NULL,
+    created_at timestamp without time zone DEFAULT now() NOT NULL,
+    updated_at timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+--
+-- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.users_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.users_id_seq OWNED BY public.users.id;
+
+
+--
+-- Name: users id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.users ALTER COLUMN id SET DEFAULT nextval('public.users_id_seq'::regclass);
+
+
+--
+-- Name: users users_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.users
+    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
+
+
+--
+-- PostgreSQL database dump complete
+--
+
+SET search_path TO "$user", public;
+

data/docker/postgres_replica/cmd.sh

@@ -0,0 +1,9 @@
+until pg_basebackup --pgdata=/var/lib/postgresql/data -R --slot=$PRIMARY_REPLICATION_SLOT --host=$PRIMARY_DATABASE_HOST --port=$PRIMARY_DATABASE_PORT
+do
+  echo 'Waiting for primary to connect...'
+  sleep 1s
+done
+
+echo 'Backup done, starting replica...'
+chmod 0700 /var/lib/postgresql/data
+postgres

data/docker-compose.yml

@@ -0,0 +1,78 @@
+name: active_record_proxy_adapters
+
+x-postgres-common: &postgres-common
+  restart: always
+  user: postgres
+  healthcheck:
+    test: 'pg_isready -U postgres_primary_test --dbname=postgres'
+    interval: 10s
+    timeout: 5s
+    retries: 5
+  networks:
+    - postgres
+
+services:
+  app:
+    build:
+      args:
+        - RUBY_VERSION=${RUBY_VERSION:-3.3.6}
+        - RAILS_VERSION=${RAILS_VERSION:-8.0.0}
+    container_name: app
+    image: active_record_proxy_adapters-app:${ENV_TAG:-latest}
+    tty: true
+    stdin_open: true
+    environment:
+      PGHOST: postgres_primary
+      PG_PRIMARY_USER: postgres_primary_test
+      PG_PRIMARY_PASSWORD: postgres_primary_test
+      PG_PRIMARY_HOST: postgres_primary
+      PG_PRIMARY_PORT: 5432
+      PG_REPLICA_USER: postgres_primary_test
+      PG_REPLICA_PASSWORD: postgres_primary_test
+      PG_REPLICA_HOST: postgres_replica
+      PG_REPLICA_PORT: 5432
+    depends_on:
+      - postgres_primary
+      - postgres_replica
+    networks:
+      - app
+      - postgres
+    volumes:
+      - .:/app
+  postgres_primary:
+    <<: *postgres-common
+    build:
+      context: .
+      dockerfile: postgres_primary.dockerfile
+      args:
+        - POSTGRES_LOGGING_COLLECTOR=${POSTGRES_LOGGING_COLLECTOR:-}
+        - POSTGRES_LOG_DESTINATION=${POSTGRES_LOG_DESTINATION:-}
+        - POSTGRES_LOG_STATEMENT=${POSTGRES_LOG_STATEMENT:-}
+        - REPLICA_USER=replicator
+        - REPLICA_PASSWORD=replicator
+    container_name: postgres_primary
+    environment:
+      POSTGRES_DB: postgres
+      POSTGRES_USER: postgres_primary_test
+      POSTGRES_PASSWORD: postgres_primary_test
+      POSTGRES_HOST_AUTH_METHOD: "scram-sha-256\nhost replication all 0.0.0.0/0 md5"
+      POSTGRES_INITDB_ARGS: "--auth-host=scram-sha-256"
+
+  postgres_replica:
+    <<: *postgres-common
+    build:
+      context: .
+      dockerfile: postgres_replica.dockerfile
+    container_name: postgres_replica
+    environment:
+      PGUSER: replicator
+      PGPASSWORD: replicator
+      PRIMARY_DATABASE_HOST: postgres_primary
+    depends_on:
+      - postgres_primary
+networks:
+  app:
+  postgres:
+
+volumes:
+  postgres_primary:

data/lib/active_record/connection_adapters/postgresql_proxy_adapter.rb

@@ -15,7 +15,7 @@ module ActiveRecord
 
       ADAPTER_NAME = "PostgreSQLProxy"
 
-      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)
+      delegate_to_proxy :execute, :exec_query
 
       unless ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v8_0_or_greater?
         delegate_to_proxy :exec_no_cache, :exec_cache

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -23,8 +23,6 @@ module ActiveRecordProxyAdapters
     end
 
     def connection_class_for(connection)
-      return connection.connection_descriptor.name.constantize if active_record_v8_0_2_or_greater?
-
       connection.connection_class || ActiveRecord::Base
     end
 
@@ -35,18 +33,6 @@ module ActiveRecordProxyAdapters
       ActiveRecord
     end
 
-    def hijackable_methods
-      hijackable = %i[execute exec_query]
-
-      hijackable << :internal_exec_query if active_record_v8_0_or_greater?
-
-      hijackable
-    end
-
-    def active_record_v7?
-      active_record_version >= Gem::Version.new("7.0") && active_record_version < Gem::Version.new("8.0")
-    end
-
     def active_record_v7_1_or_greater?
       active_record_version >= Gem::Version.new("7.1")
     end
@@ -58,9 +44,5 @@ module ActiveRecordProxyAdapters
     def active_record_v8_0_or_greater?
       active_record_version >= Gem::Version.new("8.0")
     end
-
-    def active_record_v8_0_2_or_greater?
-      active_record_version >= Gem::Version.new("8.0.2")
-    end
   end
 end

data/lib/active_record_proxy_adapters/configuration.rb

@@ -5,8 +5,10 @@ require "active_support/core_ext/integer/time"
 module ActiveRecordProxyAdapters
   # Provides a global configuration object to configure how the proxy should behave.
   class Configuration
-    PROXY_DELAY      = 2.seconds.freeze
-    CHECKOUT_TIMEOUT = 2.seconds.freeze
+    PROXY_DELAY                   = 2.seconds.freeze
+    CHECKOUT_TIMEOUT              = 2.seconds.freeze
+    LOG_SUBSCRIBER_PRIMARY_PREFIX = proc { |event| "#{event.payload[:connection].class::ADAPTER_NAME} Primary" }.freeze
+    LOG_SUBSCRIBER_REPLICA_PREFIX = proc { |event| "#{event.payload[:connection].class::ADAPTER_NAME} Replica" }.freeze
 
     # @return [ActiveSupport::Duration] How long the proxy should reroute all read requests to the primary database
     #   since the latest write. Defaults to PROXY_DELAY.
@@ -15,9 +17,25 @@ module ActiveRecordProxyAdapters
     #   Defaults to CHECKOUT_TIMEOUT.
     attr_accessor :checkout_timeout
 
+    # @return [Proc] Prefix for the log subscriber when the primary database is used.
+    attr_reader :log_subscriber_primary_prefix
+
+    # @return [Proc] Prefix for the log subscriber when the replica database is used.
+    attr_reader :log_subscriber_replica_prefix
+
     def initialize
-      self.proxy_delay      = PROXY_DELAY
-      self.checkout_timeout = CHECKOUT_TIMEOUT
+      self.proxy_delay                   = PROXY_DELAY
+      self.checkout_timeout              = CHECKOUT_TIMEOUT
+      self.log_subscriber_primary_prefix = LOG_SUBSCRIBER_PRIMARY_PREFIX
+      self.log_subscriber_replica_prefix = LOG_SUBSCRIBER_REPLICA_PREFIX
+    end
+
+    def log_subscriber_primary_prefix=(prefix)
+      @log_subscriber_primary_prefix = prefix.is_a?(Proc) ? prefix : proc { prefix.to_s }
+    end
+
+    def log_subscriber_replica_prefix=(prefix)
+      @log_subscriber_replica_prefix = prefix.is_a?(Proc) ? prefix : proc { prefix.to_s }
     end
   end
 end

data/lib/active_record_proxy_adapters/log_subscriber.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module ActiveRecordProxyAdapters
+  class LogSubscriber < ActiveRecord::LogSubscriber # rubocop:disable Style/Documentation
+    attach_to :active_record
+
+    IGNORE_PAYLOAD_NAMES = %w[SCHEMA EXPLAIN].freeze
+
+    def sql(event)
+      payload = event.payload
+      name = payload[:name]
+      unless IGNORE_PAYLOAD_NAMES.include?(name)
+        name = [database_instance_prefix_for(event), name].compact.join(" ")
+        payload[:name] = name
+      end
+      super
+    end
+
+    protected
+
+    def database_instance_prefix_for(event)
+      connection = event.payload[:connection]
+      config = connection.instance_variable_get(:@config)
+      prefix = if config[:replica] || config["replica"]
+                 log_subscriber_replica_prefix
+               else
+                 log_subscriber_primary_prefix
+               end
+
+      "[#{prefix.call(event)}]"
+    end
+
+    private
+
+    delegate :log_subscriber_primary_prefix, :log_subscriber_replica_prefix, to: :config
+
+    def config
+      ActiveRecordProxyAdapters.config
+    end
+  end
+end

data/lib/active_record_proxy_adapters/postgresql_proxy.rb

@@ -7,7 +7,7 @@ module ActiveRecordProxyAdapters
   # Proxy to the original PostgreSQLAdapter, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
   class PostgreSQLProxy < PrimaryReplicaProxy
     # ActiveRecord::PostgreSQLAdapter methods that should be proxied.
-    hijack_method(*ActiveRecordContext.hijackable_methods)
+    hijack_method :execute, :exec_query
 
     hijack_method :exec_no_cache, :exec_cache unless ActiveRecordContext.active_record_v8_0_or_greater?
   end

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -15,29 +15,17 @@ module ActiveRecordProxyAdapters
       /\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i,
       /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i
     ].map(&:freeze).freeze
-
-    CTE_MATCHER = /\A\s*WITH\s+(?<CTE>\S+\s+AS\s+\(\s?[\s\S]*\))/i
     # All queries that match these patterns should be sent to the replica database
-    SQL_REPLICA_MATCHERS = [
-      /\A\s*(select)\s/i,
-      /#{CTE_MATCHER.source}\s*select/i
-    ].map(&:freeze).freeze
+    SQL_REPLICA_MATCHERS     = [/\A\s*(select|with\s[\s\S]*\)\s*select)\s/i].map(&:freeze).freeze
     # All queries that match these patterns should be sent to all databases
     SQL_ALL_MATCHERS         = [/\A\s*set\s/i].map(&:freeze).freeze
     # Local sets queries should not be sent to all datbases
     SQL_SKIP_ALL_MATCHERS    = [/\A\s*set\s+local\s/i].map(&:freeze).freeze
     # These patterns define which database statments are considered write statments, so we can shortly re-route all
     # requests to the primary database so the replica has time to replicate
-    WRITE_STATEMENT_MATCHERS = [
-      /\ABEGIN/i,
-      /\ACOMMIT/i,
-      /INSERT\s[\s\S]*INTO\s[\s\S]*/i,
-      /UPDATE\s[\s\S]*/i,
-      /DELETE\s[\s\S]*FROM\s[\s\S]*/i,
-      /DROP\s/i
-    ].map(&:freeze).freeze
-
-    UNPROXIED_METHOD_SUFFIX = "_unproxied"
+    WRITE_STATEMENT_MATCHERS = [/\ABEGIN/i, /\ACOMMIT/i, /INSERT\sINTO\s/i, /UPDATE\s/i, /DELETE\sFROM\s/i,
+                                /DROP\s/i].map(&:freeze).freeze
+    UNPROXIED_METHOD_SUFFIX  = "_unproxied"
 
     # Defines which methods should be hijacked from the original adapter and use the proxy
     # @param method_names [Array<Symbol>] the list of method names from the adapter
@@ -74,42 +62,17 @@ module ActiveRecordProxyAdapters
 
     attr_reader :primary_connection, :last_write_at, :active_record_context
 
-    delegate :connection_handler, to: :connection_class
+    delegate :connection_handler, :connected_to_stack, to: :connection_class
     delegate :reading_role, :writing_role, to: :active_record_context
 
-    # We need to call .verify! to ensure `configure_connection` is called on the instance before attempting to use it.
-    # This is necessary because the connection may have been lazily initialized and is an unintended side effect from a
-    # change in Rails to defer connection verification: https://github.com/rails/rails/pull/44576
-    # verify! cannot be called before the object is initialized and because of how the proxy hooks into the connection
-    # instance, it has to be done lazily (hence the memoization). Ideally, we shouldn't have to worry about this at all
-    # But there is tight coupling between methods in ActiveRecord::ConnectionAdapters::AbstractAdapter and
-    # its descendants which will require significant refactoring to be decoupled.
-    # See https://github.com/rails/rails/issues/51780
-    def verified_primary_connection
-      @verified_primary_connection ||= begin
-        connected_to(role: writing_role) { primary_connection.verify! }
-
-        primary_connection
-      end
-    end
-
     def replica_pool_unavailable?
       !replica_pool
     end
 
     def replica_pool
-      # use default handler if the connection pool for specific class is not found
-      specific_replica_pool || default_replica_pool
-    end
-
-    def specific_replica_pool
       connection_handler.retrieve_connection_pool(connection_class.name, role: reading_role)
     end
 
-    def default_replica_pool
-      connection_handler.retrieve_connection_pool(ActiveRecord::Base.name, role: reading_role)
-    end
-
     def connection_class
       active_record_context.connection_class_for(primary_connection)
     end
@@ -148,26 +111,11 @@ module ActiveRecordProxyAdapters
       [reading_role, writing_role].include?(role) ? role : nil
     end
 
-    def connected_to_stack
-      return connection_class.connected_to_stack if connection_class.respond_to?(:connected_to_stack)
-
-      # handle Rails 7.2+ pending migrations Connection
-      return [{ role: writing_role }] if pending_migration_connection?
-
-      []
-    end
-
-    def pending_migration_connection?
-      active_record_context.active_record_v7_1_or_greater? &&
-        connection_class.name == "ActiveRecord::PendingMigrationConnection"
-    end
-
     def connection_for(role, sql_string)
-      connection = verified_primary_connection if role == writing_role || replica_pool_unavailable?
-
+      connection = primary_connection if role == writing_role || replica_pool_unavailable?
       connection ||= checkout_replica_connection
 
-      result = connected_to(role:) { yield connection }
+      result = yield(connection)
 
       update_primary_latest_write_timestamp if !replica_connection?(connection) && write_statement?(sql_string)
 
@@ -176,12 +124,6 @@ module ActiveRecordProxyAdapters
       replica_connection?(connection) && replica_pool.checkin(connection)
     end
 
-    def connected_to(role:, &block)
-      return block.call unless connection_class.respond_to?(:connected_to)
-
-      connection_class.connected_to(role:, &block)
-    end
-
     def replica_connection?(connection)
       connection && connection != primary_connection
     end
@@ -198,21 +140,16 @@ module ActiveRecordProxyAdapters
     # @return [TrueClass] if there has been a write within the last {#proxy_delay} seconds
     # @return [TrueClass] if sql_string matches a write statement (i.e. INSERT, UPDATE, DELETE, SELECT FOR UPDATE)
     # @return [FalseClass] if sql_string matches a read statement (i.e. SELECT)
-    def need_primary?(sql_string) # rubocop:disable Metrics/CyclomaticComplexity
-      return true  if recent_write_to_primary?
+    def need_primary?(sql_string)
+      return true if recent_write_to_primary?
+
       return true  if in_transaction?
-      return true  if cte_for_write?(sql_string)
       return true  if SQL_PRIMARY_MATCHERS.any?(&match_sql?(sql_string))
       return false if SQL_REPLICA_MATCHERS.any?(&match_sql?(sql_string))
 
       true
     end
 
-    def cte_for_write?(sql_string)
-      CTE_MATCHER.match?(sql_string) &&
-        WRITE_STATEMENT_MATCHERS.any?(&match_sql?(sql_string))
-    end
-
     def need_all?(sql_string)
       return false if SQL_SKIP_ALL_MATCHERS.any?(&match_sql?(sql_string))
 

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/postgres_primary.dockerfile

@@ -0,0 +1,34 @@
+FROM docker.io/postgres:14-alpine
+
+ARG REPLICA_USER=replicator
+ARG REPLICA_PASSWORD=replicator
+ARG REPLICATION_SLOT_NAME=replication_slot
+ARG INIT_SQL=00_init.sql
+ARG POSTGRES_LOGGING_COLLECTOR=
+ARG POSTGRES_LOG_DESTINATION=
+ARG POSTGRES_LOG_STATEMENT=
+ENV CONF_SAMPLE="/usr/local/share/postgresql/postgresql.conf.sample"
+
+WORKDIR /docker-entrypoint-initdb.d
+
+USER root
+
+RUN touch $INIT_SQL
+RUN chown -R postgres:postgres $INIT_SQL
+RUN echo "CREATE USER ${REPLICA_USER} WITH REPLICATION ENCRYPTED PASSWORD '${REPLICA_PASSWORD}';" > $INIT_SQL
+RUN echo "SELECT pg_create_physical_replication_slot('${REPLICATION_SLOT_NAME}');" >> $INIT_SQL
+
+# Enable logging collector if given
+RUN if [[ ! -z "${POSTGRES_LOGGING_COLLECTOR}" ]]; then sed -i "s/#\(logging_collector = \)off\(.*\)/\1${POSTGRES_LOGGING_COLLECTOR}\2/" ${CONF_SAMPLE}; fi
+
+# Override  default log destination if given
+RUN if [[ ! -z "${POSTGRES_LOG_DESTINATION}" ]]; then sed -i "s/#\(log_destination = \)'stderr'\(.*\)/\1'${POSTGRES_LOG_DESTINATION}'\2/" ${CONF_SAMPLE}; fi
+
+# Override log statement if given
+RUN if [[ ! -z "${POSTGRES_LOG_STATEMENT}" ]]; then sed -i "s/#\(log_statement = \)'none'\(.*\)/\1'${POSTGRES_LOG_STATEMENT}'\2/" ${CONF_SAMPLE}; fi
+
+WORKDIR /
+
+USER postgres
+
+CMD  ["postgres", "-c", "wal_level=replica", "-c", "hot_standby=on", "-c", "max_wal_senders=10", "-c", "max_replication_slots=10", "-c", "hot_standby_feedback=on" ]

data/postgres_replica.dockerfile

@@ -0,0 +1,15 @@
+FROM docker.io/postgres:14-alpine
+
+ENV PRIMARY_DATABASE_HOST=localhost
+ENV PRIMARY_DATABASE_PORT=5432
+ENV PRIMARY_REPLICATION_SLOT=replication_slot
+
+
+COPY docker/postgres_replica/cmd.sh cmd.sh
+
+USER root
+RUN chown -R postgres:postgres cmd.sh
+USER postgres
+RUN chmod u+x cmd.sh
+
+CMD [ "./cmd.sh" ]

data/sig/active_record_proxy_adapters.rbs

@@ -0,0 +1,4 @@
+module ActiveRecordProxyAdapters
+  VERSION: String
+  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Cruz
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,12 +58,18 @@ email:
 - matt.cruz@nasdaq.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE.txt
+extra_rdoc_files: []
 files:
+- ".rspec"
+- ".rubocop.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- Dockerfile
 - LICENSE.txt
 - README.md
+- db/postgresql_structure.sql
+- docker-compose.yml
+- docker/postgres_replica/cmd.sh
 - lib/active_record/connection_adapters/postgresql_proxy_adapter.rb
 - lib/active_record/tasks/postgresql_proxy_database_tasks.rb
 - lib/active_record_proxy_adapters.rb
@@ -70,10 +77,14 @@ files:
 - lib/active_record_proxy_adapters/configuration.rb
 - lib/active_record_proxy_adapters/connection_handling.rb
 - lib/active_record_proxy_adapters/hijackable.rb
+- lib/active_record_proxy_adapters/log_subscriber.rb
 - lib/active_record_proxy_adapters/postgresql_proxy.rb
 - lib/active_record_proxy_adapters/primary_replica_proxy.rb
 - lib/active_record_proxy_adapters/railtie.rb
 - lib/active_record_proxy_adapters/version.rb
+- postgres_primary.dockerfile
+- postgres_replica.dockerfile
+- sig/active_record_proxy_adapters.rbs
 homepage: https://github.com/Nasdaq/active_record_proxy_adapters
 licenses:
 - MIT
@@ -83,6 +94,7 @@ metadata:
   source_code_uri: https://github.com/Nasdaq/active_record_proxy_adapters
   changelog_uri: https://github.com/Nasdaq/active_record_proxy_adapters/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,7 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Read replica proxy adapters for ActiveRecord!
 test_files: []