Backward compatibility with activerecord < 7.1

que-rb · Dec 5, 2023 · dcdbe94 · dcdbe94
1 parent 5b1ff2c
commit dcdbe94
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/que/active_record/connection.rb b/lib/que/active_record/connection.rb
@@ -42,7 +42,12 @@ def call(job)
             # feature to unknowingly leak connections to other databases. So,
             # take the additional step of telling ActiveRecord to check in all
             # of the current thread's connections after each job is run.
-            ::ActiveRecord::Base.connection_handler.clear_active_connections!(:all) unless job.class.resolve_que_setting(:run_synchronously)
+            return if job.class.resolve_que_setting(:run_synchronously)
+            if ::ActiveRecord.version >= Gem::Version.new('7.1')
+              ::ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
+            else
+              ::ActiveRecord::Base.clear_active_connections!
+            end
           end
         end
       end

diff --git a/spec/que/active_record/connection_spec.rb b/spec/que/active_record/connection_spec.rb
@@ -39,7 +39,11 @@ class SecondDatabaseModel < ActiveRecord::Base
         establish_connection(QUE_URL)
       end
 
-      SecondDatabaseModel.connection_handler.clear_active_connections!(:all)
+      if ::ActiveRecord.version >= Gem::Version.new('7.1')
+        SecondDatabaseModel.connection_handler.clear_active_connections!(:all)
+      else
+        SecondDatabaseModel.clear_active_connections!
+      end
       refute SecondDatabaseModel.connection_handler.active_connections?
 
       class SecondDatabaseModelJob < Que::Job