activerecord-oracle_enhanced-adapter 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba1ff85bcdf91c4b5830cca4f393330a8ea6e40ef5919f9041458467457239ff
-  data.tar.gz: 49c3cd50ba006d21a30b4c471baf33faad005b6c1f3596881b7097e4d8e62bd6
+  metadata.gz: f23e108b35ad8237715fe102164b559714732d02a5155c91ec8fdb8fd9148dac
+  data.tar.gz: f9137b84edad52e3960228cf412d4c3223de3a1542f81c2992b54a4ab6f13f8e
 SHA512:
-  metadata.gz: 0f043d21ff59eec9b4994152f09fad0218d938565c4c50ae1542b56ff3997dca059ce236c20bfb491d28cbddf9e0b2b13387c9d462b1ef10e726065c25b74662
-  data.tar.gz: 00d581b4323de2d988a74c9a7afaed31fa2fcba2642666568dc4f04088f8c09e49992a17877848ad095d63da58657b0a2fdbd4f8dfc8701d22969850238d333b
+  metadata.gz: e77a1755ceebb244ea23dcde2429b07e3c416e58a17bb929efe1baafdaac232036ff64dc05751cedd943d28b18815e8dfea5aa6b4c0af57f1b2dd03813b27ea6
+  data.tar.gz: 6b44ac4c89eaa96301fc8c69ad2f79eed8e45f7251b898f67af9ee3722052375c8f296e61de8736f09c378613ca711de9e3d52944fd29732dc3dba720fedf9fb

data/History.md

@@ -1,3 +1,20 @@
+## 7.2.1 / 2026-07-26
+
+* Changes and bug fixes
+  * Accept `allow_retry` keyword argument in JDBC connection `exec`
+  * Add `reset` method to JDBC connection
+  * Skip `ObjectSpace::WeakMap` workaround on JRuby that implements `#values`
+  * Run tests on JRuby 9.4.15.0
+
+## 7.2.0 / 2025-06-23
+
+* Changes and bug fixes
+  * No changes since 7.2.0.rc1
+  * Support Rails 7.2 [#2424]
+  * Bump the minimum Ruby version to 3.1 [#2442]
+  * Use RuboCop Plugin [#2427]
+  * Use Oracle Instant Client Version 23.8
+
 ## 7.2.0.rc1 / 2025-06-18
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-7.2.0
+7.2.1

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -236,6 +236,11 @@ module ActiveRecord
           raise OracleEnhanced::ConnectionException, e.message
         end
 
+        def reset
+          # tentative
+          reset!
+        end
+
         # Resets connection, by logging off and creating a new connection.
         def reset!
           logoff rescue nil
@@ -249,8 +254,8 @@ module ActiveRecord
         end
 
         # mark connection as dead if connection lost
-        def with_retry(&block)
-          should_retry = auto_retry? && autocommit?
+        def with_retry(allow_retry: false, &block)
+          should_retry = (allow_retry || auto_retry?) && autocommit?
           begin
             yield if block_given?
           rescue Java::JavaSql::SQLException => e
@@ -263,8 +268,8 @@ module ActiveRecord
           end
         end
 
-        def exec(sql)
-          with_retry do
+        def exec(sql, allow_retry: false)
+          with_retry(allow_retry: allow_retry) do
             exec_no_retry(sql)
           end
         end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -848,7 +848,9 @@ module ActiveRecord
 end
 
 # Workaround for https://github.com/jruby/jruby/issues/6267
-if RUBY_ENGINE == "jruby"
+# JRuby implements ObjectSpace::WeakMap#values natively since 9.4, where the
+# internal `map` field this workaround reads does not exist anymore.
+if RUBY_ENGINE == "jruby" && !ObjectSpace::WeakMap.method_defined?(:values)
   require "jruby"
 
   class org.jruby::RubyObjectSpace::WeakMap

data/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb

@@ -66,15 +66,15 @@ describe "OracleEnhancedAdapter establish connection" do
 
   it "should not encrypt JDBC network connection" do
     if ORACLE_ENHANCED_CONNECTION == :jdbc
-      @conn = ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REJECTED" }))
-      expect(@conn.select("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 0 }])
+      ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REJECTED" }))
+      expect(ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq(0)
     end
   end
 
   it "should encrypt JDBC network connection" do
     if ORACLE_ENHANCED_CONNECTION == :jdbc
-      @conn = ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REQUESTED" }))
-      expect(@conn.select("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 1 }])
+      ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REQUESTED" }))
+      expect(ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq(1)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Raimonds Simanovskis
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files: