activerecord-oracle_enhanced-adapter 5.2.8 → 7.0.3

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+describe "OracleEnhancedAdapter handling of DECIMAL columns" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+    schema_define do
+      create_table :test2_employees, force: true do |t|
+        t.string  :first_name, limit: 20
+        t.string  :last_name, limit: 25
+        t.string  :email, limit: 25
+        t.string  :phone_number, limit: 25
+        t.date    :hire_date
+        t.integer :job_id
+        t.integer :salary
+        t.decimal :commission_pct, scale: 2, precision: 2
+        t.decimal :hourly_rate
+        t.integer :manager_id,  limit: 6
+        t.integer :is_manager,  limit: 1
+        t.decimal :department_id, scale: 0, precision: 4
+        t.timestamps
+      end
+    end
+    class ::Test2Employee < ActiveRecord::Base
+    end
+  end
+
+  after(:all) do
+    Object.send(:remove_const, "Test2Employee")
+    @conn.drop_table :test2_employees, if_exists:  true
+  end
+
+  it "should set DECIMAL column type as decimal" do
+    columns = @conn.columns("test2_employees")
+    column = columns.detect { |c| c.name == "hourly_rate" }
+    expect(column.type).to eq(:decimal)
+  end
+
+  it "should DECIMAL column type returns an exact value" do
+    employee = Test2Employee.create(hourly_rate: 4.40125)
+
+    employee.reload
+
+    expect(employee.hourly_rate).to eq(4.40125)
+  end
+
+  it "should DECIMAL column type rounds if scale is specified and value exceeds scale" do
+    employee = Test2Employee.create(commission_pct: 0.1575)
+
+    employee.reload
+
+    expect(employee.commission_pct).to eq(0.16)
+  end
+end

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

@@ -123,7 +123,7 @@ describe "OracleEnhancedAdapter dirty object tracking" do
 
     oci_conn = @conn.instance_variable_get("@connection")
     class << oci_conn
-       def write_lob(lob, value, is_binary = false); raise "don't do this'"; end
+      def write_lob(lob, value, is_binary = false); raise "don't do this'"; end
     end
     expect { @employee.save! }.not_to raise_error
     class << oci_conn

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

@@ -5,7 +5,7 @@ describe "OracleEnhancedAdapter integer type detection based on attribute settin
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
     @conn.execute "DROP TABLE test2_employees" rescue nil
-    @conn.execute <<-SQL
+    @conn.execute <<~SQL
       CREATE TABLE test2_employees (
         id            NUMBER PRIMARY KEY,
         first_name    VARCHAR2(20),
@@ -23,7 +23,7 @@ describe "OracleEnhancedAdapter integer type detection based on attribute settin
       )
     SQL
     @conn.execute "DROP SEQUENCE test2_employees_seq" rescue nil
-    @conn.execute <<-SQL
+    @conn.execute <<~SQL
       CREATE SEQUENCE test2_employees_seq  MINVALUE 1
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 describe "OracleEnhancedAdapter attribute API support for JSON type" do
-
   include SchemaSpecHelper
 
   before(:all) do

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

@@ -4,7 +4,7 @@ describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
-    @conn.execute <<-SQL
+    @conn.execute <<~SQL
       CREATE TABLE test_items (
         id                  NUMBER(6,0) PRIMARY KEY,
         nchar_column        NCHAR(20),
@@ -35,9 +35,11 @@ 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 }
-      value = @conn.type_cast_from_column(column, "abc")
+      type = @conn.lookup_cast_type_from_column(column)
+      value = type.serialize("abc")
       expect(@conn.quote(value)).to eq(column.sql_type[0, 1] == "N" ? "N'abc'" : "'abc'")
-      nilvalue = @conn.type_cast_from_column(column, nil)
+      type = @conn.lookup_cast_type_from_column(column)
+      nilvalue = type.serialize(nil)
       expect(@conn.quote(nilvalue)).to eq("NULL")
     end
   end
@@ -48,8 +50,7 @@ describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
       nchar_column: nchar_data,
       nvarchar2_column: nchar_data
     ).reload
-    expect(item.nchar_column).to eq(nchar_data + " " * 17)
+    expect(item.nchar_column).to eq(nchar_data)
     expect(item.nvarchar2_column).to eq(nchar_data)
   end
-
 end

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

@@ -4,7 +4,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
   include SchemaSpecHelper
 
   before(:all) do
-    ActiveRecord::Base.default_timezone = :local
+    ActiveRecord.default_timezone = :local
     ActiveRecord::Base.establish_connection(CONNECTION_WITH_TIMEZONE_PARAMS)
     @conn = ActiveRecord::Base.connection
     schema_define do
@@ -28,7 +28,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
 
   after(:all) do
     @conn.drop_table :test_employees, if_exists: true
-    ActiveRecord::Base.default_timezone = :utc
+    ActiveRecord.default_timezone = :utc
   end
 
   describe "/ TIMESTAMP WITH TIME ZONE values from ActiveRecord model" do
@@ -69,7 +69,5 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
         expect(@employee.send(c).to_f).to eq(@now.to_f)
       end
     end
-
   end
-
 end

data/spec/spec_config.yaml.template

@@ -1,4 +1,4 @@
-# copy this file to spec/config.yaml and set appropriate values
+# 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'
@@ -8,4 +8,4 @@ database:
   password:     'oracle_enhanced'
   sys_password: 'admin'
   non_default_tablespace: 'SYSTEM'
-timezone: 'Europe/Riga'
+timezone: 'Europe/Riga'

data/spec/spec_helper.rb

@@ -17,8 +17,8 @@ end
 
 require "rspec"
 
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
-  puts "==> Running specs with MRI version #{RUBY_VERSION}"
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "truffleruby"
+  puts "==> Running specs with ruby version #{RUBY_VERSION}"
   require "oci8"
 elsif RUBY_ENGINE == "jruby"
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
@@ -105,6 +105,8 @@ module LoggerSpecHelper
   end
 end
 
+ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES.replace(["EXPLAIN"])
+
 module SchemaSpecHelper
   def schema_define(&block)
     ActiveRecord::Schema.define do
@@ -183,6 +185,15 @@ SYSTEM_CONNECTION_PARAMS = {
   password: DATABASE_SYS_PASSWORD
 }
 
+SERVICE_NAME_CONNECTION_PARAMS = {
+  adapter: "oracle_enhanced",
+  database: "/#{DATABASE_NAME}",
+  host: DATABASE_HOST,
+  port: DATABASE_PORT,
+  username: DATABASE_USER,
+  password: DATABASE_PASSWORD
+}
+
 DATABASE_NON_DEFAULT_TABLESPACE = config["database"]["non_default_tablespace"] || ENV["DATABASE_NON_DEFAULT_TABLESPACE"] || "SYSTEM"
 
 # set default time zone in TZ environment variable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.8
+  version: 7.0.3
 platform: ruby
 authors:
 - Raimonds Simanovskis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,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.
@@ -70,12 +84,12 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced/schema_definitions.rb
 - lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb
 - lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb
-- lib/active_record/connection_adapters/oracle_enhanced/schema_statements_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb
 - lib/active_record/connection_adapters/oracle_enhanced/type_metadata.rb
 - lib/active_record/connection_adapters/oracle_enhanced/version.rb
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
 - lib/active_record/type/oracle_enhanced/boolean.rb
+- lib/active_record/type/oracle_enhanced/character_string.rb
 - lib/active_record/type/oracle_enhanced/integer.rb
 - lib/active_record/type/oracle_enhanced/json.rb
 - lib/active_record/type/oracle_enhanced/national_character_string.rb
@@ -86,6 +100,8 @@ files:
 - lib/active_record/type/oracle_enhanced/timestampltz.rb
 - lib/active_record/type/oracle_enhanced/timestamptz.rb
 - lib/activerecord-oracle_enhanced-adapter.rb
+- lib/arel/visitors/oracle.rb
+- lib/arel/visitors/oracle12.rb
 - spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
@@ -100,6 +116,9 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
 - 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
 - spec/active_record/oracle_enhanced/type/integer_spec.rb
@@ -118,7 +137,7 @@ homepage: http://github.com/rsim/oracle-enhanced
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,43 +145,46 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/spec_helper.rb
-- spec/active_record/oracle_enhanced/type/integer_spec.rb
-- spec/active_record/oracle_enhanced/type/raw_spec.rb
-- spec/active_record/oracle_enhanced/type/float_spec.rb
-- spec/active_record/oracle_enhanced/type/boolean_spec.rb
-- spec/active_record/oracle_enhanced/type/dirty_spec.rb
-- spec/active_record/oracle_enhanced/type/binary_spec.rb
-- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
-- spec/active_record/oracle_enhanced/type/json_spec.rb
-- spec/active_record/oracle_enhanced/type/text_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
+- spec/active_record/connection_adapters/emulation/oracle_adapter_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/quoting_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb
-- spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
+- 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
+- spec/active_record/oracle_enhanced/type/integer_spec.rb
+- spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/text_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
+- spec/spec_config.yaml.template
+- spec/spec_helper.rb
+- spec/support/alter_system_set_open_cursors.sql
 - spec/support/alter_system_user_password.sql
 - spec/support/create_oracle_enhanced_users.sql
-- spec/support/alter_system_set_open_cursors.sql
-- spec/spec_config.yaml.template

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

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module ConnectionAdapters
-    module OracleEnhanced
-      module SchemaStatementsExt
-        # Create primary key trigger (so that you can skip primary key value in INSERT statement).
-        # By default trigger name will be "table_name_pkt", you can override the name with
-        # :trigger_name option (but it is not recommended to override it as then this trigger will
-        # not be detected by ActiveRecord model and it will still do prefetching of sequence value).
-        #
-        #   add_primary_key_trigger :users
-        #
-        # You can also create primary key trigger using +create_table+ with :primary_key_trigger
-        # option:
-        #
-        #   create_table :users, :primary_key_trigger => true do |t|
-        #     # ...
-        #   end
-        #
-        def add_primary_key_trigger(table_name, options = {})
-          # call the same private method that is used for create_table :primary_key_trigger => true
-          create_primary_key_trigger(table_name, options)
-        end
-      end
-    end
-  end
-end