activerecord-oracle_enhanced-adapter 7.2.1 → 8.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f23e108b35ad8237715fe102164b559714732d02a5155c91ec8fdb8fd9148dac
-  data.tar.gz: f9137b84edad52e3960228cf412d4c3223de3a1542f81c2992b54a4ab6f13f8e
+  metadata.gz: ed0feb807d4cb07d2a8523a26f5a208c9a6b24d67d1c686e9e4539ea64081479
+  data.tar.gz: a18cad30253c705355c7096c27d7820db54f039a620c8eaf13071d4b4e493e0a
 SHA512:
-  metadata.gz: e77a1755ceebb244ea23dcde2429b07e3c416e58a17bb929efe1baafdaac232036ff64dc05751cedd943d28b18815e8dfea5aa6b4c0af57f1b2dd03813b27ea6
-  data.tar.gz: 6b44ac4c89eaa96301fc8c69ad2f79eed8e45f7251b898f67af9ee3722052375c8f296e61de8736f09c378613ca711de9e3d52944fd29732dc3dba720fedf9fb
+  metadata.gz: 74c34ce8b642dd08d4af29bf7c6c304d8458fa1dba4ee49b7d0ae814b35f6f3fd27326c2e6b99b6573ddb8d120017791888839e606dfd20607d4d89a424f7924
+  data.tar.gz: aecc83858ff03f7f9ab17210fd77000c7dca379598845495aa33b548d524d026efe3bf15b430017a7365246c35e732c40045a7ca8b979c10d12ec708d35a194f

data/History.md

@@ -1,10 +1,4 @@
-## 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
+This file is no longer being updated. For the latest updates and release information, please see: https://github.com/rsim/oracle-enhanced/releases
 
 ## 7.2.0 / 2025-06-23
 

data/VERSION

@@ -1 +1 @@
-7.2.1
+8.0.0.rc1

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

@@ -330,8 +330,23 @@ module ActiveRecord
             # Add context index condition.
             def contains(column, query, options = {})
               score_label = options[:label].to_i || 1
-              where("CONTAINS(#{connection.quote_table_name(column)}, ?, #{score_label}) > 0", query).
-                order(Arel.sql("SCORE(#{score_label}) DESC"))
+              quoted_column = connection.quote_table_name(column)
+
+              # Create an Arel node for the CONTAINS function
+              contains_node = Arel::Nodes::NamedFunction.new(
+                "CONTAINS",
+                [
+                  Arel::Nodes::SqlLiteral.new(quoted_column),
+                  Arel::Nodes::BindParam.new(query),
+                  Arel::Nodes::SqlLiteral.new(score_label.to_s)
+                ]
+              )
+
+              # Create comparison node: CONTAINS(...) > 0
+              condition = Arel::Nodes::GreaterThan.new(contains_node, Arel::Nodes::SqlLiteral.new("0"))
+
+              # Create the where clause and order by score
+              where(condition).order(Arel.sql("SCORE(#{score_label}) DESC"))
             end
           end
       end

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

@@ -8,58 +8,79 @@ module ActiveRecord
         #
         # see: abstract/database_statements.rb
 
-        # Executes a SQL statement
-        def execute(sql, name = nil, async: false, allow_retry: false)
-          sql = transform_query(sql)
+        READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+          :close, :declare, :fetch, :move, :set, :show
+        ) # :nodoc:
+        private_constant :READ_QUERY
+
+        def write_query?(sql) # :nodoc:
+          !READ_QUERY.match?(sql)
+        rescue ArgumentError # Invalid encoding
+          !READ_QUERY.match?(sql.b)
+        end
 
-          log(sql, name, async: async) { _connection.exec(sql, allow_retry: allow_retry) }
+        # Executes a SQL statement
+        def execute(...)
+          super
         end
 
-        def exec_query(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false)
-          sql = transform_query(sql)
+        # Low level execution of a SQL statement on the connection returning adapter specific result object.
+        def raw_execute(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: false)
+          sql = preprocess_query(sql)
 
           type_casted_binds = type_casted_binds(binds)
+          with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
+            log(sql, name, binds, type_casted_binds, async: async) do
+              cursor = nil
+              cached = false
+              with_retry do
+                if binds.nil? || binds.empty?
+                  cursor = conn.prepare(sql)
+                else
+                  unless @statements.key? sql
+                    @statements[sql] = conn.prepare(sql)
+                  end
 
-          log(sql, name, binds, type_casted_binds, async: async) do
-            cursor = nil
-            cached = false
-            with_retry do
-              if without_prepared_statement?(binds)
-                cursor = _connection.prepare(sql)
-              else
-                unless @statements.key? sql
-                  @statements[sql] = _connection.prepare(sql)
-                end
-
-                cursor = @statements[sql]
-
-                cursor.bind_params(type_casted_binds)
+                  cursor = @statements[sql]
+                  cursor.bind_params(type_casted_binds)
 
-                cached = true
+                  cached = true
+                end
+                cursor.exec
               end
 
-              cursor.exec
-            end
-
-            if (name == "EXPLAIN") && sql.start_with?("EXPLAIN")
-              res = true
-            else
               columns = cursor.get_col_names.map do |col_name|
                 oracle_downcase(col_name)
               end
+
               rows = []
-              fetch_options = { get_lob_value: (name != "Writable Large Object") }
-              while row = cursor.fetch(fetch_options)
-                rows << row
+              if cursor.select_statement?
+                fetch_options = { get_lob_value: (name != "Writable Large Object") }
+                while row = cursor.fetch(fetch_options)
+                  rows << row
+                end
               end
-              res = build_result(columns: columns, rows: rows)
+
+              affected_rows_count = cursor.row_count
+
+              cursor.close unless cached
+
+              { columns: columns, rows: rows, affected_rows_count: affected_rows_count }
             end
+          end
+        end
 
-            cursor.close unless cached
-            res
+        def cast_result(result)
+          if result.nil?
+            ActiveRecord::Result.empty
+          else
+            ActiveRecord::Result.new(result[:columns], result[:rows])
           end
         end
-        alias_method :internal_exec_query, :exec_query
+
+        def affected_rows(result)
+          result[:affected_rows_count]
+        end
 
         def supports_explain?
           true
@@ -106,7 +127,7 @@ module ActiveRecord
             cursor = nil
             returning_id_col = returning_id_index = nil
             with_retry do
-              if without_prepared_statement?(binds)
+              if binds.nil? || binds.empty?
                 cursor = _connection.prepare(sql)
               else
                 unless @statements.key?(sql)
@@ -146,7 +167,7 @@ module ActiveRecord
           log(sql, name, binds, type_casted_binds) do
             with_retry do
               cached = false
-              if without_prepared_statement?(binds)
+              if binds.nil? || binds.empty?
                 cursor = _connection.prepare(sql)
               else
                 if @statements.key?(sql)
@@ -289,6 +310,15 @@ module ActiveRecord
               raise
             end
           end
+
+          def handle_warnings(sql)
+            @notice_receiver_sql_warnings.each do |warning|
+              next if warning_ignored?(warning)
+
+              warning.sql = sql
+              ActiveRecord.db_warnings_action.call(warning)
+            end
+          end
       end
     end
   end

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

@@ -32,7 +32,7 @@ module ActiveRecord
 
       private
         def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false, &block)
-          @instrumenter.instrument(
+          instrumenter.instrument(
             "sql.active_record",
             sql:               sql,
             name:              name,

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

@@ -236,11 +236,6 @@ 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
@@ -254,8 +249,8 @@ module ActiveRecord
         end
 
         # mark connection as dead if connection lost
-        def with_retry(allow_retry: false, &block)
-          should_retry = (allow_retry || auto_retry?) && autocommit?
+        def with_retry(&block)
+          should_retry = auto_retry? && autocommit?
           begin
             yield if block_given?
           rescue Java::JavaSql::SQLException => e
@@ -268,8 +263,8 @@ module ActiveRecord
           end
         end
 
-        def exec(sql, allow_retry: false)
-          with_retry(allow_retry: allow_retry) do
+        def exec(sql)
+          with_retry do
             exec_no_retry(sql)
           end
         end
@@ -390,6 +385,10 @@ module ActiveRecord
           end
           alias :get_col_names :column_names
 
+          def row_count
+            @raw_statement.getUpdateCount
+          end
+
           def fetch(options = {})
             if @raw_result_set.next
               get_lob_value = options[:get_lob_value]

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

@@ -158,6 +158,14 @@ module ActiveRecord
             @raw_cursor.get_col_names
           end
 
+          def row_count
+            @raw_cursor.row_count
+          end
+
+          def select_statement?
+            @raw_cursor.type == :select_stmt
+          end
+
           def fetch(options = {})
             if row = @raw_cursor.fetch
               get_lob_value = options[:get_lob_value]

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -848,9 +848,7 @@ module ActiveRecord
 end
 
 # Workaround for https://github.com/jruby/jruby/issues/6267
-# 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)
+if RUBY_ENGINE == "jruby"
   require "jruby"
 
   class org.jruby::RubyObjectSpace::WeakMap

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

@@ -25,11 +25,15 @@ describe "compatibility migrations" do
       end
     }.new
 
-    migration.migrate(:up)
+    ActiveRecord::Migration.suppress_messages do
+      migration.migrate(:up)
+    end
     expect(@conn.table_exists?(:new_test_employees)).to be_truthy
     expect(@conn.table_exists?(:test_employees)).not_to be_truthy
 
-    migration.migrate(:down)
+    ActiveRecord::Migration.suppress_messages do
+      migration.migrate(:down)
+    end
     expect(@conn.table_exists?(:new_test_employees)).not_to be_truthy
     expect(@conn.table_exists?(:test_employees)).to be_truthy
   end

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
-      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)
+      @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 }])
     end
   end
 
   it "should encrypt JDBC network connection" do
     if ORACLE_ENHANCED_CONNECTION == :jdbc
-      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)
+      @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 }])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 8.0.0.rc1
 platform: ruby
 authors:
 - Raimonds Simanovskis
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files: