Ensure we're clearing statement cache on same connection

janko · Oct 16, 2024 · 15e1699 · 15e1699
1 parent 30b5375
commit 15e1699
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/sequel/extensions/activerecord_connection/postgres.rb b/lib/sequel/extensions/activerecord_connection/postgres.rb
@@ -25,10 +25,12 @@ def transaction(opts = OPTS)
           fail Error, "#{key.inspect} transaction option is currently not supported" if opts.key?(key)
         end
 
-        super
-      rescue => e
-        with_activerecord_connection(&:clear_cache!) if e.class.name == "ActiveRecord::PreparedStatementCacheExpired" && !in_transaction?
-        raise
+        super do |conn|
+          yield conn
+        rescue => e
+          activerecord_connection.clear_cache! if e.class.name == "ActiveRecord::PreparedStatementCacheExpired"
+          raise
+        end
       end
 
       private