activerecord-oracle_enhanced-adapter 7.2.1-java → 8.1.0-java

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -266,6 +266,24 @@ module ActiveRecord
         super
       end
 
+      # Opens a database console session via sqlplus.
+      #
+      # Called by Rails' `bin/rails dbconsole` command on the adapter class
+      # returned from adapter registration. Builds an Oracle logon string of
+      # the form `user[/password]@database` and execs `sqlplus`.
+      def self.dbconsole(config, options = {})
+        oracle_config = config.configuration_hash
+        logon = +""
+
+        if oracle_config[:username]
+          logon << oracle_config[:username]
+          logon << "/#{oracle_config[:password]}" if oracle_config[:password] && options[:include_password]
+          logon << "@#{config.database}" if config.database
+        end
+
+        find_cmd_and_exec(ActiveRecord.database_cli[:oracle] || "sqlplus", logon)
+      end
+
       def build_statement_pool
         StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
       end
@@ -410,7 +428,7 @@ module ActiveRecord
       # :startdoc:
 
       def native_database_types # :nodoc:
-        emulate_booleans_from_strings ? NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS : NATIVE_DATABASE_TYPES
+        self.class.native_database_types
       end
 
       # CONNECTION MANAGEMENT ====================================
@@ -670,7 +688,7 @@ module ActiveRecord
             # remove any ASC/DESC modifiers
             s.gsub(/\s+(ASC|DESC)\s*?/i, "")
           }.reject(&:blank?).map.with_index { |column, i|
-            "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns} ORDER BY #{column}) AS alias_#{i}__"
+            "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns.join(', ')} ORDER BY #{column}) AS alias_#{i}__"
           }
         (order_columns << super).join(", ")
       end
@@ -711,6 +729,10 @@ module ActiveRecord
       end
 
       class << self
+        def native_database_types
+          emulate_booleans_from_strings ? NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS : NATIVE_DATABASE_TYPES
+        end
+
         def type_map
           @type_map ||= Type::TypeMap.new.tap { |m| initialize_type_map(m) }
           @type_map
@@ -848,8 +870,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.
+# Fixed in JRuby 9.3.0.0 or higher via https://github.com/jruby/jruby/pull/6683
 if RUBY_ENGINE == "jruby" && !ObjectSpace::WeakMap.method_defined?(:values)
   require "jruby"
 

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/composite_spec.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+describe "OracleEnhancedAdapter should support composite primary" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    schema_define do
+      create_table :test_authors, force: true do |t|
+        t.string    :first_name,    limit: 20
+        t.string    :last_name,     limit: 25
+      end
+
+      create_table :test_books, force: true do |t|
+        t.string    :title,       limit: 20
+      end
+
+      create_table :test_authors_test_books, primary_key: ["test_author_id", "test_book_id"], force: true do |t|
+        t.integer "test_author_id", precision: 38, null: false
+        t.integer "test_book_id", precision: 38, null: false
+      end
+    end
+  end
+
+  after(:all) do
+    schema_define do
+      drop_table :test_authors
+      drop_table :test_books
+      drop_table :test_authors_test_books
+    end
+  end
+
+  before(:each) do
+    class ::TestAuthor < ActiveRecord::Base
+      has_many :test_authors_test_books
+      has_many :test_books, through: :test_authors_test_books, inverse_of: :test_authors
+    end
+    class ::TestBook < ActiveRecord::Base
+      has_many :test_authors_test_books
+      has_many :test_authors, through: :test_authors_test_books, inverse_of: :test_books
+    end
+    class ::TestAuthorsTestBook < ActiveRecord::Base
+      self.primary_key = [:test_author_id, :test_book_id]
+      belongs_to :test_author, foreign_key: :test_author_id
+      belongs_to :test_book, foreign_key: :test_book_id
+    end
+
+    @author = TestAuthor.create!(
+      first_name: "First",
+      last_name: "Last",
+    )
+    @book = TestBook.create!(title: "Nice book")
+    @testRel = TestAuthorsTestBook.create!(test_author: @author, test_book: @book)
+    expect([@book]).to eq(@author.test_books)
+  end
+
+  after(:each) do
+    TestAuthor.delete_all
+    TestBook.delete_all
+    TestAuthorsTestBook.delete_all
+    Object.send(:remove_const, "TestAuthor")
+    Object.send(:remove_const, "TestBook")
+    Object.send(:remove_const, "TestAuthorsTestBook")
+    ActiveRecord::Base.clear_cache!
+  end
+
+  it "should support distinct" do
+    expect(TestAuthor.distinct.count).to eq(1)
+    skip "this appears to be a rails bug https://github.com/rails/rails/issues/55401"
+    expect(TestAuthorsTestBook.distinct.count).to eq(1)
+  end
+
+  it "should support includes when requesting the first record by a referenced composite idx association" do
+    expect([@book]).to eq(@author.test_books)
+    expect(TestAuthor.includes(:test_authors_test_books).references(:test_authors_test_books).merge(TestAuthorsTestBook.where(test_author: @author)).take).to eq(@author)
+    expect(TestAuthor.includes(:test_authors_test_books).references(:test_authors_test_books).merge(TestAuthorsTestBook.where(test_author: @author)).first).to eq(@author)
+  end
+
+  it "should support includes when requesting the first record by a referenced association" do
+    expect([@book]).to eq(@author.test_books)
+    expect(TestAuthorsTestBook.includes(:test_author).references(:test_author).merge(TestAuthor.where(first_name: "First")).take).to eq(@testRel)
+    expect(TestAuthorsTestBook.includes(:test_author).references(:test_author).merge(TestAuthor.where(first_name: "First")).first).to eq(@testRel)
+  end
+end

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

@@ -65,16 +65,20 @@ describe "OracleEnhancedAdapter establish connection" do
   end
 
   it "should not encrypt JDBC network connection" do
+    skip "Oracle 11g XE does not support native network encryption" if ENV["DATABASE_VERSION"] == "11.2.0.2"
     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.connection.send(:_connection)
+      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
+    skip "Oracle 11g XE does not support native network encryption" if ENV["DATABASE_VERSION"] == "11.2.0.2"
     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.connection.send(:_connection)
+      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
 
@@ -116,6 +120,13 @@ describe "OracleEnhancedConnection" do
     it "should be in autocommit mode after connection" do
       expect(@conn).to be_autocommit
     end
+
+    it "should raise ArgumentError when JDBC exec is called with bindvars" do
+      skip unless ORACLE_ENHANCED_CONNECTION == :jdbc
+      expect {
+        @conn.exec("SELECT ? FROM dual", 1)
+      }.to raise_error(ArgumentError, /JDBC exec does not support bindvars/)
+    end
   end
 
   describe "create connection with schema option" do
@@ -403,19 +414,23 @@ describe "OracleEnhancedConnection" do
   describe "SQL with bind parameters when NLS_NUMERIC_CHARACTERS is set to ', '" do
     before(:all) do
       ENV["NLS_NUMERIC_CHARACTERS"] = ", "
-      @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+      @conn_base = ActiveRecord::Base.connection
+      @conn = @conn_base.send(:_connection)
       @conn.exec "CREATE TABLE test_employees (age NUMBER(10,2))"
     end
 
     after(:all) do
       ENV["NLS_NUMERIC_CHARACTERS"] = nil
       @conn.exec "DROP TABLE test_employees" rescue nil
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should execute prepared statement with decimal bind parameter" do
       cursor = @conn.prepare("INSERT INTO test_employees VALUES(:1)")
       type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "NUMBER", type: :decimal, limit: 10, precision: nil, scale: 2)
-      column = ActiveRecord::ConnectionAdapters::OracleEnhanced::Column.new("age", nil, type_metadata, false, comment: nil)
+      cast_type = @conn_base.lookup_cast_type("NUMBER(10,2)")
+      column = ActiveRecord::ConnectionAdapters::OracleEnhanced::Column.new("age", cast_type, nil, type_metadata, false, comment: nil)
       expect(column.type).to eq(:decimal)
       # Here 1.5 expects that this value has been type casted already
       # it should use bind_params in the long term.

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+describe "Oracle Enhanced adapter dbconsole" do
+  subject { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter }
+
+  it "uses sqlplus with user@db when password is not requested" do
+    expect(subject).to receive(:find_cmd_and_exec).with("sqlplus", "user@db")
+
+    config = make_db_config(adapter: "oracle_enhanced", database: "db", username: "user", password: "secret")
+
+    subject.dbconsole(config)
+  end
+
+  it "uses sqlplus with user/password@db when include_password is true" do
+    expect(subject).to receive(:find_cmd_and_exec).with("sqlplus", "user/secret@db")
+
+    config = make_db_config(adapter: "oracle_enhanced", database: "db", username: "user", password: "secret")
+
+    subject.dbconsole(config, include_password: true)
+  end
+
+  it "omits @database when no database is configured" do
+    expect(subject).to receive(:find_cmd_and_exec).with("sqlplus", "user")
+
+    config = make_db_config(adapter: "oracle_enhanced", username: "user")
+
+    subject.dbconsole(config)
+  end
+
+  it "passes an empty logon string when no username is configured" do
+    expect(subject).to receive(:find_cmd_and_exec).with("sqlplus", "")
+
+    config = make_db_config(adapter: "oracle_enhanced", database: "db")
+
+    subject.dbconsole(config)
+  end
+
+  it "is inherited by the emulated OracleAdapter" do
+    require "active_record/connection_adapters/emulation/oracle_adapter"
+    expect(ActiveRecord::ConnectionAdapters::OracleAdapter).to receive(:find_cmd_and_exec).with("sqlplus", "user@db")
+
+    config = make_db_config(adapter: "oracle", database: "db", username: "user", password: "secret")
+
+    ActiveRecord::ConnectionAdapters::OracleAdapter.dbconsole(config)
+  end
+
+  it "respects ActiveRecord.database_cli[:oracle] when set" do
+    original = ActiveRecord.database_cli[:oracle]
+    ActiveRecord.database_cli[:oracle] = "sqlcl"
+    expect(subject).to receive(:find_cmd_and_exec).with("sqlcl", "user@db")
+
+    config = make_db_config(adapter: "oracle_enhanced", database: "db", username: "user")
+
+    subject.dbconsole(config)
+  ensure
+    ActiveRecord.database_cli[:oracle] = original
+  end
+
+  private
+    def make_db_config(config)
+      ActiveRecord::DatabaseConfigurations::HashConfig.new("test", "primary", config)
+    end
+end

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

@@ -69,6 +69,35 @@ describe "OracleEnhancedAdapter schema definition" do
     end
   end
 
+  describe "primary_key inside create_table block with type and keyword options" do
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_lookups, if_exists: true
+      end
+    end
+
+    it "accepts a type argument and keyword options without raising ArgumentError" do
+      expect {
+        schema_define do
+          create_table :test_lookups, force: true, id: false do |t|
+            t.primary_key :zlookupid, :string, limit: 1, null: false
+            t.string :name
+          end
+        end
+      }.not_to raise_error
+
+      columns = @conn.columns(:test_lookups)
+      pk = columns.find { |c| c.name == "zlookupid" }
+      expect(pk).not_to be_nil
+      expect(pk.sql_type).to match(/VARCHAR2\(1\)/i)
+      expect(pk.null).to be(false)
+    end
+  end
+
   describe "default sequence name" do
     it "should return sequence name without truncating too much" do
       seq_name_length = ActiveRecord::Base.connection.sequence_name_length

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

@@ -216,6 +216,17 @@ describe "OracleEnhancedAdapter structure dump" do
       expect(dump).to match(/CREATE TABLE "BARS" \(\n "ID" NUMBER\(38,0\) NOT NULL,\n "SUPER" RAW\(255\)/)
     end
 
+    it "should dump check constraints" do
+      @conn.execute <<~SQL
+        ALTER TABLE test_posts ADD CONSTRAINT test_posts_title_check CHECK (LENGTH(title) > 0)
+      SQL
+      dump = ActiveRecord::Base.connection.structure_dump_check_constraints("test_posts")
+      expect(dump.first).to match(/ALTER TABLE "TEST_POSTS" ADD CONSTRAINT "TEST_POSTS_TITLE_CHECK" CHECK/)
+
+      dump = ActiveRecord::Base.connection.structure_dump
+      expect(dump).to match(/ALTER TABLE "TEST_POSTS" ADD CONSTRAINT "TEST_POSTS_TITLE_CHECK" CHECK/)
+    end
+
     it "should dump table comments" do
       comment_sql = %Q(COMMENT ON TABLE "TEST_POSTS" IS 'Test posts with ''some'' "quotes"')
       @conn.execute comment_sql
@@ -331,7 +342,7 @@ describe "OracleEnhancedAdapter structure dump" do
       end
     end
 
-    let(:dump) { ActiveRecord::Base.connection.dump_schema_information }
+    let(:dump) { ActiveRecord::Base.connection.dump_schema_versions }
 
     before do
       ActiveRecord::Base.connection_pool.schema_migration.create_table

data/spec/active_record/oracle_enhanced/type/integer_spec.rb

@@ -3,9 +3,9 @@
 describe "OracleEnhancedAdapter integer type detection based on attribute settings" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    @conn = ActiveRecord::Base.connection
-    @conn.execute "DROP TABLE test2_employees" rescue nil
-    @conn.execute <<~SQL
+    conn = ActiveRecord::Base.lease_connection
+    conn.execute "DROP TABLE test2_employees" rescue nil
+    conn.execute <<~SQL
       CREATE TABLE test2_employees (
         id            NUMBER PRIMARY KEY,
         first_name    VARCHAR2(20),
@@ -22,16 +22,18 @@ describe "OracleEnhancedAdapter integer type detection based on attribute settin
         created_at    DATE
       )
     SQL
-    @conn.execute "DROP SEQUENCE test2_employees_seq" rescue nil
-    @conn.execute <<~SQL
+    conn.execute "DROP SEQUENCE test2_employees_seq" rescue nil
+    conn.execute <<~SQL
       CREATE SEQUENCE test2_employees_seq  MINVALUE 1
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
   end
 
   after(:all) do
-    @conn.execute "DROP TABLE test2_employees"
-    @conn.execute "DROP SEQUENCE test2_employees_seq"
+    conn = ActiveRecord::Base.lease_connection
+    conn.execute "DROP TABLE test2_employees"
+    conn.execute "DROP SEQUENCE test2_employees_seq"
+    ActiveRecord::Base.release_connection
   end
 
   describe "/ NUMBER values from ActiveRecord model" do
@@ -43,6 +45,7 @@ describe "OracleEnhancedAdapter integer type detection based on attribute settin
     after(:each) do
       Object.send(:remove_const, "Test2Employee")
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = true
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.clear_type_map!
       ActiveRecord::Base.clear_cache!
     end
 
@@ -90,8 +93,7 @@ describe "OracleEnhancedAdapter integer type detection based on attribute settin
 
     it "should return Integer value from NUMBER(1) column if emulate_booleans is set to false" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = false
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.clear_type_map!
-      ActiveRecord::Base.clear_cache!
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
       create_employee2
       expect(@employee2.is_manager).to be_a(Integer)
     end

data/spec/active_record/oracle_enhanced/type/national_character_string_spec.rb

@@ -35,10 +35,9 @@ describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
     columns = @conn.columns("test_items")
     %w(nchar_column nvarchar2_column char_column varchar2_column).each do |col|
       column = columns.detect { |c| c.name == col }
-      type = @conn.lookup_cast_type_from_column(column)
+      type = @conn.lookup_cast_type(column.sql_type)
       value = type.serialize("abc")
       expect(@conn.quote(value)).to eq(column.sql_type[0, 1] == "N" ? "N'abc'" : "'abc'")
-      type = @conn.lookup_cast_type_from_column(column)
       nilvalue = type.serialize(nil)
       expect(@conn.quote(nilvalue)).to eq("NULL")
     end

data/spec/active_record/oracle_enhanced/type/text_spec.rb

@@ -241,4 +241,55 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     )
     expect(Test2Employee.where(comments: search_data)).to have_attributes(count: 1)
   end
+
+  describe "with prepared_statements disabled" do
+    around(:each) do |example|
+      old_prepared_statements = @conn.prepared_statements
+      @conn.instance_variable_set(:@prepared_statements, false)
+      example.run
+      @conn.instance_variable_set(:@prepared_statements, old_prepared_statements)
+    end
+
+    it "should create record with CLOB data when prepared_statements is false" do
+      @employee = TestEmployee.create!(
+        first_name: "First",
+        last_name: "Last",
+        comments: @char_data
+      )
+      @employee.reload
+      expect(@employee.comments).to eq(@char_data)
+    end
+
+    it "should create record with short CLOB data when prepared_statements is false" do
+      short_data = "Short CLOB content"
+      @employee = TestEmployee.create!(
+        first_name: "First",
+        last_name: "Last",
+        comments: short_data
+      )
+      @employee.reload
+      expect(@employee.comments).to eq(short_data)
+    end
+
+    it "should create record with empty CLOB when prepared_statements is false" do
+      @employee = TestEmployee.create!(
+        first_name: "First",
+        last_name: "Last",
+        comments: ""
+      )
+      @employee.reload
+      expect(@employee.comments).to eq("")
+    end
+
+    it "should create record with serialized CLOB data when prepared_statements is false" do
+      ruby_data = { "test" => ["ruby", :data, 123] }
+      @employee = Test2Employee.create!(
+        first_name: "First",
+        last_name: "Last",
+        comments: ruby_data
+      )
+      @employee.reload
+      expect(@employee.comments).to eq(ruby_data)
+    end
+  end
 end

data/spec/active_record/oracle_enhanced/type/timestamp_spec.rb

@@ -4,10 +4,6 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
   include SchemaSpecHelper
 
   before(:all) do
-    skip if ENV["DATABASE_SERVER_AND_CLIENT_VERSION_DO_NOT_MATCH"] == "true"
-    if ENV["DATABASE_VERSION"] == "11.2.0.2" && ENV["ORACLE_HOME"] == "/usr/lib/oracle/21/client64"
-      skip
-    end
     ActiveRecord.default_timezone = :local
     ActiveRecord::Base.establish_connection(CONNECTION_WITH_TIMEZONE_PARAMS)
     @conn = ActiveRecord::Base.connection
@@ -73,5 +69,39 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
         expect(@employee.send(c).to_f).to eq(@now.to_f)
       end
     end
+
+    it "should return Time value with millisecond fractional seconds from TIMESTAMP columns" do
+      @now = Time.local(2008, 5, 26, 23, 11, 11, 123_000)  # 123 ms = 123_000 μs
+      @employee = TestEmployee.create(
+        created_at: @now,
+        created_at_tz: @now,
+        created_at_ltz: @now
+      )
+      @employee.reload
+      [:created_at, :created_at_tz, :created_at_ltz].each do |c|
+        expect(@employee.send(c).class).to eq(Time)
+        expect(@employee.send(c).to_f).to eq(@now.to_f)
+      end
+    end
+
+    it "should preserve microsecond precision when binding Time values" do
+      # Guard against the JDBC bind path going through Float (which can drift
+      # by 1 ms for current epoch values). Assert on Time#to_i and Time#usec
+      # directly instead of Time#to_f, which is too coarse to catch drift.
+      # Note: the TIMESTAMP columns above use the default fractional precision
+      # of 6, so the round-trip is truncated to microseconds.
+      @now = Time.local(2008, 5, 26, 23, 11, 11, 123_456)
+      @employee = TestEmployee.create(
+        created_at: @now,
+        created_at_tz: @now,
+        created_at_ltz: @now
+      )
+      @employee.reload
+      [:created_at, :created_at_tz, :created_at_ltz].each do |c|
+        expect(@employee.send(c).to_i).to eq(@now.to_i)
+        expect(@employee.send(c).usec).to eq(@now.usec)
+        expect(@employee.send(c).nsec).to eq(@now.nsec)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -33,9 +33,21 @@ require "active_support/log_subscriber"
 require "active_record/log_subscriber"
 
 require "logger"
-require "ruby-plsql"
 
+# On JRuby, load the oracle_enhanced adapter first so that the JDBC driver
+# (ojdbc17.jar) is registered with DriverManager before ruby-plsql tries to
+# load it. ruby-plsql only looks for ojdbc6/7.jar and would fail otherwise.
+#
+# File.exists? was removed in Ruby 3.2. Restore it temporarily so that
+# ruby-plsql's JDBC connection code can load under JRuby 10.x (Ruby 3.4).
 require "active_record/connection_adapters/oracle_enhanced_adapter"
+File.singleton_class.alias_method(:exists?, :exist?) unless File.respond_to?(:exists?)
+# ruby-plsql calls ActiveRecord::Base.default_timezone (moved to ActiveRecord
+# module in Rails 7.0). Restore the class-level accessor as a shim.
+unless ActiveRecord::Base.respond_to?(:default_timezone)
+  ActiveRecord::Base.define_singleton_method(:default_timezone) { ActiveRecord.default_timezone }
+end
+require "ruby-plsql"
 
 puts "==> Effective ActiveRecord version #{ActiveRecord::VERSION::STRING}"
 
@@ -53,7 +65,6 @@ module LoggerSpecHelper
     ActiveSupport::Notifications.notifier = @notifier
 
     ActiveRecord::LogSubscriber.attach_to(:active_record)
-    ActiveSupport::Notifications.subscribe("sql.active_record", ActiveRecord::ExplainSubscriber.new)
   end
 
   class MockLogger

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 8.1.0
 platform: java
 authors:
 - Raimonds Simanovskis
 bindir: bin
 cert_chain: []
-date: 2026-07-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -90,9 +90,11 @@ files:
 - lib/arel/visitors/oracle_common.rb
 - spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/compatibility_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/composite_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/dbconsole_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
@@ -132,22 +134,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
 - spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/compatibility_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/composite_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/dbconsole_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb