WIP

Author: dephraser

lib/mysql_framework/connector.rb

@@ -1,29 +1,49 @@
 # frozen_string_literal: true
 
 require 'active_record'
+require 'active_record/connection_adapters/mysql2_adapter'
+
+# Monkeypatch the MySQL2 adapter to return hashes with symbol keys by default
+module MysqlFramework
+  module Mysql2AdapterPatch
+    def configure_connection
+      super
+      @raw_connection.query_options[:as] = :hash
+      @raw_connection.query_options[:symbolize_keys] = true
+      @raw_connection.query_options[:cast_booleans] = true
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(MysqlFramework::Mysql2AdapterPatch)
 
 module MysqlFramework
   class Connector
     def initialize(options = {})
       @options = default_options.merge(options)
+      @connection_map = nil
+      @map_mutex = Mutex.new
     end
 
     # This method is called to setup the ActiveRecord connection pool.
     def setup
       return if @connection_pool
 
-      # Set default query options for Mysql2::Client before establishing connections
-      Mysql2::Client.default_query_options.merge!(symbolize_keys: true, cast_booleans: true)
-
       ActiveRecord::Base.establish_connection(active_record_config)
       @connection_pool = ActiveRecord::Base.connection_pool
+      @connection_map = {}
     end
 
     # This method is called to close all MySQL connections in the pool and dispose of the pool itself.
     def dispose
       return if @connection_pool.nil?
 
       @connection_pool.disconnect!
+
+      @map_mutex.synchronize do
+        @connection_map.clear
+      end
+
       @connection_pool = nil
     end
 
@@ -35,16 +55,30 @@ def connections
     # This method is called to fetch a client from the connection pool.
     def check_out
       setup unless @connection_pool
-      @connection_pool.checkout.raw_connection
+
+      adapter = @connection_pool.checkout
+      raw_conn = adapter.raw_connection
+
+      @map_mutex.synchronize do
+        @connection_map[raw_conn.object_id] = adapter
+      end
+
+      raw_conn
     end
 
     # This method is called to check a client back in to the connection when no longer needed.
     def check_in(client)
       return if client.nil? || @connection_pool.nil?
 
-      # Find the ActiveRecord connection wrapper for this raw connection
-      connection = @connection_pool.connections.find { |conn| conn.raw_connection == client }
-      @connection_pool.checkin(connection) if connection
+      adapter = @map_mutex.synchronize do
+        @connection_map.delete(client.object_id)
+      end
+
+      if adapter
+        @connection_pool.checkin(adapter)
+      else
+        MysqlFramework.logger.warn { "[#{self.class}] - Unable to find adapter for raw connection during check_in" }
+      end
     end
 
     # This method is called to use a client from the connection pool.
@@ -77,14 +111,14 @@ def execute(query, provided_client = nil)
 
     # This method is called to execute a query
     def query(query_string, provided_client = nil)
-      with_client(provided_client) { |client| client.query(query_string, **query_options) }
+      with_client(provided_client) { |client| client.query(query_string) }
     end
 
     # This method is called to execute a query which will return multiple result sets in an array
     def query_multiple_results(query_string, provided_client = nil)
       results = with_client(provided_client) do |client|
         result = []
-        result << client.query(query_string, **query_options)
+        result << client.query(query_string)
         result << client.store_result while client.next_result
         result.compact
       end
@@ -146,9 +180,5 @@ def max_pool_size
     def pool_timeout
       @pool_timeout ||= Integer(ENV.fetch('MYSQL_POOL_TIMEOUT', 5))
     end
-
-    def query_options
-      { as: :hash, symbolize_keys: true, cast_booleans: true }
-    end
   end
 end

lib/mysql_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MysqlFramework
-  VERSION = '2.1.9'
+  VERSION = '0.0.0.build.pooling.by.activerecord.2025.12.01.1110'
 end