activerecord-oracle_enhanced-adapter 6.0.4 → 6.1.0.rc1

data/lib/arel/visitors/oracle12.rb

@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module Visitors
+    class Oracle12 < Arel::Visitors::ToSql
+      private
+        def visit_Arel_Nodes_SelectStatement(o, collector)
+          # Oracle does not allow LIMIT clause with select for update
+          if o.limit && o.lock
+            raise ArgumentError, <<~MSG
+              Combination of limit and lock is not supported. Because generated SQL statements
+              `SELECT FOR UPDATE and FETCH FIRST n ROWS` generates ORA-02014.
+            MSG
+          end
+          super
+        end
+
+        def visit_Arel_Nodes_SelectOptions(o, collector)
+          collector = maybe_visit o.offset, collector
+          collector = maybe_visit o.limit, collector
+          maybe_visit o.lock, collector
+        end
+
+        def visit_Arel_Nodes_Limit(o, collector)
+          collector << "FETCH FIRST "
+          collector = visit o.expr, collector
+          collector << " ROWS ONLY"
+        end
+
+        def visit_Arel_Nodes_Offset(o, collector)
+          collector << "OFFSET "
+          visit o.expr, collector
+          collector << " ROWS"
+        end
+
+        def visit_Arel_Nodes_Except(o, collector)
+          collector << "( "
+          collector = infix_value o, collector, " MINUS "
+          collector << " )"
+        end
+
+        ##
+        # To avoid ORA-01795: maximum number of expressions in a list is 1000
+        # tell ActiveRecord to limit us to 1000 ids at a time
+        def visit_Arel_Nodes_HomogeneousIn(o, collector)
+          in_clause_length = @connection.in_clause_length
+          values = o.casted_values.map { |v| @connection.quote(v) }
+          column_name = quote_table_name(o.table_name) + "." + quote_column_name(o.column_name)
+          operator =
+            if o.type == :in
+              "IN ("
+            else
+              "NOT IN ("
+            end
+
+          if !Array === values || values.length <= in_clause_length
+            collector << column_name
+            collector << operator
+
+            expr =
+              if values.empty?
+                @connection.quote(nil)
+              else
+                values.join(",")
+              end
+
+            collector << expr
+            collector << ")"
+          else
+            collector << "("
+            values.each_slice(in_clause_length).each_with_index do |valuez, i|
+              collector << " OR " unless i == 0
+              collector << column_name
+              collector << operator
+              collector << valuez.join(",")
+              collector << ")"
+            end
+            collector << ")"
+          end
+
+          collector
+        end
+
+        def visit_Arel_Nodes_In(o, collector)
+          attr, values = o.left, o.right
+
+          if Array === values
+            unless values.empty?
+              values.delete_if { |value| unboundable?(value) }
+            end
+
+            return collector << "1=0" if values.empty?
+          end
+
+          in_clause_length = @connection.in_clause_length
+
+          if !Array === values || values.length <= in_clause_length
+            visit(attr, collector) << " IN ("
+            visit(values, collector) << ")"
+          else
+            collector << "("
+            values.each_slice(in_clause_length).each_with_index do |valuez, i|
+              collector << " OR " unless i == 0
+              visit(attr, collector) << " IN ("
+              visit(valuez, collector) << ")"
+            end
+            collector << ")"
+          end
+        end
+
+        def visit_Arel_Nodes_NotIn(o, collector)
+          attr, values = o.left, o.right
+
+          if Array === values
+            unless values.empty?
+              values.delete_if { |value| unboundable?(value) }
+            end
+
+            return collector << "1=1" if values.empty?
+          end
+
+          in_clause_length = @connection.in_clause_length
+
+          if !Array === values || values.length <= in_clause_length
+            visit(attr, collector) << " NOT IN ("
+            visit(values, collector) << ")"
+          else
+            values.each_slice(in_clause_length).each_with_index do |valuez, i|
+              collector << " AND " unless i == 0
+              visit(attr, collector) << " NOT IN ("
+              visit(valuez, collector) << ")"
+            end
+            collector
+          end
+        end
+
+        def visit_Arel_Nodes_UpdateStatement(o, collector)
+          # Oracle does not allow ORDER BY/LIMIT in UPDATEs.
+          if o.orders.any? && o.limit.nil?
+            # However, there is no harm in silently eating the ORDER BY clause if no LIMIT has been provided,
+            # otherwise let the user deal with the error
+            o = o.dup
+            o.orders = []
+          end
+
+          super
+        end
+
+        def visit_Arel_Nodes_BindParam(o, collector)
+          collector.add_bind(o.value) { |i| ":a#{i}" }
+        end
+
+        def is_distinct_from(o, collector)
+          collector << "DECODE("
+          collector = visit [o.left, o.right, 0, 1], collector
+          collector << ")"
+        end
+    end
+  end
+end

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

@@ -40,6 +40,12 @@ describe "OracleEnhancedAdapter establish connection" do
     ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(cursor_sharing: :exact))
     expect(ActiveRecord::Base.connection.select_value("select value from v$parameter where name = 'cursor_sharing'")).to eq("EXACT")
   end
+
+  it "should connect to database using service_name" do
+    ActiveRecord::Base.establish_connection(SERVICE_NAME_CONNECTION_PARAMS)
+    expect(ActiveRecord::Base.connection).not_to be_nil
+    expect(ActiveRecord::Base.connection.class).to eq(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+  end
 end
 
 describe "OracleEnhancedConnection" do
@@ -81,13 +87,13 @@ describe "OracleEnhancedConnection" do
       expect(ActiveRecord::Base.connection).to be_active
     end
 
-    it "should swith to specified schema" do
+    it "should switch to specified schema" do
       ActiveRecord::Base.establish_connection(CONNECTION_WITH_SCHEMA_PARAMS)
       expect(ActiveRecord::Base.connection.current_schema).to eq(CONNECTION_WITH_SCHEMA_PARAMS[:schema].upcase)
       expect(ActiveRecord::Base.connection.current_user).to eq(CONNECTION_WITH_SCHEMA_PARAMS[:username].upcase)
     end
 
-    it "should swith to specified schema after reset" do
+    it "should switch to specified schema after reset" do
       ActiveRecord::Base.connection.reset!
       expect(ActiveRecord::Base.connection.current_schema).to eq(CONNECTION_WITH_SCHEMA_PARAMS[:schema].upcase)
     end
@@ -180,7 +186,7 @@ describe "OracleEnhancedConnection" do
   describe "with slash-prefixed database name (service name)" do
     before(:all) do
       params = CONNECTION_PARAMS.dup
-      params[:database] = "/#{params[:database]}" unless params[:database].match(/^\//)
+      params[:database] = "/#{params[:database]}" unless params[:database].start_with?("/")
       @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(params)
     end
 

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_adapter_spec.rb

@@ -193,6 +193,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))
@@ -244,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

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.4
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Raimonds Simanovskis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 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,11 +118,12 @@ 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
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,38 +138,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+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/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/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/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/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/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/national_character_string_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/support/alter_system_set_open_cursors.sql
-- spec/support/alter_system_user_password.sql
+- 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/schema_dumper_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/quoting_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/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/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