forest_admin_datasource_active_record 1.24.8 → 1.24.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1611538df9f41f9b761de4d5c312eab9fa8ee66b9e8962e633de5dd462728276
-  data.tar.gz: d2ef9a8db459810c6631fc2d8c6912f242cddba110dd5aaa06c6d794f96800c9
+  metadata.gz: e5c7dab30299e9c16bc2b67188d771da65d7ceaf88a66d2eace9fd57ccb9e9bf
+  data.tar.gz: 93d8127540c4be84e32f9244b7233592129260fabe2f05e3eea36ffe0c1d13b2
 SHA512:
-  metadata.gz: 103cb6dcf70eda5399a364358b3960183a0ddca4b6e82f0898e601e15e956af18ddfda5ef7954604367a46736ddcb4c76633443c25a9fcb933a0e1d2171ddb1a
-  data.tar.gz: cbd89fc6c60b5dbeb8b7930626adc10850f3df283c2e17dbc182ebcfdd870979c43d17371a332c1bdd07303fbcb6ad65185033172b0dd052515a7776ab287f22
+  metadata.gz: 7630f9b61c11049f854d959138c3dc0071bc3fbe9d8ecaa63ae2eea73fcc77986638dd35bee3ee6d7c3d70714037679916458b1e7949661d7eeab08eaa835a4f
+  data.tar.gz: b5c521c0dbc2bd15678f8011020f4d2eba04d0f503de792bd0d3d3ad82024b79a0ac6abf04242d5d873872b8e8da029a572056ff73ddae1ea36151cd8d907f95

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -18,7 +18,10 @@ module ForestAdminDatasourceActiveRecord
     end
 
     def native_driver
-      ActiveRecord::Base.connection
+      connection = ActiveRecord::Base.connection_pool.lease_connection
+      yield connection
+    ensure
+      ActiveRecord::Base.connection_pool.release_connection
     end
 
     def list(_caller, filter, projection)
@@ -224,16 +227,15 @@ module ForestAdminDatasourceActiveRecord
       through_model_name = association.join_table.classify
 
       # Check if the join table exists and has an 'id' column
-      if ActiveRecord::Base.connection.table_exists?(join_table)
-        columns = ActiveRecord::Base.connection.columns(join_table)
-        has_id_column = columns.any? { |col| col.name == 'id' }
-
-        if has_id_column
-          begin
-            through_model_name.constantize
-          rescue NameError
-            create_virtual_habtm_model(association, through_model_name)
-          end
+      has_id_column = ActiveRecord::Base.connection_pool.with_connection do |conn|
+        conn.table_exists?(join_table) && conn.columns(join_table).any? { |col| col.name == 'id' }
+      end
+
+      if has_id_column
+        begin
+          through_model_name.constantize
+        rescue NameError
+          create_virtual_habtm_model(association, through_model_name)
         end
       end
 

data/lib/forest_admin_datasource_active_record/datasource.rb

@@ -34,8 +34,10 @@ module ForestAdminDatasourceActiveRecord
       end
 
       begin
-        connection = @live_query_connections[connection_name]
-        pool = ActiveRecord::Base.connects_to(database: { reading: connection.to_sym }).first
+        connection_spec = @live_query_connections[connection_name]
+        pool = @native_query_pools[connection_spec]
+
+        raise "No connection pool found for '#{connection_spec}'" unless pool
 
         result = pool.with_connection do |conn|
           conn.exec_query(query, "SQL Native Query on '#{connection_name}'", binds)
@@ -87,7 +89,7 @@ module ForestAdminDatasourceActiveRecord
 
     def init_orm(db_config)
       ActiveRecord::Base.establish_connection(db_config)
-      current_config = ActiveRecord::Base.connection_db_config.env_name
+      current_config = ActiveRecord::Base.connection_pool.db_config.env_name
       configurations = ActiveRecord::Base.configurations
                                          .configurations
                                          .group_by(&:env_name)
@@ -98,6 +100,25 @@ module ForestAdminDatasourceActiveRecord
       end.to_h
 
       @connection_drivers = configurations[current_config]
+      init_native_query_pools(current_config)
+    end
+
+    def init_native_query_pools(env_name)
+      @native_query_pools = {}
+      @live_query_connections.each_value do |spec_name|
+        next if @native_query_pools.key?(spec_name)
+
+        db_config = ActiveRecord::Base.configurations.configs_for(
+          env_name: env_name,
+          name: spec_name
+        )
+        next unless db_config
+
+        @native_query_pools[spec_name] = ActiveRecord::Base.connection_handler.establish_connection(
+          db_config,
+          owner_name: "ForestAdminNativeQuery::#{spec_name}"
+        )
+      end
     end
 
     def build_habtm(model)

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -149,7 +149,7 @@ module ForestAdminDatasourceActiveRecord
                     end
 
           # Use database-specific regex syntax
-          adapter_name = @collection.model.connection.adapter_name.downcase
+          adapter_name = @collection.model.connection_pool.db_config.adapter.downcase
           table_and_column = "#{arel_attr.relation.name}.#{arel_attr.name}"
           regex_clause = case adapter_name
                          when 'postgresql'

data/lib/forest_admin_datasource_active_record/utils/query_aggregate.rb

@@ -72,7 +72,7 @@ module ForestAdminDatasourceActiveRecord
       private
 
       def date_trunc_sql(operation, field, original_field_name = nil)
-        adapter_name = @collection.model.connection.adapter_name.downcase
+        adapter_name = @collection.model.connection_pool.db_config.adapter.downcase
         operation = operation.to_s.downcase
 
         unless VALID_DATE_OPERATIONS.include?(operation)

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.24.8"
+  VERSION = "1.24.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.24.8
+  version: 1.24.9
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-27 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord