activerecord-oracle_enhanced-adapter 6.0.5 → 6.1.2

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

@@ -66,7 +66,7 @@ describe "OracleEnhancedAdapter structure dump" do
         ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_foo FOREIGN KEY (foo_id) REFERENCES foos(id)
       SQL
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump = ActiveRecord::Base.connection.structure_dump
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i)
     end
@@ -86,7 +86,7 @@ describe "OracleEnhancedAdapter structure dump" do
         ADD CONSTRAINT fk_test_post_baz FOREIGN KEY (baz_id) REFERENCES foos(baz_id)
       SQL
 
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump = ActiveRecord::Base.connection.structure_dump
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i)
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -232,6 +232,46 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
+  describe "lists" do
+    before(:all) do
+      schema_define do
+        create_table :test_posts do |t|
+          t.string :title
+        end
+      end
+      class ::TestPost < ActiveRecord::Base
+        has_many :test_comments
+      end
+      @ids = (1..1010).to_a
+      TestPost.transaction do
+        @ids.each do |id|
+          TestPost.create!(id: id, title: "Title #{id}")
+        end
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_posts
+      end
+      Object.send(:remove_const, "TestPost")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    ##
+    # See this GitHub issue for an explanation of homogenous lists.
+    # https://github.com/rails/rails/commit/72fd0bae5948c1169411941aeea6fef4c58f34a9
+    it "should allow more than 1000 items in a list where the list is homogenous" do
+      posts = TestPost.where(id: @ids).to_a
+      expect(posts.size).to eq(@ids.size)
+    end
+
+    it "should allow more than 1000 items in a list where the list is non-homogenous" do
+      posts = TestPost.where(id: [*@ids, nil]).to_a
+      expect(posts.size).to eq(@ids.size)
+    end
+  end
+
   describe "with statement pool" do
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(statement_limit: 3))
@@ -283,6 +323,14 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
+  describe "database_exists?" do
+    it "should raise `NotImplementedError`" do
+      expect {
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.database_exists?(CONNECTION_PARAMS)
+      }.to raise_error(NotImplementedError)
+    end
+  end
+
   describe "explain" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
@@ -431,6 +479,45 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
+  describe "Binary lob column" do
+    before(:all) do
+      schema_define do
+        create_table :test_binary_columns do |t|
+          t.binary :attachment
+        end
+      end
+      class ::TestBinaryColumn < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_binary_columns
+      end
+      Object.send(:remove_const, "TestBinaryColumn")
+      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.clear_cache!
+    end
+
+    before(:each) do
+      set_logger
+    end
+
+    after(:each) do
+      clear_logger
+    end
+
+    it "should serialize with non UTF-8 data" do
+      binary_value = +"Hello \x93\xfa\x96\x7b"
+      binary_value.force_encoding "UTF-8"
+
+      binary_column_object = TestBinaryColumn.new
+      binary_column_object.attachment = binary_value
+
+      expect(binary_column_object.save!).to eq(true)
+    end
+  end
+
   describe "quoting" do
     before(:all) do
       schema_define do
@@ -659,4 +746,39 @@ describe "OracleEnhancedAdapter" do
       expect(post.explain).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
     end
   end
+
+  describe "homogeneous in" do
+    before(:all) do
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        create_table :test_posts, force: true
+        create_table :test_comments, force: true do |t|
+          t.integer :test_post_id
+        end
+      end
+      class ::TestPost < ActiveRecord::Base
+        has_many :test_comments
+      end
+      class ::TestComment < ActiveRecord::Base
+        belongs_to :test_post
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_posts, if_exists: true
+        drop_table :test_comments, if_exists: true
+      end
+      Object.send(:remove_const, "TestPost")
+      Object.send(:remove_const, "TestComment")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should not raise undefined method length" do
+      post = TestPost.create!
+      post.test_comments << TestComment.create!
+      expect(TestComment.where(test_post_id: TestPost.select(:id)).size).to eq(1)
+    end
+  end
 end

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

@@ -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

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: 6.0.5
+  version: 6.1.2
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,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
@@ -135,38 +137,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/spec_helper.rb
-- spec/spec_config.yaml.template
 - spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_data_types_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/schema_statements_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/dbms_output_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/procedures_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/oracle_enhanced/structure_dump_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/context_index_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/decimal_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
 - spec/active_record/oracle_enhanced/type/dirty_spec.rb
-- spec/active_record/oracle_enhanced/type/boolean_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/binary_spec.rb
 - spec/active_record/oracle_enhanced/type/text_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/character_string_spec.rb
-- spec/active_record/oracle_enhanced/type/integer_spec.rb
-- spec/active_record/oracle_enhanced/type/float_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