active_record_proxy_adapters 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb8746fdc07a5d8be73c0d9f49c0f1602705dc77d2f4a0d7fda5c4f7b5a9802
-  data.tar.gz: 217ca38e811ab142dfb14feff31cf049758d8e38bc99149d958ce7bf29bbb42a
+  metadata.gz: b25888bc158e220dfb06b349f47c467ef04dee2889a3e7ad6624ead7f2a6ed29
+  data.tar.gz: e0caf99eb8ae9e535a5c68a2c4a1a74471d67d023abc6afb6b1ebd5e2ade1f75
 SHA512:
-  metadata.gz: 30a9e38fd88738fb2a7f56525a7c501fe65c29d4e86635ca0e82c4fa0c64a3101471b204a10426740337add1c85a13dbfe00815807cb14d42a64d0788150fe3d
-  data.tar.gz: 1a9ed7079d6f4369c3baf1718776a6880772bea01790aac15f27326966378950b06d22826fef14d45a5460cc21c2d999add646af125178986f9e53474ff2fa5b
+  metadata.gz: cbff3cd696e3e52da998dbd44d1505f207f5bd81a1fc014eb6d95d46237ed49d4793c4084ecf34c761754ffabf5372202036ec33e427b80543f085d9c03a90c9
+  data.tar.gz: ae8121a5a61036bce0433d040e3b27bf130fae80084f08379108943afa369101cf3cb17e7b3ea14c3770f03b9e03e30098d250a6535646cda41c5ac89e16da61

data/lib/active_record/connection_adapters/mysql2_proxy_adapter.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
+require "active_record/tasks/mysql2_proxy_database_tasks"
+require "active_record/connection_adapters/mysql2_adapter"
 require "active_record_proxy_adapters/active_record_context"
 require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/mysql2_proxy"
-require "active_record/connection_adapters/mysql2_adapter"
-require "active_record/tasks/mysql2_proxy_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -13,12 +13,6 @@ module ActiveRecord
     class Mysql2ProxyAdapter < Mysql2Adapter
       include ActiveRecordProxyAdapters::Hijackable
 
-      if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_0?
-        require "active_record_proxy_adapters/transactionable_proxy_a_r_70"
-
-        include ActiveRecordProxyAdapters::TransactionableProxyAR70
-      end
-
       ADAPTER_NAME = "Mysql2Proxy"
 
       delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)

data/lib/active_record/connection_adapters/postgresql_proxy_adapter.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
+require "active_record/tasks/postgresql_proxy_database_tasks"
+require "active_record/connection_adapters/postgresql_adapter"
 require "active_record_proxy_adapters/active_record_context"
 require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/postgresql_proxy"
-require "active_record/connection_adapters/postgresql_adapter"
-require "active_record/tasks/postgresql_proxy_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -13,12 +13,6 @@ module ActiveRecord
     class PostgreSQLProxyAdapter < PostgreSQLAdapter
       include ActiveRecordProxyAdapters::Hijackable
 
-      if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_0?
-        require "active_record_proxy_adapters/transactionable_proxy_a_r_70"
-
-        include ActiveRecordProxyAdapters::TransactionableProxyAR70
-      end
-
       ADAPTER_NAME = "PostgreSQLProxy"
 
       delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)

data/lib/active_record/connection_adapters/sqlite3_proxy_adapter.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "active_record/tasks/sqlite3_proxy_database_tasks"
+require "active_record/connection_adapters/sqlite3_adapter"
+require "active_record_proxy_adapters/active_record_context"
+require "active_record_proxy_adapters/hijackable"
+require "active_record_proxy_adapters/sqlite3_proxy"
+
+module ActiveRecord
+  module ConnectionAdapters
+    # This adapter is a proxy to the original SQLite3Adapter, allowing the use of the
+    # ActiveRecordProxyAdapters::PrimaryReplicaProxy.
+    class SQLite3ProxyAdapter < SQLite3Adapter
+      include ActiveRecordProxyAdapters::Hijackable
+
+      ADAPTER_NAME = "SQLite3Proxy"
+
+      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)
+
+      def initialize(...)
+        @proxy = ActiveRecordProxyAdapters::SQLite3Proxy.new(self)
+
+        super
+      end
+
+      private
+
+      attr_reader :proxy
+    end
+  end
+end
+
+if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_2_or_greater?
+  ActiveRecord::ConnectionAdapters.register(
+    "sqlite3_proxy",
+    "ActiveRecord::ConnectionAdapters::SQLite3ProxyAdapter",
+    "active_record/connection_adapters/sqlite3_proxy_adapter"
+  )
+end
+
+ActiveSupport.run_load_hooks(:active_record_sqlite3proxyadapter,
+                             ActiveRecord::ConnectionAdapters::SQLite3ProxyAdapter)

data/lib/active_record/connection_adapters/trilogy_proxy_adapter.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
+require "active_record/tasks/trilogy_proxy_database_tasks"
+require "active_record/connection_adapters/trilogy_adapter"
 require "active_record_proxy_adapters/active_record_context"
 require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/trilogy_proxy"
-require "active_record/connection_adapters/trilogy_adapter"
-require "active_record/tasks/trilogy_proxy_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -13,12 +13,6 @@ module ActiveRecord
     class TrilogyProxyAdapter < TrilogyAdapter
       include ActiveRecordProxyAdapters::Hijackable
 
-      if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_0?
-        require "active_record_proxy_adapters/transactionable_proxy_a_r_70"
-
-        include ActiveRecordProxyAdapters::TransactionableProxyAR70
-      end
-
       ADAPTER_NAME = "TrilogyProxy"
 
       delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)

data/lib/active_record/tasks/sqlite3_proxy_database_tasks.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "active_record_proxy_adapters/database_tasks"
+
+module ActiveRecord
+  module Tasks
+    # Defines the sqlite3 tasks for dropping, creating, loading schema and dumping schema.
+    # Bypasses all the proxy logic to send all requests to primary.
+    class SQLite3ProxyDatabaseTasks < SQLiteDatabaseTasks
+      include ActiveRecordProxyAdapters::DatabaseTasks
+    end
+  end
+end
+
+# Allow proxy adapter to run rake tasks, i.e. db:drop, db:create, db:schema:load db:migrate, etc...
+ActiveRecord::Tasks::DatabaseTasks.register_task(
+  /sqlite3_proxy/,
+  "ActiveRecord::Tasks::SQLite3ProxyDatabaseTasks"
+)

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -47,10 +47,6 @@ module ActiveRecordProxyAdapters
       active_record_version >= Gem::Version.new("7.0") && active_record_version < Gem::Version.new("8.0")
     end
 
-    def active_record_v7_0?
-      active_record_version >= Gem::Version.new("7.0") && active_record_version < Gem::Version.new("7.1")
-    end
-
     def active_record_v7_1_or_greater?
       active_record_version >= Gem::Version.new("7.1")
     end

data/lib/active_record_proxy_adapters/connection_handling/sqlite3.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+begin
+  require "active_record/connection_adapters/sqlite3_proxy_adapter"
+rescue LoadError
+  # sqlite3 not available
+  return
+end
+
+module ActiveRecordProxyAdapters
+  module SQLite3
+    # Module to extend ActiveRecord::Base with the connection handling methods.
+    # Required to make adapter work in ActiveRecord versions <= 7.2.x
+    module ConnectionHandling
+      def sqlite3_proxy_adapter_class
+        ActiveRecord::ConnectionAdapters::SQLite3ProxyAdapter
+      end
+
+      def sqlite3_proxy_connection(config)
+        connection_factory_mapping
+          .fetch("#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}")
+          .call(config)
+      end
+
+      def connection_factory_mapping
+        {
+          "7.0" => ->(config) { sqlite3_proxy_connection_ar_v70(config) },
+          "7.1" => ->(config) { sqlite3_proxy_connection_ar_v71(config) }
+        }
+      end
+
+      def sqlite3_proxy_connection_ar_v70(config) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+        config = config.symbolize_keys
+
+        # Require database.
+        raise ArgumentError, "No database file specified. Missing argument: database" unless config[:database]
+
+        # Allow database path relative to Rails.root, but only if the database
+        # path is not the special path that tells sqlite to build a database only
+        # in memory.
+        if ":memory:" != config[:database] && !config[:database].to_s.start_with?("file:") # rubocop:disable Style/YodaCondition
+          config[:database] = File.expand_path(config[:database], Rails.root) if defined?(Rails.root)
+          dirname = File.dirname(config[:database])
+          Dir.mkdir(dirname) unless File.directory?(dirname)
+        end
+
+        db = ::SQLite3::Database.new(
+          config[:database].to_s,
+          config.merge(results_as_hash: true)
+        )
+
+        sqlite3_proxy_adapter_class.new(db, logger, nil, config)
+      rescue Errno::ENOENT => e
+        raise ActiveRecord::NoDatabaseError if e.message.include?("No such file or directory")
+
+        raise
+      end
+
+      def sqlite3_proxy_connection_ar_v71(config)
+        sqlite3_proxy_adapter_class.new(config)
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.extend(ActiveRecordProxyAdapters::SQLite3::ConnectionHandling)
+end

data/lib/active_record_proxy_adapters/connection_handling.rb

@@ -3,3 +3,4 @@
 require "active_record_proxy_adapters/connection_handling/postgresql"
 require "active_record_proxy_adapters/connection_handling/mysql2"
 require "active_record_proxy_adapters/connection_handling/trilogy"
+require "active_record_proxy_adapters/connection_handling/sqlite3"

data/lib/active_record_proxy_adapters/hijackable.rb

@@ -52,6 +52,8 @@ module ActiveRecordProxyAdapters
         "_unproxied"
       end
 
+      private
+
       def proxy_method_name_for(method_name)
         :"#{method_name}#{unproxied_method_suffix}"
       end
@@ -61,10 +63,6 @@ module ActiveRecordProxyAdapters
       def unproxied_method_suffix
         self.class.unproxied_method_suffix
       end
-
-      def proxy_method_name_for(method_name)
-        self.class.proxy_method_name_for(method_name)
-      end
     end
   end
 end

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -34,7 +34,6 @@ module ActiveRecordProxyAdapters
     WRITE_STATEMENT_MATCHERS = [
       /\ABEGIN/i,
       /\ACOMMIT/i,
-      /\AROLLBACK/i,
       /INSERT\s[\s\S]*INTO\s[\s\S]*/i,
       /UPDATE\s[\s\S]*/i,
       /DELETE\s[\s\S]*FROM\s[\s\S]*/i,

data/lib/active_record_proxy_adapters/railtie.rb

@@ -12,6 +12,9 @@ module ActiveRecordProxyAdapters
         autoloader.inflector.inflect(
           "postgresql_proxy_adapter" => "PostgreSQLProxyAdapter"
         )
+        autoloader.inflector.inflect(
+          "sqlite3_proxy_adapter" => "SQLite3ProxyAdapter"
+        )
       end
     end
   end

data/lib/active_record_proxy_adapters/sqlite3_proxy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "active_record_proxy_adapters/primary_replica_proxy"
+require "active_record_proxy_adapters/active_record_context"
+
+module ActiveRecordProxyAdapters
+  # Proxy to the original SQLite3Adapter, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
+  class SQLite3Proxy < PrimaryReplicaProxy
+  end
+end

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Cruz
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,16 +58,18 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - README.md
+- LICENSE.txt
 files:
 - LICENSE.txt
 - README.md
 - lib/active_record/connection_adapters/mysql2_proxy_adapter.rb
 - lib/active_record/connection_adapters/postgresql_proxy_adapter.rb
+- lib/active_record/connection_adapters/sqlite3_proxy_adapter.rb
 - lib/active_record/connection_adapters/trilogy_proxy_adapter.rb
 - lib/active_record/tasks/mysql2_proxy_database_tasks.rb
 - lib/active_record/tasks/postgresql_proxy_database_tasks.rb
+- lib/active_record/tasks/sqlite3_proxy_database_tasks.rb
 - lib/active_record/tasks/trilogy_proxy_database_tasks.rb
 - lib/active_record_proxy_adapters.rb
 - lib/active_record_proxy_adapters/active_record_context.rb
@@ -75,6 +77,7 @@ files:
 - lib/active_record_proxy_adapters/connection_handling.rb
 - lib/active_record_proxy_adapters/connection_handling/mysql2.rb
 - lib/active_record_proxy_adapters/connection_handling/postgresql.rb
+- lib/active_record_proxy_adapters/connection_handling/sqlite3.rb
 - lib/active_record_proxy_adapters/connection_handling/trilogy.rb
 - lib/active_record_proxy_adapters/database_tasks.rb
 - lib/active_record_proxy_adapters/hijackable.rb
@@ -83,7 +86,7 @@ files:
 - 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/transactionable_proxy_a_r_70.rb
+- lib/active_record_proxy_adapters/sqlite3_proxy.rb
 - lib/active_record_proxy_adapters/trilogy_proxy.rb
 - lib/active_record_proxy_adapters/version.rb
 homepage: https://github.com/Nasdaq/active_record_proxy_adapters
@@ -109,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Read replica proxy adapters for ActiveRecord!
 test_files: []

data/lib/active_record_proxy_adapters/transactionable_proxy_a_r_70.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordProxyAdapters
-  module TransactionableProxyAR70 # rubocop:disable Style/Documentation
-    extend ActiveSupport::Concern
-
-    included do
-      def begin_db_transaction # :nodoc:
-        bypass_proxy_or_else("BEGIN", "TRANSACTION") { super }
-      end
-
-      def commit_db_transaction # :nodoc:
-        bypass_proxy_or_else("COMMIT", "TRANSACTION") { super }
-      end
-
-      def exec_rollback_db_transaction # :nodoc:
-        bypass_proxy_or_else("ROLLBACK", "TRANSACTION") { super }
-      end
-
-      private
-
-      def bypass_proxy_or_else(*args)
-        method_name = proxy_method_name_for(:execute)
-
-        return public_send(method_name, *args) if respond_to?(method_name)
-
-        yield
-      end
-    end
-  end
-end