activerecord-oracle_enhanced-adapter 7.0.0 → 7.1.1

data/lib/arel/visitors/oracle12.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "oracle_common"
+
 module Arel # :nodoc: all
   module Visitors
     class Oracle12 < Arel::Visitors::ToSql
+      include OracleCommon
+
       private
         def visit_Arel_Nodes_SelectStatement(o, collector)
           # Oracle does not allow LIMIT clause with select for update
@@ -45,7 +49,6 @@ module Arel # :nodoc: all
         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 ("
@@ -54,7 +57,7 @@ module Arel # :nodoc: all
             end
 
           if !Array === values || values.length <= in_clause_length
-            collector << column_name
+            visit o.left, collector
             collector << operator
 
             expr =
@@ -76,15 +79,13 @@ module Arel # :nodoc: all
             collector << "("
             values.each_slice(in_clause_length).each_with_index do |valuez, i|
               collector << separator unless i == 0
-              collector << column_name
+              visit o.left, collector
               collector << operator
               collector << valuez.join(",")
               collector << ")"
             end
             collector << ")"
           end
-
-          collector
         end
 
         def visit_Arel_Nodes_UpdateStatement(o, collector)

data/lib/arel/visitors/oracle_common.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module Visitors
+    module OracleCommon
+      private
+        # Oracle can't compare CLOB columns with standard SQL operators for comparison.
+        # We need to replace standard equality for text/binary columns to use DBMS_LOB.COMPARE function.
+        # Fixes ORA-00932: inconsistent datatypes: expected - got CLOB
+        def visit_Arel_Nodes_Equality(o, collector)
+          left = o.left
+          return super unless %i(text binary).include?(cached_column_for(left)&.type)
+
+          # https://docs.oracle.com/cd/B19306_01/appdev.102/b14258/d_lob.htm#i1016668
+          # returns 0 when the comparison succeeds
+          comparator = Arel::Nodes::NamedFunction.new("DBMS_LOB.COMPARE", [left, o.right])
+          collector = visit comparator, collector
+          collector << " = 0"
+          collector
+        end
+
+        def visit_Arel_Nodes_Matches(o, collector)
+          if !o.case_sensitive && o.left && o.right
+            o.left = Arel::Nodes::NamedFunction.new("UPPER", [o.left])
+            o.right = Arel::Nodes::NamedFunction.new("UPPER", [o.right])
+          end
+
+          super o, collector
+        end
+
+        def cached_column_for(attr)
+          return unless Arel::Attributes::Attribute === attr
+
+          table = attr.relation.name
+          return unless schema_cache.columns_hash?(table)
+
+          column = attr.name.to_s
+          schema_cache.columns_hash(table)[column]
+        end
+
+        def schema_cache
+          @connection.schema_cache
+        end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+describe "compatibility migrations" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+    schema_define do
+      create_table :test_employees, force: true
+    end
+  end
+
+  after(:all) do
+    schema_define do
+      drop_table :test_employees, if_exists: true
+      drop_table :new_test_employees, if_exists: true
+    end
+  end
+
+  it "should rename table on 7_0 and below" do
+    migration = Class.new(ActiveRecord::Migration[7.0]) {
+      def change
+        rename_table :test_employees, :new_test_employees
+      end
+    }.new
+
+    migration.migrate(:up)
+    expect(@conn.table_exists?(:new_test_employees)).to be_truthy
+    expect(@conn.table_exists?(:test_employees)).not_to be_truthy
+
+    migration.migrate(:down)
+    expect(@conn.table_exists?(:new_test_employees)).not_to be_truthy
+    expect(@conn.table_exists?(:test_employees)).to be_truthy
+  end
+end

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

@@ -30,6 +30,12 @@ describe "OracleEnhancedAdapter establish connection" do
     expect(ActiveRecord::Base.connection).to be_active
   end
 
+  it "should be active after reconnection to database with restore_transactions: true" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.reconnect!(restore_transactions: true)
+    expect(ActiveRecord::Base.connection).to be_active
+  end
+
   it "should use database default cursor_sharing parameter value force by default" do
     # Use `SYSTEM_CONNECTION_PARAMS` to query v$parameter
     ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS)
@@ -44,7 +50,7 @@ describe "OracleEnhancedAdapter establish connection" do
   it "should not use JDBC statement caching" do
     if ORACLE_ENHANCED_CONNECTION == :jdbc
       ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS)
-      expect(ActiveRecord::Base.connection.raw_connection.getImplicitCachingEnabled).to eq(false)
+      expect(ActiveRecord::Base.connection.raw_connection.getImplicitCachingEnabled).to be(false)
       expect(ActiveRecord::Base.connection.raw_connection.getStatementCacheSize).to eq(-1)
     end
   end
@@ -52,12 +58,26 @@ describe "OracleEnhancedAdapter establish connection" do
   it "should use JDBC statement caching" do
     if ORACLE_ENHANCED_CONNECTION == :jdbc
       ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_statement_cache_size: 100))
-      expect(ActiveRecord::Base.connection.raw_connection.getImplicitCachingEnabled).to eq(true)
+      expect(ActiveRecord::Base.connection.raw_connection.getImplicitCachingEnabled).to be(true)
       expect(ActiveRecord::Base.connection.raw_connection.getStatementCacheSize).to eq(100)
       # else: don't raise error if OCI connection has parameter "jdbc_statement_cache_size", still ignore it
     end
   end
 
+  it "should not encrypt JDBC network connection" do
+    if ORACLE_ENHANCED_CONNECTION == :jdbc
+      @conn = ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REJECTED" }))
+      expect(@conn.select("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 0 }])
+    end
+  end
+
+  it "should encrypt JDBC network connection" do
+    if ORACLE_ENHANCED_CONNECTION == :jdbc
+      @conn = ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REQUESTED" }))
+      expect(@conn.select("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 1 }])
+    end
+  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
@@ -227,7 +247,7 @@ describe "OracleEnhancedConnection" do
     end
 
     after(:all) do
-      Object.send(:remove_const, "Post")
+      Object.send(:remove_const, "Post") if defined?(Post)
       ActiveRecord::Base.clear_cache!
     end
 
@@ -392,7 +412,7 @@ describe "OracleEnhancedConnection" do
       @conn.exec "DROP TABLE test_employees" rescue nil
     end
 
-    it "should execute prepared statement with decimal bind parameter " do
+    it "should execute prepared statement with decimal bind parameter" do
       cursor = @conn.prepare("INSERT INTO test_employees VALUES(:1)")
       type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "NUMBER", type: :decimal, limit: 10, precision: nil, scale: 2)
       column = ActiveRecord::ConnectionAdapters::OracleEnhanced::Column.new("age", nil, type_metadata, false, comment: nil)
@@ -414,7 +434,7 @@ describe "OracleEnhancedConnection" do
 
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-      @conn = ActiveRecord::Base.connection.instance_variable_get("@connection")
+      @conn = ActiveRecord::Base.connection.send(:_connection)
       @sys_conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(SYS_CONNECTION_PARAMS)
       schema_define do
         create_table :posts, force: true
@@ -447,6 +467,11 @@ describe "OracleEnhancedConnection" do
       expect(@conn.exec("SELECT * FROM dual")).not_to be_nil
     end
 
+    it "should reconnect and execute SQL statement if connection is lost and allow_retry is passed" do
+      kill_current_session
+      expect(@conn.exec("SELECT * FROM dual", allow_retry: true)).not_to be_nil
+    end
+
     it "should not reconnect and execute SQL statement if connection is lost and auto retry is disabled" do
       # @conn.auto_retry = false
       ActiveRecord::Base.connection.auto_retry = false

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

@@ -16,6 +16,7 @@ describe "Oracle Enhanced adapter database tasks" do
         ActiveRecord::Tasks::DatabaseTasks.create(new_user_config)
       end
     end
+
     it "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)
@@ -62,6 +63,7 @@ describe "Oracle Enhanced adapter database tasks" do
 
     describe "drop" do
       before { ActiveRecord::Tasks::DatabaseTasks.drop(config) }
+
       it "drops all tables" do
         expect(ActiveRecord::Base.connection.table_exists?(:test_posts)).to be_falsey
       end
@@ -69,6 +71,7 @@ describe "Oracle Enhanced adapter database tasks" do
 
     describe "purge" do
       before { ActiveRecord::Tasks::DatabaseTasks.purge(config) }
+
       it "drops all tables" do
         expect(ActiveRecord::Base.connection.table_exists?(:test_posts)).to be_falsey
         expect(ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM RECYCLEBIN")).to eq(0)
@@ -78,12 +81,13 @@ describe "Oracle Enhanced adapter database tasks" do
     describe "structure" do
       let(:temp_file) { Tempfile.create(["oracle_enhanced", ".sql"]).path }
       before do
-        ActiveRecord::SchemaMigration.create_table
+        ActiveRecord::Base.connection.schema_migration.create_table
         ActiveRecord::Base.connection.execute "INSERT INTO schema_migrations (version) VALUES ('20150101010000')"
       end
 
       describe "structure_dump" do
         before { ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, temp_file) }
+
         it "dumps the database structure to a file without the schema information" do
           contents = File.read(temp_file)
           expect(contents).to include('CREATE TABLE "TEST_POSTS"')
@@ -97,6 +101,7 @@ describe "Oracle Enhanced adapter database tasks" do
           ActiveRecord::Tasks::DatabaseTasks.drop(config)
           ActiveRecord::Tasks::DatabaseTasks.structure_load(config, temp_file)
         end
+
         it "loads the database structure from a file" do
           expect(ActiveRecord::Base.connection.table_exists?(:test_posts)).to be_truthy
         end
@@ -104,7 +109,7 @@ describe "Oracle Enhanced adapter database tasks" do
 
       after do
         File.unlink(temp_file)
-        ActiveRecord::SchemaMigration.drop_table
+        ActiveRecord::Base.connection.schema_migration.drop_table
       end
     end
 

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

@@ -47,7 +47,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
     expect(@logger.output(:debug)).not_to match(/^DBMS_OUTPUT/)
   end
 
-  it "should log dbms output lines to the rails log" do
+  it "should log dbms output longer lines to the rails log" do
     @conn.enable_dbms_output
 
     expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{ "is_it_long" => 1 }])
@@ -57,7 +57,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: about to return: 1$/)
   end
 
-  it "should log dbms output lines to the rails log" do
+  it "should log dbms output shorter lines to the rails log" do
     @conn.enable_dbms_output
 
     expect(@conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a).to eq([{ "is_it_long" => 0 }])

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

@@ -127,6 +127,7 @@ describe "OracleEnhancedAdapter schema dump" do
         remove_foreign_key :test_comments, name: "comments_posts_baz_fooz_fk" rescue nil
       end
     end
+
     after(:all) do
       schema_define do
         drop_table :test_comments, if_exists: true
@@ -383,6 +384,7 @@ describe "OracleEnhancedAdapter schema dump" do
           end
         end
       end
+
       after(:all) do
         if @oracle11g_or_higher
           schema_define do
@@ -390,6 +392,7 @@ describe "OracleEnhancedAdapter schema dump" do
           end
         end
       end
+
       it "should dump correctly" do
         output = dump_table_schema "test_names"
         expect(output).not_to match(/t\.index .+FIRST_NAME.+$/)

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

@@ -387,6 +387,34 @@ describe "OracleEnhancedAdapter schema definition" do
   end
 end
 
+  describe "add timestamps" do
+    before(:each) do
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        create_table :test_employees, force: true
+      end
+      class ::TestEmployee < ActiveRecord::Base; end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_employees, if_exists: true
+      end
+      Object.send(:remove_const, "TestEmployee")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should add created_at and updated_at" do
+      expect do
+        @conn.add_timestamps("test_employees")
+      end.not_to raise_error
+
+      TestEmployee.reset_column_information
+      expect(TestEmployee.columns_hash["created_at"]).not_to be_nil
+      expect(TestEmployee.columns_hash["updated_at"]).not_to be_nil
+    end
+  end
+
   describe "ignore options for LOB columns" do
     after(:each) do
       schema_define do
@@ -550,6 +578,7 @@ end
       class ::TestPost < ActiveRecord::Base
       end
     end
+
     it "should use default tablespace for clobs" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = DATABASE_NON_DEFAULT_TABLESPACE
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:nclob] = nil
@@ -880,7 +909,7 @@ end
       expect(TestPost.columns_hash["a" * 128]).not_to be_nil
     end
 
-    it "should add lob column with non_default tablespace" do
+    it "should add text type lob column with non_default tablespace" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = DATABASE_NON_DEFAULT_TABLESPACE
       schema_define do
         add_column :test_posts, :body, :text
@@ -888,7 +917,7 @@ end
       expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'BODY'")).to eq(DATABASE_NON_DEFAULT_TABLESPACE)
     end
 
-    it "should add lob column with non_default tablespace" do
+    it "should add ntext type lob column with non_default tablespace" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:nclob] = DATABASE_NON_DEFAULT_TABLESPACE
       schema_define do
         add_column :test_posts, :body, :ntext
@@ -995,12 +1024,12 @@ end
 
     it "should include virtual columns and not try to update them" do
       tf = TestFraction.columns.detect { |c| c.virtual? }
-      expect(tf).not_to be nil
+      expect(tf).not_to be_nil
       expect(tf.name).to eq("percent")
       expect(tf.virtual?).to be true
       expect do
         tf = TestFraction.new(numerator: 20, denominator: 100)
-        expect(tf.percent).to be nil # not whatever is in DATA_DEFAULT column
+        expect(tf.percent).to be_nil # not whatever is in DATA_DEFAULT column
         tf.save!
         tf.reload
       end.not_to raise_error
@@ -1013,11 +1042,11 @@ end
       end
       TestFraction.reset_column_information
       tf = TestFraction.columns.detect { |c| c.name == "rem" }
-      expect(tf).not_to be nil
+      expect(tf).not_to be_nil
       expect(tf.virtual?).to be true
       expect do
         tf = TestFraction.new(numerator: 7, denominator: 5)
-        expect(tf.rem).to be nil
+        expect(tf.rem).to be_nil
         tf.save!
         tf.reload
       end.not_to raise_error
@@ -1030,13 +1059,13 @@ end
       end
       TestFraction.reset_column_information
       tf = TestFraction.columns.detect { |c| c.name == "expression" }
-      expect(tf).not_to be nil
+      expect(tf).not_to be_nil
       expect(tf.virtual?).to be true
       expect(tf.type).to be :string
       expect(tf.limit).to be 100
       expect do
         tf = TestFraction.new(numerator: 7, denominator: 5)
-        expect(tf.expression).to be nil
+        expect(tf.expression).to be_nil
         tf.save!
         tf.reload
       end.not_to raise_error
@@ -1050,14 +1079,14 @@ end
       end
       TestFraction.reset_column_information
       tf = TestFraction.columns.detect { |c| c.name == "percent" }
-      expect(tf).not_to be nil
+      expect(tf).not_to be_nil
       expect(tf.virtual?).to be true
       expect(tf.type).to be :decimal
       expect(tf.precision).to be 15
       expect(tf.scale).to be 2
       expect do
         tf = TestFraction.new(numerator: 11, denominator: 17)
-        expect(tf.percent).to be nil
+        expect(tf.percent).to be_nil
         tf.save!
         tf.reload
       end.not_to raise_error
@@ -1070,14 +1099,14 @@ end
       end
       TestFraction.reset_column_information
       tf = TestFraction.columns.detect { |c| c.name == "percent" }
-      expect(tf).not_to be nil
+      expect(tf).not_to be_nil
       expect(tf.virtual?).to be true
       expect(tf.type).to be :decimal
       expect(tf.precision).to be 12
       expect(tf.scale).to be 5
       expect do
         tf = TestFraction.new(numerator: 11, denominator: 17)
-        expect(tf.percent).to be nil
+        expect(tf.percent).to be_nil
         tf.save!
         tf.reload
       end.not_to raise_error
@@ -1157,6 +1186,7 @@ end
         @conn.drop_table :tablespace_tests, if_exists: true
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:table)
       end
+
       it "should use correct tablespace" do
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:table] = DATABASE_NON_DEFAULT_TABLESPACE
         @conn.create_table :tablespace_tests do |t|
@@ -1171,6 +1201,7 @@ end
         @conn.drop_table :tablespace_tests, if_exists: true
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:table)
       end
+
       it "should use correct tablespace" do
         @conn.create_table :tablespace_tests, id: false, organization: "INDEX INITRANS 4 COMPRESS 1", tablespace: "bogus" do |t|
           t.integer :id
@@ -1206,7 +1237,14 @@ end
       schema_define do
         add_index :keyboards, "lower(name)", unique: true, name: :index_keyboards_on_lower_name
       end
-      expect(@would_execute_sql).not_to match(/ALTER +TABLE .* ADD CONSTRAINT .* UNIQUE \(.*\(.*\)\)/)
+      expect(@would_execute_sql).not_to include("ADD CONSTRAINT")
+    end
+
+    it "should add unique constraint only to the index where it was defined" do
+      schema_define do
+        add_index :keyboards, ["name"], unique: true, name: :this_index
+      end
+      expect(@would_execute_sql.lines.last).to match(/ALTER +TABLE .* ADD CONSTRAINT .* UNIQUE \(.*\) USING INDEX "THIS_INDEX";/)
     end
   end
 
@@ -1218,7 +1256,7 @@ end
     before do
       @conn = ActiveRecord::Base.connection
 
-      ActiveRecord::SchemaMigration.create_table
+      ActiveRecord::Base.connection.schema_migration.create_table
     end
 
     context "multi insert is supported" do
@@ -1246,7 +1284,7 @@ end
     end
 
     after do
-      ActiveRecord::SchemaMigration.drop_table
+      ActiveRecord::Base.connection.schema_migration.drop_table
     end
   end
 end

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

@@ -9,6 +9,7 @@ describe "OracleEnhancedAdapter structure dump" do
     @oracle11g_or_higher = !! @conn.select_value(
       "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
+
   describe "structure dump" do
     before(:each) do
       @conn.create_table :test_posts, force: true do |t|
@@ -228,25 +229,13 @@ describe "OracleEnhancedAdapter structure dump" do
       dump = ActiveRecord::Base.connection.structure_dump
       expect(dump).to match(/#{comment_sql}/)
     end
-
-    it "should dump table comments" do
-      comment_sql = %Q(COMMENT ON TABLE "TEST_POSTS" IS 'Test posts with ''some'' "quotes"')
-      @conn.execute comment_sql
-      dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/#{comment_sql}/)
-    end
-
-    it "should dump column comments" do
-      comment_sql = %Q(COMMENT ON COLUMN "TEST_POSTS"."TITLE" IS 'The title of the post with ''some'' "quotes"')
-      @conn.execute comment_sql
-      dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/#{comment_sql}/)
-    end
   end
+
   describe "temporary tables" do
     after(:all) do
       @conn.drop_table :test_comments, if_exists: true
     end
+
     it "should dump correctly" do
       @conn.create_table :test_comments, temporary: true, id: false do |t|
         t.integer :post_id
@@ -261,26 +250,32 @@ describe "OracleEnhancedAdapter structure dump" do
     before(:each) do
       @conn.execute sql
     end
+
     after(:each) do
       @conn.execute "drop SEQUENCE \"#{sequence_name}\""
     end
+
     subject do
       ActiveRecord::Base.connection.structure_dump
     end
+
     context "default sequence" do
       let(:sql) { "CREATE SEQUENCE \"#{sequence_name}\"" }
       it { is_expected.to_not match(%r{CREATE SEQUENCE "#{sequence_name}" MAXVALUE \d+ MINVALUE \d+ NOORDER NOCYCLE}) }
     end
+
     context "noorder" do
       let(:sql) { "CREATE SEQUENCE \"#{sequence_name}\" NOORDER" }
       it { is_expected.to include("NOORDER") }
       it { is_expected.to_not include(" ORDER") }
     end
+
     context "order" do
       let(:sql) { "CREATE SEQUENCE \"#{sequence_name}\" ORDER" }
       it { is_expected.to include(" ORDER") }
       it { is_expected.to_not include("NOORDER") }
     end
+
     context "min max values" do
       let(:sql) { "CREATE SEQUENCE \"#{sequence_name}\" MINVALUE 7 MAXVALUE 444" }
       it { is_expected.to include("MINVALUE 7") }
@@ -317,6 +312,7 @@ describe "OracleEnhancedAdapter structure dump" do
         t.string :foo
       end
     end
+
     it "should dump drop sql for just temp tables" do
       dump = @conn.temp_table_drop
       expect(dump).to match(/DROP TABLE "TEMP_TBL"/)
@@ -338,10 +334,9 @@ describe "OracleEnhancedAdapter structure dump" do
     let(:dump) { ActiveRecord::Base.connection.dump_schema_information }
 
     before do
-      ActiveRecord::SchemaMigration.reset_table_name
-      ActiveRecord::SchemaMigration.create_table
+      ActiveRecord::Base.connection.schema_migration.create_table
       versions.each do |i|
-        ActiveRecord::SchemaMigration.create!(version: i)
+        ActiveRecord::Base.connection.schema_migration.create_version(i)
       end
     end
 
@@ -381,7 +376,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     after do
-      ActiveRecord::SchemaMigration.drop_table
+      ActiveRecord::Base.connection.schema_migration.drop_table
     end
   end
 
@@ -444,6 +439,7 @@ describe "OracleEnhancedAdapter structure dump" do
         create or replace type full_drop_test_type as table of number
       SQL
     end
+
     after(:each) do
       @conn.drop_table :full_drop_test
       @conn.drop_table :full_drop_test_temp
@@ -455,6 +451,7 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.execute "DROP PROCEDURE FULL_DROP_TEST_PROCEDURE" rescue nil
       @conn.execute "DROP TYPE FULL_DROP_TEST_TYPE" rescue nil
     end
+
     it "should contain correct sql" do
       drop = @conn.full_drop
       expect(drop).to match(/DROP TABLE "FULL_DROP_TEST" CASCADE CONSTRAINTS/)