activerecord-oracle_enhanced-adapter 6.0.6 → 6.1.0.rc1

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

@@ -16,10 +16,15 @@ describe "Oracle Enhanced adapter database tasks" do
         ActiveRecord::Tasks::DatabaseTasks.create(new_user_config)
       end
     end
-    it "creates user" do
+    xit "creates user" do
       query = "SELECT COUNT(*) FROM dba_users WHERE UPPER(username) = '#{new_user_config[:username].upcase}'"
       expect(ActiveRecord::Base.connection.select_value(query)).to eq(1)
     end
+    xit "grants permissions defined by OracleEnhancedAdapter.persmissions" do
+      query = "SELECT COUNT(*) FROM DBA_SYS_PRIVS WHERE GRANTEE = '#{new_user_config[:username].upcase}'"
+      permissions_count = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.permissions.size
+      expect(ActiveRecord::Base.connection.select_value(query)).to eq(permissions_count)
+    end
     after do
       ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}")
     end

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

@@ -133,7 +133,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       end
 
       private
-
         def raise_make_transaction_rollback
           raise "Make the transaction rollback"
         end

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

@@ -305,6 +305,33 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
+  describe "context indexes" do
+    before(:each) do
+      schema_define do
+        create_table :test_context_indexed_posts, force: true do |t|
+          t.string :title
+          t.string :body
+          t.index :title
+        end
+        add_context_index :test_context_indexed_posts, :body, sync: "ON COMMIT"
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_context_indexed_posts
+      end
+    end
+
+    it "should dump the context index" do
+      expect(standard_dump).to include(%(add_context_index "test_context_indexed_posts", ["body"]))
+    end
+
+    it "dumps the sync option" do
+      expect(standard_dump).to include(%(sync: "ON COMMIT"))
+    end
+  end
+
   describe "virtual columns" do
     before(:all) do
       skip "Not supported in this database version" unless @oracle11g_or_higher

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
+      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       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
+      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       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

@@ -150,7 +150,7 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
-  describe "`has_many` assoc has `dependent: :delete_all` with `order`" do
+  describe "eager loading" do
     before(:all) do
       schema_define do
         create_table :test_posts do |t|
@@ -163,14 +163,17 @@ describe "OracleEnhancedAdapter" do
         add_index :test_comments, :test_post_id
       end
       class ::TestPost < ActiveRecord::Base
-        has_many :test_comments, -> { order(:id) }, dependent: :delete_all
+        has_many :test_comments
       end
       class ::TestComment < ActiveRecord::Base
         belongs_to :test_post
       end
+      @ids = (1..1010).to_a
       TestPost.transaction do
-        post = TestPost.create!(title: "Title")
-        TestComment.create!(test_post_id: post.id, description: "Description")
+        @ids.each do |id|
+          TestPost.create!(id: id, title: "Title #{id}")
+          TestComment.create!(test_post_id: id, description: "Description #{id}")
+        end
       end
     end
 
@@ -184,50 +187,48 @@ describe "OracleEnhancedAdapter" do
       ActiveRecord::Base.clear_cache!
     end
 
-    it "should not occur `ActiveRecord::StatementInvalid: OCIError: ORA-00907: missing right parenthesis`" do
-      expect { TestPost.first.destroy }.not_to raise_error
+    it "should load included association with more than 1000 records" do
+      posts = TestPost.includes(:test_comments).to_a
+      expect(posts.size).to eq(@ids.size)
     end
   end
 
-  describe "eager loading" do
+  describe "lists" do
     before(:all) do
       schema_define do
         create_table :test_posts do |t|
-          t.string      :title
-        end
-        create_table :test_comments do |t|
-          t.integer     :test_post_id
-          t.string      :description
+          t.string :title
         end
-        add_index :test_comments, :test_post_id
       end
       class ::TestPost < ActiveRecord::Base
         has_many :test_comments
       end
-      class ::TestComment < ActiveRecord::Base
-        belongs_to :test_post
-      end
       @ids = (1..1010).to_a
       TestPost.transaction do
         @ids.each do |id|
           TestPost.create!(id: id, title: "Title #{id}")
-          TestComment.create!(test_post_id: id, description: "Description #{id}")
         end
       end
     end
 
     after(:all) do
       schema_define do
-        drop_table :test_comments
         drop_table :test_posts
       end
       Object.send(:remove_const, "TestPost")
-      Object.send(:remove_const, "TestComment")
       ActiveRecord::Base.clear_cache!
     end
 
-    it "should load included association with more than 1000 records" do
-      posts = TestPost.includes(:test_comments).to_a
+    ##
+    # 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
@@ -283,6 +284,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,45 +440,6 @@ 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

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

data/spec/support/stats.sql

@@ -0,0 +1,3 @@
+exec DBMS_STATS.GATHER_DICTIONARY_STATS();
+exec DBMS_STATS.GATHER_FIXED_OBJECTS_STATS;
+quit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2020-11-03 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.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0.rc1
 - !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
@@ -116,6 +118,7 @@ files:
 - spec/support/alter_system_set_open_cursors.sql
 - spec/support/alter_system_user_password.sql
 - spec/support/create_oracle_enhanced_users.sql
+- spec/support/stats.sql
 homepage: http://github.com/rsim/oracle-enhanced
 licenses:
 - MIT
@@ -135,38 +138,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
+- spec/active_record/oracle_enhanced/type/dirty_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/float_spec.rb
+- spec/active_record/oracle_enhanced/type/decimal_spec.rb
+- spec/active_record/oracle_enhanced/type/character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/boolean_spec.rb
+- spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/binary_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
+- spec/active_record/oracle_enhanced/type/integer_spec.rb
+- spec/active_record/oracle_enhanced/type/text_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_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/schema_dumper_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/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/procedures_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/context_index_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_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/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/support/stats.sql
+- spec/support/create_oracle_enhanced_users.sql
+- spec/support/alter_system_user_password.sql
+- spec/support/alter_system_set_open_cursors.sql
 - 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