activerecord-oracle_enhanced-adapter 1.8.2 → 5.2.0.beta1

data/spec/active_record/connection_adapters/{oracle_enhanced_schema_dump_spec.rb → oracle_enhanced/schema_dumper_spec.rb}

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 describe "OracleEnhancedAdapter schema dump" do
   include SchemaSpecHelper
+  include SchemaDumpingHelper
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -68,73 +71,49 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should be able to dump default values using special characters" do
-      expect(standard_dump).to match(/t.string \"special_c\", default: "\\n"/)
+      output = dump_table_schema "test_defaults"
+      expect(output).to match(/t.string \"special_c\", default: "\\n"/)
     end
   end
-  describe "table prefixes and suffixes" do
+
+  describe "table with non-default primary key" do
     after(:each) do
       drop_test_posts_table
-      @conn.drop_table(ActiveRecord::SchemaMigration.table_name) if @conn.table_exists?(ActiveRecord::SchemaMigration.table_name)
-      @conn.drop_table(ActiveRecord::InternalMetadata.table_name) if @conn.table_exists?(ActiveRecord::InternalMetadata.table_name)
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""
-    end
-
-    it "should remove table prefix in schema dump" do
-      ActiveRecord::Base.table_name_prefix = "xxx_"
-      create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts"/m)
-    end
-
-    it "should remove table prefix with $ sign in schema dump" do
-      ActiveRecord::Base.table_name_prefix = "xxx$"
-      create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts"/m)
-    end
-
-    it "should remove table suffix in schema dump" do
-      ActiveRecord::Base.table_name_suffix = "_xxx"
-      create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts"/m)
     end
 
-    it "should remove table suffix with $ sign in schema dump" do
-      ActiveRecord::Base.table_name_suffix = "$xxx"
-      create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts"/m)
+    it "should include non-default primary key in schema dump" do
+      create_test_posts_table(primary_key: "post_id")
+      output = dump_table_schema "test_posts"
+      expect(output).to match(/create_table "test_posts", primary_key: "post_id"/)
     end
 
-    it "should not include schema_migrations table with prefix in schema dump" do
-      ActiveRecord::Base.table_name_prefix = "xxx_"
-      ActiveRecord::SchemaMigration.create_table
-      expect(standard_dump).not_to match(/schema_migrations/)
-    end
+  end
 
-    it "should not include schema_migrations table with suffix in schema dump" do
-      ActiveRecord::Base.table_name_suffix = "_xxx"
-      ActiveRecord::SchemaMigration.create_table
-      expect(standard_dump).not_to match(/schema_migrations/)
+  describe "table with ntext columns" do
+    before :each do
+      schema_define do
+        create_table "test_ntexts", force: true do |t|
+          t.ntext :ntext_column
+        end
+      end
     end
 
-  end
-
-  describe "table with non-default primary key" do
     after(:each) do
-      drop_test_posts_table
+      schema_define do
+        drop_table "test_ntexts"
+      end
     end
 
-    it "should include non-default primary key in schema dump" do
-      create_test_posts_table(primary_key: "post_id")
-      expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id"/)
+    it "should be able to dump ntext columns" do
+      output = dump_table_schema "test_ntexts"
+      expect(output).to match(/t.ntext \"ntext_column\"/)
     end
-
   end
 
   describe "table with primary key trigger" do
 
     after(:each) do
       drop_test_posts_table
-      @conn.clear_prefetch_primary_key
     end
 
     it "should include primary key trigger in schema dump" do
@@ -170,8 +149,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
     after(:all) do
       schema_define do
-        drop_table :test_comments rescue nil
-        drop_table :test_posts rescue nil
+        drop_table :test_comments, if_exists: true
+        drop_table :test_posts, if_exists: true
       end
     end
 
@@ -179,21 +158,24 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts"/)
+      output = dump_table_schema "test_comments"
+      expect(output).to match(/add_foreign_key "test_comments", "test_posts"/)
     end
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, on_delete: :cascade
       end
-      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :cascade/)
+      output = dump_table_schema "test_comments"
+      expect(output).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :cascade/)
     end
 
     it "should include foreign key with nullify dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, on_delete: :nullify
       end
-      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :nullify/)
+      output = dump_table_schema "test_comments"
+      expect(output).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :nullify/)
     end
 
     it "should not include foreign keys on ignored table names in schema dump" do
@@ -225,7 +207,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include foreign keys following all tables" do
-      # if foreign keys preceed declaration of all tables
+      # if foreign keys precede declaration of all tables
       # it can cause problems when using db:test rake tasks
       schema_define do
         add_foreign_key :test_comments, :test_posts
@@ -250,7 +232,8 @@ describe "OracleEnhancedAdapter schema dump" do
         ADD CONSTRAINT TEST_COMMENTS_BAZ_ID_FK FOREIGN KEY (baz_id) REFERENCES test_posts(baz_id)
       SQL
 
-      expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/)
+      output = dump_table_schema "test_comments"
+      expect(output).to match(/add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/)
     end
 
   end
@@ -306,7 +289,8 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include temporary options" do
       create_test_posts_table(temporary: true)
-      expect(standard_dump).to match(/create_table "test_posts", temporary: true/)
+      output = dump_table_schema "test_posts"
+      expect(output).to match(/create_table "test_posts", temporary: true/)
     end
   end
 
@@ -317,20 +301,23 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not specify default tablespace in add index" do
       create_test_posts_table
-      expect(standard_dump).to match(/t\.index \["title"\], name: "index_test_posts_on_title"$/)
+      output = dump_table_schema "test_posts"
+      expect(output).to match(/t\.index \["title"\], name: "index_test_posts_on_title"$/)
     end
 
     it "should specify non-default tablespace in add index" do
       tablespace_name = @conn.default_tablespace
       allow(@conn).to receive(:default_tablespace).and_return("dummy")
       create_test_posts_table
-      expect(standard_dump).to match(/t\.index \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/)
+      output = dump_table_schema "test_posts"
+      expect(output).to match(/t\.index \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/)
     end
 
     it "should create and dump function-based indexes" do
       create_test_posts_table
       @conn.add_index :test_posts, "NVL(created_at, updated_at)", name: "index_test_posts_cr_upd_at"
-      expect(standard_dump).to match(/t\.index \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
+      output = dump_table_schema "test_posts"
+      expect(output).to match(/t\.index \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
     end
 
   end
@@ -382,33 +369,13 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump correctly" do
-      expect(standard_dump).to match(/t\.virtual "full_name",(\s*)type: :string,(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\""/)
-      expect(standard_dump).to match(/t\.virtual "short_name",(\s*)type: :string,(\s*)limit: 300,(\s*)as:(.*)/)
-      expect(standard_dump).to match(/t\.virtual "full_name_length",(\s*)type: :integer,(\s*)precision: 38,(\s*)as:(.*)/)
-      expect(standard_dump).to match(/t\.virtual "name_ratio",(\s*)as:(.*)\"$/) # no :type
-      expect(standard_dump).to match(/t\.virtual "abbrev_name",(\s*)type: :string,(\s*)limit: 100,(\s*)as:(.*)/)
-      expect(standard_dump).to match(/t\.virtual "field_with_leading_space",(\s*)type: :string,(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '"/)
-    end
-
-    context "with column cache" do
-      before(:all) do
-        @old_cache = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns
-        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
-      end
-      after(:all) do
-        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = @old_cache
-      end
-      it "should not change column defaults after several dumps" do
-        col = TestName.columns.detect { |c| c.name == "full_name" }
-        expect(col).not_to be_nil
-        expect(col.virtual_column_data_default).not_to match(/:as/)
-
-        standard_dump
-        expect(col.virtual_column_data_default).not_to match(/:as/)
-
-        standard_dump
-        expect(col.virtual_column_data_default).not_to match(/:as/)
-      end
+      output = dump_table_schema "test_names"
+      expect(output).to match(/t\.virtual "full_name",(\s*)type: :string,(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\""/)
+      expect(output).to match(/t\.virtual "short_name",(\s*)type: :string,(\s*)limit: 300,(\s*)as:(.*)/)
+      expect(output).to match(/t\.virtual "full_name_length",(\s*)type: :integer,(\s*)precision: 38,(\s*)as:(.*)/)
+      expect(output).to match(/t\.virtual "name_ratio",(\s*)as:(.*)\"$/) # no :type
+      expect(output).to match(/t\.virtual "abbrev_name",(\s*)type: :string,(\s*)limit: 100,(\s*)as:(.*)/)
+      expect(output).to match(/t\.virtual "field_with_leading_space",(\s*)type: :string,(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '"/)
     end
 
     context "with index on virtual column" do
@@ -427,8 +394,9 @@ describe "OracleEnhancedAdapter schema dump" do
         end
       end
       it "should dump correctly" do
-        expect(standard_dump).not_to match(/t\.index .+FIRST_NAME.+$/)
-        expect(standard_dump).to     match(/t\.index .+field_with_leading_space.+$/)
+        output = dump_table_schema "test_names"
+        expect(output).not_to match(/t\.index .+FIRST_NAME.+$/)
+        expect(output).to     match(/t\.index .+field_with_leading_space.+$/)
       end
     end
   end
@@ -449,7 +417,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump float type correctly" do
-      expect(standard_dump).to match(/t\.float "hourly_rate"$/)
+      output = dump_table_schema "test_floats"
+      expect(output).to match(/t\.float "hourly_rate"$/)
     end
   end
 
@@ -469,7 +438,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump table comments" do
-      expect(standard_dump).to match(/comment: "this is a \\"table comment\\"!"/)
+      output = dump_table_schema "test_table_comments"
+      expect(output).to match(/create_table "test_table_comments", comment: "this is a \\"table comment\\"!", force: :cascade do \|t\|$/)
     end
   end
 
@@ -489,7 +459,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump column comments" do
-      expect(standard_dump).to match(/comment: "this is a \\"column comment\\"!"/)
+      output = dump_table_schema "test_column_comments"
+      expect(output).to match(/comment: "this is a \\"column comment\\"!"/)
     end
   end
 
@@ -512,7 +483,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     after do
       schema_define do
-        drop_table :test_comments rescue nil
+        drop_table :test_comments, if_exists: true
       end
 
       drop_test_posts_table

data/spec/active_record/connection_adapters/{oracle_enhanced_schema_statements_spec.rb → oracle_enhanced/schema_statements_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe "OracleEnhancedAdapter schema definition" do
   include SchemaSpecHelper
   include LoggerSpecHelper
@@ -21,7 +23,7 @@ describe "OracleEnhancedAdapter schema definition" do
     end
 
     it "creates a sequence when adding a column with create_sequence = true" do
-      _, sequence_name = ActiveRecord::Base.connection.pk_and_sequence_for_without_cache(:keyboards)
+      _, sequence_name = ActiveRecord::Base.connection.pk_and_sequence_for(:keyboards)
 
       expect(sequence_name).to eq(Keyboard.sequence_name)
     end
@@ -179,7 +181,6 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_employees, (seq_name ? { sequence_name: seq_name } : {})
       end
       Object.send(:remove_const, "TestEmployee")
-      @conn.clear_prefetch_primary_key
       ActiveRecord::Base.clear_cache!
     end
 
@@ -333,7 +334,13 @@ describe "OracleEnhancedAdapter schema definition" do
       @conn = ActiveRecord::Base.connection
     end
 
+    before(:each) do
+      @conn.clear_cache!
+      set_logger
+    end
+
     after(:each) do
+      clear_logger
       schema_define do
         drop_table :test_employees
       end
@@ -346,7 +353,6 @@ describe "OracleEnhancedAdapter schema definition" do
       table_comment = "Test Employees"
       create_test_employees_table(table_comment)
       class ::TestEmployee < ActiveRecord::Base; end
-
       expect(@conn.table_comment("test_employees")).to eq(table_comment)
     end
 
@@ -379,6 +385,28 @@ describe "OracleEnhancedAdapter schema definition" do
       end
     end
 
+    it "should query table_comment using bind variables" do
+      table_comment = "Test Employees"
+      create_test_employees_table(table_comment)
+      class ::TestEmployee < ActiveRecord::Base; end
+      expect(@conn.table_comment(TestEmployee.table_name)).to eq(table_comment)
+      expect(@logger.logged(:debug).last).to match(/:owner/)
+      expect(@logger.logged(:debug).last).to match(/:table_name/)
+      expect(@logger.logged(:debug).last).to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_EMPLOYEES"\]\]/)
+    end
+
+    it "should query column_comment using bind variables" do
+      table_comment = "Test Employees"
+      column_comment = { first_name: "Given Name" }
+      create_test_employees_table(table_comment, column_comment)
+      class ::TestEmployee < ActiveRecord::Base; end
+      expect(@conn.column_comment(TestEmployee.table_name, :first_name)).to eq(column_comment[:first_name])
+      expect(@logger.logged(:debug).last).to match(/:owner/)
+      expect(@logger.logged(:debug).last).to match(/:table_name/)
+      expect(@logger.logged(:debug).last).to match(/:column_name/)
+      expect(@logger.logged(:debug).last).to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_EMPLOYEES"\], \["column_name", "FIRST_NAME"\]\]/)
+    end
+
   end
 
   describe "drop tables" do
@@ -397,16 +425,12 @@ describe "OracleEnhancedAdapter schema definition" do
     before(:each) do
       @conn = ActiveRecord::Base.connection
       schema_define do
-        drop_table :test_employees rescue nil
-        drop_table :new_test_employees rescue nil
-        drop_table :test_employees_no_primary_key rescue nil
-
-        create_table  :test_employees do |t|
+        create_table  :test_employees, force: true do |t|
           t.string    :first_name
           t.string    :last_name
         end
 
-        create_table  :test_employees_no_pkey, id: false do |t|
+        create_table  :test_employees_no_pkey, force: true, id: false do |t|
           t.string    :first_name
           t.string    :last_name
         end
@@ -415,11 +439,12 @@ describe "OracleEnhancedAdapter schema definition" do
 
     after(:each) do
       schema_define do
-        drop_table :test_employees rescue nil
-        drop_table :new_test_employees rescue nil
-        drop_table :test_employees_no_pkey rescue nil
-        drop_table :new_test_employees_no_pkey rescue nil
-        drop_table :aaaaaaaaaaaaaaaaaaaaaaaaaaa rescue nil
+        drop_table :test_employees_no_primary_key, if_exists: true
+        drop_table :test_employees, if_exists: true
+        drop_table :new_test_employees, if_exists: true
+        drop_table :test_employees_no_pkey, if_exists: true
+        drop_table :new_test_employees_no_pkey, if_exists: true
+        drop_table :aaaaaaaaaaaaaaaaaaaaaaaaaaa, if_exists: true
       end
     end
 
@@ -610,18 +635,20 @@ end
       class ::TestComment < ActiveRecord::Base
         belongs_to :test_post
       end
+      set_logger
     end
 
     after(:each) do
       Object.send(:remove_const, "TestPost")
       Object.send(:remove_const, "TestComment")
       schema_define do
-        drop_table :test_comments rescue nil
-        drop_table :test_posts rescue nil
+        drop_table :test_comments, if_exists: true
+        drop_table :test_posts, if_exists: true
       end
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
       ActiveRecord::Base.clear_cache!
+      clear_logger
     end
 
     it "should add foreign key" do
@@ -705,6 +732,16 @@ end
       end.not_to raise_error
     end
 
+    it "should query foreign_keys using bind variables" do
+      schema_define do
+        add_foreign_key :test_comments, :test_posts
+      end
+      ActiveRecord::Base.connection.foreign_keys(:test_comments)
+      expect(@logger.logged(:debug).last).to match(/:owner/)
+      expect(@logger.logged(:debug).last).to match(/:desc_table_name/)
+      expect(@logger.logged(:debug).last).to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["desc_table_name", "TEST_COMMENTS"\]\]/)
+    end
+
   end
 
   describe "lob in table definition" do
@@ -714,34 +751,56 @@ 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
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = nil
       schema_define do
         create_table :test_posts, force: true do |t|
           t.text :test_clob
+          t.ntext :test_nclob
           t.binary :test_blob
         end
       end
       expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_CLOB'")).to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_NCLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_BLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+    end
+
+    it "should use default tablespace for nclobs" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:nclob] = DATABASE_NON_DEFAULT_TABLESPACE
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = nil
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = nil
+      schema_define do
+        create_table :test_posts, force: true do |t|
+          t.text :test_clob
+          t.ntext :test_nclob
+          t.binary :test_blob
+        end
+      end
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_NCLOB'")).to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_CLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
       expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_BLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
     end
 
     it "should use default tablespace for blobs" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = DATABASE_NON_DEFAULT_TABLESPACE
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = nil
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:nclob] = nil
       schema_define do
         create_table :test_posts, force: true do |t|
           t.text :test_clob
+          t.ntext :test_nclob
           t.binary :test_blob
         end
       end
       expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_BLOB'")).to eq(DATABASE_NON_DEFAULT_TABLESPACE)
       expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_CLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_NCLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
     end
 
     after do
       Object.send(:remove_const, "TestPost")
       schema_define do
-        drop_table :test_posts rescue nil
+        drop_table :test_posts, if_exists: true
       end
     end
   end
@@ -787,7 +846,7 @@ end
     after do
       Object.send(:remove_const, "TestPost")
       schema_define do
-        drop_table :test_posts rescue nil
+        drop_table :test_posts, if_exists: true
       end
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = nil
     end
@@ -812,8 +871,8 @@ end
       Object.send(:remove_const, "TestPost")
       Object.send(:remove_const, "TestComment")
       schema_define do
-        drop_table :test_comments rescue nil
-        drop_table :test_posts rescue nil
+        drop_table :test_comments, if_exists: true
+        drop_table :test_posts, if_exists: true
       end
       ActiveRecord::Base.clear_cache!
     end
@@ -897,9 +956,9 @@ end
 
     after(:each) do
       schema_define do
-        drop_table "test_Mixed_Comments" rescue nil
-        drop_table :test_comments rescue nil
-        drop_table :test_posts rescue nil
+        drop_table "test_Mixed_Comments", if_exists: true
+        drop_table :test_comments, if_exists: true
+        drop_table :test_posts, if_exists: true
       end
     end
 
@@ -987,14 +1046,14 @@ end
     include LoggerSpecHelper
 
     before(:all) do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:clob)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:nclob)
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:blob)
     end
 
     after(:all) do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:clob)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:nclob)
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:blob)
     end
 
@@ -1039,6 +1098,14 @@ 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
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:nclob] = DATABASE_NON_DEFAULT_TABLESPACE
+      schema_define do
+        add_column :test_posts, :body, :ntext
+      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 blob column with non_default tablespace" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = DATABASE_NON_DEFAULT_TABLESPACE
       schema_define do
@@ -1234,7 +1301,7 @@ end
     end
 
     before(:each) do
-      @conn.instance_variable_set :@would_execute_sql, @would_execute_sql = ""
+      @conn.instance_variable_set :@would_execute_sql, @would_execute_sql = "".dup
       class <<@conn
         def execute(sql, name = nil); @would_execute_sql << sql << ";\n"; end
       end
@@ -1267,7 +1334,7 @@ end
 
     describe "creating a table with a tablespace defaults set" do
       after(:each) do
-        @conn.drop_table :tablespace_tests rescue nil
+        @conn.drop_table :tablespace_tests, if_exists: true
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:table)
       end
       it "should use correct tablespace" do
@@ -1281,7 +1348,7 @@ end
 
     describe "creating an index-organized table" do
       after(:each) do
-        @conn.drop_table :tablespace_tests rescue nil
+        @conn.drop_table :tablespace_tests, if_exists: true
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:table)
       end
       it "should use correct tablespace" do