active_record_proxy_adapters 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f614128aa280355a9bc8c83e29805fc36c81f8389c017489c848e075a5510c3
-  data.tar.gz: d28585b2d7d1f7645dfc89007890a2c35ee19c4acc6de1b850e4f3b792cc0c07
+  metadata.gz: 151caa80f35f53ad02ef3307a55ef0fec4f1a6f369e6afac8d063e4ea2ad5e7f
+  data.tar.gz: 60213ad52a363c435514038eeb65227bff7132b91a6dbed86b8917459449c39e
 SHA512:
-  metadata.gz: b3e36b3fe27bce5b1bdb9035fc399362f99d25062d97abc9024c02a30a8c6a328a2de3bdacda5682622c812f38f8b4a1da48d76e687131d3a6e07e44be4c6995
-  data.tar.gz: 053d2cfdea1db5699cd18404e8b22524a826012534eb0e077b307102021adeccde565f9e7b6417dbbe053669464a7220ab3e1e2cb3b92201cc0b296e8f23f5ce
+  metadata.gz: 7720b6fe6b2d6848d30444f77c71d2567996f2e45011c79e6c4791e043b7d9333c2d92554cdf5f6b5a48c29c6b384509a00b9f9b3b930402d47c98188744daa7
+  data.tar.gz: b73be535ad798afb4386d4027e4e92df00d9864a196d4cc1d30ad3a0a4e524c87ad12f67d214ef524a1641800ccf5bc2ab4911acf49c5606d867f51981a18fec

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 
-- Add Mysql2ProxyAdapter
+- Fix Active Record adapters dependency loading
+
+## [0.3.0] - 2025-01-17
+
+- Add Mysql2ProxyAdapter https://github.com/Nasdaq/active_record_proxy_adapters/commit/7481b79dc93114f9b3b40faa8f3eecce90fe9104
 
 ## [0.2.2, 0.1.5] - 2025-01-02
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 Nasdaq
+Copyright (c) 2024 Nasdaq, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/active_record_proxy_adapters/connection_handling/mysql2.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+begin
+  require "active_record/connection_adapters/mysql2_proxy_adapter"
+rescue LoadError
+  # mysql2 not available
+  return
+end
+
+module ActiveRecordProxyAdapters
+  # Module to extend ActiveRecord::Base with the connection handling methods.
+  # Required to make adapter work in ActiveRecord versions <= 7.2.x
+  module ConnectionHandling
+    def mysql2_proxy_adapter_class
+      ::ActiveRecord::ConnectionAdapters::Mysql2ProxyAdapter
+    end
+
+    # This method is a copy and paste from Rails' mysql2_connection,
+    # replacing Mysql2Adapter by Mysql2ProxyAdapter
+    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
+    def mysql2_proxy_connection(config) # rubocop:disable Metrics/MethodLength
+      config = config.symbolize_keys
+      config[:flags] ||= 0
+
+      if config[:flags].is_a? Array
+        config[:flags].push "FOUND_ROWS"
+      else
+        config[:flags] |= Mysql2::Client::FOUND_ROWS
+      end
+
+      mysql2_proxy_adapter_class.new(
+        mysql2_proxy_adapter_class.new_client(config),
+        logger,
+        nil,
+        config
+      )
+    end
+  end
+end

data/lib/active_record_proxy_adapters/connection_handling/postgresql.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+begin
+  require "active_record/connection_adapters/postgresql_proxy_adapter"
+rescue LoadError
+  # Postgres not available
+  return
+end
+
+module ActiveRecordProxyAdapters
+  # Module to extend ActiveRecord::Base with the connection handling methods.
+  # Required to make adapter work in ActiveRecord versions <= 7.2.x
+  module ConnectionHandling
+    def postgresql_proxy_adapter_class
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLProxyAdapter
+    end
+
+    # This method is a copy and paste from Rails' postgresql_connection,
+    # replacing PostgreSQLAdapter by PostgreSQLProxyAdapter
+    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
+    def postgresql_proxy_connection(config) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      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 = PG::Connection.conndefaults_hash.keys + [:requiressl]
+      conn_params.slice!(*valid_conn_param_keys)
+
+      postgresql_proxy_adapter_class.new(
+        postgresql_proxy_adapter_class.new_client(conn_params),
+        logger,
+        conn_params,
+        config
+      )
+    end
+  end
+end

data/lib/active_record_proxy_adapters/connection_handling.rb

@@ -1,61 +1,11 @@
 # frozen_string_literal: true
 
-require "active_record/connection_adapters/postgresql_proxy_adapter"
-require "active_record/connection_adapters/mysql2_proxy_adapter"
+require "active_record_proxy_adapters/connection_handling/postgresql"
+require "active_record_proxy_adapters/connection_handling/mysql2"
 
 module ActiveRecordProxyAdapters
   # Module to extend ActiveRecord::Base with the connection handling methods.
   # Required to make adapter work in ActiveRecord versions <= 7.2.x
   module ConnectionHandling
-    def postgresql_proxy_adapter_class
-      ::ActiveRecord::ConnectionAdapters::PostgreSQLProxyAdapter
-    end
-
-    # This method is a copy and paste from Rails' postgresql_connection,
-    # replacing PostgreSQLAdapter by PostgreSQLProxyAdapter
-    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
-    def postgresql_proxy_connection(config) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      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 = PG::Connection.conndefaults_hash.keys + [:requiressl]
-      conn_params.slice!(*valid_conn_param_keys)
-
-      postgresql_proxy_adapter_class.new(
-        postgresql_proxy_adapter_class.new_client(conn_params),
-        logger,
-        conn_params,
-        config
-      )
-    end
-
-    def mysql2_proxy_adapter_class
-      ::ActiveRecord::ConnectionAdapters::Mysql2ProxyAdapter
-    end
-
-    # This method is a copy and paste from Rails' mysql2_connection,
-    # replacing Mysql2Adapter by Mysql2ProxyAdapter
-    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
-    def mysql2_proxy_connection(config) # rubocop:disable Metrics/MethodLength
-      config = config.symbolize_keys
-      config[:flags] ||= 0
-
-      if config[:flags].is_a? Array
-        config[:flags].push "FOUND_ROWS"
-      else
-        config[:flags] |= Mysql2::Client::FOUND_ROWS
-      end
-
-      mysql2_proxy_adapter_class.new(
-        mysql2_proxy_adapter_class.new_client(config),
-        logger,
-        nil,
-        config
-      )
-    end
   end
 end

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Cruz
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-18 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -79,6 +78,8 @@ files:
 - lib/active_record_proxy_adapters/active_record_context.rb
 - lib/active_record_proxy_adapters/configuration.rb
 - 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/database_tasks.rb
 - lib/active_record_proxy_adapters/hijackable.rb
 - lib/active_record_proxy_adapters/log_subscriber.rb
@@ -99,7 +100,6 @@ 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
@@ -114,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Read replica proxy adapters for ActiveRecord!
 test_files: []