activerecord-oracle_enhanced-adapter 7.0.0 → 7.1.1

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -83,7 +83,7 @@ describe "OracleEnhancedAdapter" do
         expect(@logger.logged(:debug).last).to match(/select .* from all_constraints/im)
       end
 
-      it "should get primary key from database at first time" do
+      it "should get primary key from database at second time without query" do
         expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", "test_employees_seq"])
         @logger.clear(:debug)
         expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", "test_employees_seq"])
@@ -129,6 +129,7 @@ describe "OracleEnhancedAdapter" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = "UNUSED"
       @conn = ActiveRecord::Base.connection
     end
+
     after(:all) do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces = {}
     end
@@ -136,6 +137,7 @@ describe "OracleEnhancedAdapter" do
     after(:each) do
       @conn.drop_table :foos, if_exists: true
     end
+
     it "should create ok" do
       @conn.create_table :foos, temporary: true, id: false do |t|
         t.integer :id
@@ -441,7 +443,7 @@ describe "OracleEnhancedAdapter" do
         end
       end
       class ::TestSerializedColumn < ActiveRecord::Base
-        serialize :serialized, Array
+        serialize :serialized, type: Array
       end
     end
 
@@ -470,12 +472,12 @@ describe "OracleEnhancedAdapter" do
       serialized_column.serialized << new_value
       expect(serialized_column.serialized).to eq([new_value])
       serialized_column.save
-      expect(serialized_column.save!).to eq(true)
+      expect(serialized_column.save!).to be(true)
 
       serialized_column.reload
       expect(serialized_column.serialized).to eq([new_value])
       serialized_column.serialized = []
-      expect(serialized_column.save!).to eq(true)
+      expect(serialized_column.save!).to be(true)
     end
   end
 
@@ -514,7 +516,7 @@ describe "OracleEnhancedAdapter" do
       binary_column_object = TestBinaryColumn.new
       binary_column_object.attachment = binary_value
 
-      expect(binary_column_object.save!).to eq(true)
+      expect(binary_column_object.save!).to be(true)
     end
   end
 
@@ -622,8 +624,8 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should test table existence" do
-      expect(@conn.table_exists?("TEST_POSTS")).to eq true
-      expect(@conn.table_exists?("NOT_EXISTING")).to eq false
+      expect(@conn.table_exists?("TEST_POSTS")).to be true
+      expect(@conn.table_exists?("NOT_EXISTING")).to be false
     end
 
     it "should return array from indexes with bind usage" do
@@ -648,13 +650,13 @@ describe "OracleEnhancedAdapter" do
       expect(@logger.logged(:debug).last).to match(/\["table_name", "TEST_POSTS"\]/)
     end
 
-    it "should not raise missing IN/OUT parameter like issue 1687 " do
+    it "should not raise missing IN/OUT parameter like issue 1678" do
       # "to_sql" enforces unprepared_statement including dictionary access SQLs
       expect { User.joins(:group).to_sql }.not_to raise_exception
     end
 
     it "should return false from temporary_table? with bind usage" do
-      expect(@conn.temporary_table?("TEST_POSTS")).to eq false
+      expect(@conn.temporary_table?("TEST_POSTS")).to be false
       expect(@logger.logged(:debug).last).to match(/:table_name/)
       expect(@logger.logged(:debug).last).to match(/\["table_name", "TEST_POSTS"\]/)
     end
@@ -721,12 +723,14 @@ describe "OracleEnhancedAdapter" do
         end
       end
     end
+
     after(:all) do
       schema_define do
         drop_table :table_with_name_thats_just_ok,
           sequence_name: "suitably_short_seq" rescue nil
       end
     end
+
     it "should create table with custom sequence name" do
       expect(@conn.select_value("select suitably_short_seq.nextval from dual")).to eq(1)
     end
@@ -767,7 +771,7 @@ describe "OracleEnhancedAdapter" do
       expect(post.explain).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
     end
 
-    it "should explain considers hints with /*+ */ " do
+    it "should explain considers hints with /*+ */" do
       post = TestPost.optimizer_hints("/*+ FULL (\"TEST_POSTS\") */")
       post = post.where(id: 1)
       expect(post.explain).to include("|  TABLE ACCESS FULL| TEST_POSTS |")

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

@@ -151,10 +151,10 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
       expect(@employee3.test_boolean_before_type_cast).to eq("N")
       create_employee3(test_boolean: nil)
       expect(@employee3.test_boolean.class).to eq(NilClass)
-      expect(@employee3.test_boolean_before_type_cast).to eq(nil)
+      expect(@employee3.test_boolean_before_type_cast).to be_nil
       create_employee3(test_boolean: "")
       expect(@employee3.test_boolean.class).to eq(NilClass)
-      expect(@employee3.test_boolean_before_type_cast).to eq(nil)
+      expect(@employee3.test_boolean_before_type_cast).to be_nil
     end
 
     it "should return string value from VARCHAR2 column with boolean column name but attribute is set to :string" do

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

@@ -24,6 +24,7 @@ describe "OracleEnhancedAdapter processing CHAR column" do
   end
 
   after(:each) do
+    TestItem.delete_all
     Object.send(:remove_const, "TestItem")
     ActiveRecord::Base.clear_cache!
   end
@@ -40,4 +41,27 @@ describe "OracleEnhancedAdapter processing CHAR column" do
     item_reloaded = TestItem.first
     expect(item_reloaded.padded).to eq(str)
   end
+
+  it "should support case sensitive matching" do
+    TestItem.create!(
+      padded: "First",
+    )
+    TestItem.create!(
+      padded: "first",
+    )
+
+    expect(TestItem.where(TestItem.arel_table[:padded].matches("first%", "\\", true))).to have_attributes(count: 1)
+  end
+
+  it "should support case insensitive matching" do
+    TestItem.create!(
+      padded: "First",
+    )
+    TestItem.create!(
+      padded: "first",
+    )
+
+    expect(TestItem.where(TestItem.arel_table[:padded].matches("first%", "\\", false))).to have_attributes(count: 2)
+    expect(TestItem.where(TestItem.arel_table[:padded].matches("first%"))).to have_attributes(count: 2)
+  end
 end

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "base64"
+
+describe "OracleEnhancedAdapter custom types handling" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    schema_define do
+      create_table :test_employees, force: true do |t|
+        t.string    :first_name,  limit: 20
+        t.string    :last_name,   limit: 25
+        t.text      :signature
+      end
+    end
+
+    class TestEmployee < ActiveRecord::Base
+      class AttributeSignature < ActiveRecord::Type::Text
+        def cast(value)
+          case value
+          when Signature
+            value
+          when nil
+            nil
+          else
+            Signature.new(Base64.decode64 value)
+          end
+        end
+
+        def serialize(value)
+          Base64.encode64 value.raw
+        end
+
+        def changed_in_place?(raw_old_value, new_value)
+          new_value != cast(raw_old_value)
+        end
+      end
+
+      class Signature
+        attr_reader :raw
+
+        def initialize(raw_value)
+          @raw = raw_value
+        end
+
+        def to_s
+          "Signature nice string #{raw[0..5]}"
+        end
+
+        def ==(object)
+          raw == object&.raw
+        end
+        alias eql? ==
+      end
+
+      attribute :signature, AttributeSignature.new
+    end
+  end
+
+  after(:all) do
+    schema_define do
+      drop_table :test_employees
+    end
+    Object.send(:remove_const, "TestEmployee")
+    ActiveRecord::Base.clear_cache!
+  end
+
+  it "should serialize LOBs when creating a record" do
+    raw_signature = "peter'ssignature"
+    signature = TestEmployee::Signature.new(raw_signature)
+    @employee = TestEmployee.create!(first_name: "Peter", last_name: "Doe", signature: signature)
+    @employee.reload
+    expect(@employee.signature).to eql(signature)
+    expect(@employee.signature).to_not be(signature)
+    expect(TestEmployee.first.read_attribute_before_type_cast(:signature)).to eq(Base64.encode64 raw_signature)
+  end
+
+  it "should serialize LOBs when updating a record" do
+    raw_signature = "peter'ssignature"
+    signature = TestEmployee::Signature.new(raw_signature)
+    @employee = TestEmployee.create!(first_name: "Peter", last_name: "Doe", signature: TestEmployee::Signature.new("old signature"))
+    @employee.signature = signature
+    @employee.save!
+    @employee.reload
+    expect(@employee.signature).to eql(signature)
+    expect(@employee.signature).to_not be(signature)
+    expect(TestEmployee.first.read_attribute_before_type_cast(:signature)).to eq(Base64.encode64 raw_signature)
+  end
+end

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

@@ -113,7 +113,7 @@ describe "OracleEnhancedAdapter dirty object tracking" do
 
   it "should not update unchanged CLOBs" do
     @conn = nil
-    @connection = nil
+    @raw_connection = nil
     @employee = TestEmployee.create!(
       comments: "initial"
     )
@@ -121,10 +121,12 @@ describe "OracleEnhancedAdapter dirty object tracking" do
     @employee.reload
     expect(@employee.comments).to eq("initial")
 
-    oci_conn = @conn.instance_variable_get("@connection")
+    oci_conn = @conn.instance_variable_get("@raw_connection")
     class << oci_conn
       def write_lob(lob, value, is_binary = false); raise "don't do this'"; end
     end
+    @employee.comments = +"initial"
+    expect(@employee.comments_changed?).to be false
     expect { @employee.save! }.not_to raise_error
     class << oci_conn
       remove_method :write_lob

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

@@ -87,5 +87,13 @@ describe "OracleEnhancedAdapter integer type detection based on attribute settin
       create_employee2
       expect(@employee2.is_manager).to be_a(Integer)
     end
+
+    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!
+      create_employee2
+      expect(@employee2.is_manager).to be_a(Integer)
+    end
   end
 end

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

@@ -79,7 +79,7 @@ describe "OracleEnhancedAdapter handling of NCLOB columns" do
     @employee.reload
     expect(@employee.comments).to eq(@nclob_data)
     @employee.comments = @nclob_data2
-    expect(@employee.save).to eq(true)
+    expect(@employee.save).to be(true)
     @employee.reload
     expect(@employee.comments).to eq(@nclob_data)
   end
@@ -90,12 +90,12 @@ describe "OracleEnhancedAdapter handling of NCLOB columns" do
       comments: nil
     )
     expect(@employee.comments).to be_nil
-    expect(@employee.save).to eq(true)
+    expect(@employee.save).to be(true)
     expect(@employee).to be_valid
     @employee.reload
     expect(@employee.comments).to be_nil
     @employee.comments = {}
-    expect(@employee.save).to eq(true)
+    expect(@employee.save).to be(true)
     @employee.reload
     # should not set readonly
     expect(@employee.comments).to be_nil

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

@@ -119,4 +119,19 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
     @employee.reload
     expect(@employee.binary_data).to eq(@binary_data)
   end
+
+  it "should allow equality on select" do
+    TestEmployee.delete_all
+    TestEmployee.create!(
+      first_name: "First",
+      last_name: "Last",
+      binary_data: @binary_data,
+    )
+    TestEmployee.create!(
+      first_name: "First1",
+      last_name: "Last1",
+      binary_data: @binary_data2,
+    )
+    expect(TestEmployee.where(binary_data: @binary_data)).to have_attributes(count: 1)
+  end
 end

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

@@ -78,7 +78,7 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.reload
     expect(@employee.comments).to eq("initial")
     @employee.comments = "changed"
-    expect(@employee.save).to eq(true)
+    expect(@employee.save).to be(true)
     @employee.reload
     expect(@employee.comments).to eq("initial")
   end
@@ -89,12 +89,12 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       comments: nil
     )
     expect(@employee.comments).to be_nil
-    expect(@employee.save).to eq(true)
+    expect(@employee.save).to be(true)
     expect(@employee).to be_valid
     @employee.reload
     expect(@employee.comments).to be_nil
     @employee.comments = {}
-    expect(@employee.save).to eq(true)
+    expect(@employee.save).to be(true)
     @employee.reload
     # should not set readonly
     expect(@employee.comments).to be_nil
@@ -226,4 +226,19 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.reload
     expect(@employee.comments).to eq(length: { is: 2 })
   end
+
+  it "should allow equality on select" do
+    search_data = "text search CLOB"
+    Test2Employee.create!(
+      first_name: "First",
+      last_name: "Last",
+      comments: search_data,
+    )
+    Test2Employee.create!(
+      first_name: "First1",
+      last_name: "Last1",
+      comments: "other data",
+    )
+    expect(Test2Employee.where(comments: search_data)).to have_attributes(count: 1)
+  end
 end

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

@@ -4,6 +4,10 @@ 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
@@ -27,7 +31,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
   end
 
   after(:all) do
-    @conn.drop_table :test_employees, if_exists: true
+    @conn.drop_table :test_employees, if_exists: true rescue nil
     ActiveRecord.default_timezone = :utc
   end
 

data/spec/spec_config.yaml.template

@@ -1,11 +1,11 @@
 # copy this file to spec/spec_config.yaml and set appropriate values
 # you can also use environment variables, see spec_helper.rb
 database:
-  name:         'orcl'
+  name:         'FREEPDB1'
   host:         '127.0.0.1'
   port:         1521
   user:         'oracle_enhanced'
   password:     'oracle_enhanced'
-  sys_password: 'admin'
+  sys_password: 'oracle'
   non_default_tablespace: 'SYSTEM'
 timezone: 'Europe/Riga'

data/spec/spec_helper.rb

@@ -57,6 +57,8 @@ module LoggerSpecHelper
   end
 
   class MockLogger
+    LEVELS = %i[debug info warn error fatal unknown]
+
     attr_reader :flush_count
 
     def initialize
@@ -64,13 +66,22 @@ module LoggerSpecHelper
       @logged = Hash.new { |h, k| h[k] = [] }
     end
 
-    # used in AtiveRecord 2.x
+    # used in ActiveRecord 2.x
     def debug?
       true
     end
 
-    def method_missing(level, message)
-      @logged[level] << message
+    def level
+      0
+    end
+
+    def method_missing(*args)
+      if LEVELS.include?(args[0])
+        level, message  = args
+        @logged[level] << message
+      else
+        super
+      end
     end
 
     def logged(level)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Raimonds Simanovskis
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
   This adapter is superset of original ActiveRecord Oracle adapter.
@@ -88,7 +101,9 @@ files:
 - lib/activerecord-oracle_enhanced-adapter.rb
 - lib/arel/visitors/oracle.rb
 - lib/arel/visitors/oracle12.rb
+- 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/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
@@ -103,6 +118,7 @@ files:
 - spec/active_record/oracle_enhanced/type/binary_spec.rb
 - spec/active_record/oracle_enhanced/type/boolean_spec.rb
 - spec/active_record/oracle_enhanced/type/character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/custom_spec.rb
 - spec/active_record/oracle_enhanced/type/decimal_spec.rb
 - spec/active_record/oracle_enhanced/type/dirty_spec.rb
 - spec/active_record/oracle_enhanced/type/float_spec.rb
@@ -121,8 +137,8 @@ files:
 homepage: http://github.com/rsim/oracle-enhanced
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -137,12 +153,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.6.7
 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/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
@@ -157,6 +173,7 @@ test_files:
 - spec/active_record/oracle_enhanced/type/binary_spec.rb
 - spec/active_record/oracle_enhanced/type/boolean_spec.rb
 - spec/active_record/oracle_enhanced/type/character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/custom_spec.rb
 - spec/active_record/oracle_enhanced/type/decimal_spec.rb
 - spec/active_record/oracle_enhanced/type/dirty_spec.rb
 - spec/active_record/oracle_enhanced/type/float_spec.rb