activerecord-oracle_enhanced-adapter 1.7.11 → 1.8.2

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter schema dump" do
   include SchemaSpecHelper
 
@@ -12,7 +10,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
   def standard_dump(options = {})
     stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = options[:ignore_tables]||[]
+    ActiveRecord::SchemaDumper.ignore_tables = options[:ignore_tables] || []
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
     stream.string
   end
@@ -76,45 +74,45 @@ describe "OracleEnhancedAdapter schema dump" do
   describe "table prefixes and suffixes" do
     after(:each) do
       drop_test_posts_table
-      @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+      @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 = ''
+      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_'
+      ActiveRecord::Base.table_name_prefix = "xxx_"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      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$'
+      ActiveRecord::Base.table_name_prefix = "xxx$"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      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'
+      ActiveRecord::Base.table_name_suffix = "_xxx"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      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'
+      ActiveRecord::Base.table_name_suffix = "$xxx"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      expect(standard_dump).to match(/create_table "test_posts"/m)
     end
 
     it "should not include schema_migrations table with prefix in schema dump" do
-      ActiveRecord::Base.table_name_prefix = 'xxx_'
-      @conn.initialize_schema_migrations_table
+      ActiveRecord::Base.table_name_prefix = "xxx_"
+      ActiveRecord::SchemaMigration.create_table
       expect(standard_dump).not_to match(/schema_migrations/)
     end
 
     it "should not include schema_migrations table with suffix in schema dump" do
-      ActiveRecord::Base.table_name_suffix = '_xxx'
-      @conn.initialize_schema_migrations_table
+      ActiveRecord::Base.table_name_suffix = "_xxx"
+      ActiveRecord::SchemaMigration.create_table
       expect(standard_dump).not_to match(/schema_migrations/)
     end
 
@@ -126,7 +124,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include non-default primary key in schema dump" do
-      create_test_posts_table(primary_key: 'post_id')
+      create_test_posts_table(primary_key: "post_id")
       expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id"/)
     end
 
@@ -145,7 +143,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include primary key trigger with non-default primary key in schema dump" do
-      create_test_posts_table(primary_key_trigger: true, primary_key: 'post_id')
+      create_test_posts_table(primary_key_trigger: true, primary_key: "post_id")
       expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m)
     end
 
@@ -167,7 +165,7 @@ describe "OracleEnhancedAdapter schema dump" do
     after(:each) do
       schema_define do
         remove_foreign_key :test_comments, :test_posts rescue nil
-        remove_foreign_key :test_comments, name: 'comments_posts_baz_fooz_fk' rescue nil
+        remove_foreign_key :test_comments, name: "comments_posts_baz_fooz_fk" rescue nil
       end
     end
     after(:all) do
@@ -186,14 +184,14 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, dependent: :delete
+        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/)
     end
 
     it "should include foreign key with nullify dependency in schema dump" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, dependent: :nullify
+        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/)
     end
@@ -238,7 +236,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include primary_key when reference column name is not 'id'" do
       schema_define do
-        create_table :test_posts, force: true, :primary_key => 'baz_id' do |t|
+        create_table :test_posts, force: true, primary_key: "baz_id" do |t|
           t.string :title
         end
         create_table :test_comments, force: true do |t|
@@ -319,20 +317,20 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not specify default tablespace in add index" do
       create_test_posts_table
-      expect(standard_dump).to match(/add_index "test_posts", \["title"\], name: "index_test_posts_on_title"$/)
+      expect(standard_dump).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')
+      allow(@conn).to receive(:default_tablespace).and_return("dummy")
       create_test_posts_table
-      expect(standard_dump).to match(/add_index "test_posts", \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/)
+      expect(standard_dump).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(/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"$/)
     end
 
   end
@@ -350,19 +348,19 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
-  describe 'virtual columns' do
+  describe "virtual columns" do
     before(:all) do
       skip "Not supported in this database version" unless @oracle11g_or_higher
       schema_define do
-        create_table :test_names, :force => true do |t|
+        create_table :test_names, force: true do |t|
           t.string :first_name
           t.string :last_name
-          t.virtual :full_name,       :as => "first_name || ', ' || last_name"
-          t.virtual :short_name,      :as => "COALESCE(first_name, last_name)", :type => :string, :limit => 300
-          t.virtual :abbrev_name,     :as => "SUBSTR(first_name,1,50) || ' ' || SUBSTR(last_name,1,1) || '.'", :type => "VARCHAR(100)"
-          t.virtual :name_ratio,      :as => '(LENGTH(first_name)*10/LENGTH(last_name)*10)'
-          t.column :full_name_length, :virtual, :as => "length(first_name || ', ' || last_name)", :type => :integer
-          t.virtual :field_with_leading_space, :as => "' ' || first_name || ' '", :limit => 300, :type => :string
+          t.virtual :full_name,       as: "first_name || ', ' || last_name"
+          t.virtual :short_name,      as: "COALESCE(first_name, last_name)", type: :string, limit: 300
+          t.virtual :abbrev_name,     as: "SUBSTR(first_name,1,50) || ' ' || SUBSTR(last_name,1,1) || '.'", type: "VARCHAR(100)"
+          t.virtual :name_ratio,      as: "(LENGTH(first_name)*10/LENGTH(last_name)*10)"
+          t.column :full_name_length, :virtual, as: "length(first_name || ', ' || last_name)", type: :integer
+          t.virtual :field_with_leading_space, as: "' ' || first_name || ' '", limit: 300, type: :string
         end
       end
     end
@@ -383,16 +381,16 @@ describe "OracleEnhancedAdapter schema dump" do
       end
     end
 
-    it 'should dump correctly' do
-      expect(standard_dump).to match(/t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/)
-      expect(standard_dump).to match(/t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/)
-      expect(standard_dump).to match(/t\.virtual "full_name_length",(\s*)precision: 38,(\s*)as:(.*),(\s*)type: :integer/)
+    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*)limit: 100,(\s*)as:(.*),(\s*)type: :string/)
-      expect(standard_dump).to match(/t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/)
+      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
+    context "with column cache" do
       before(:all) do
         @old_cache = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
@@ -400,8 +398,8 @@ describe "OracleEnhancedAdapter schema dump" do
       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'}
+      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/)
 
@@ -417,20 +415,20 @@ describe "OracleEnhancedAdapter schema dump" do
       before(:all) do
         if @oracle11g_or_higher
           schema_define do
-            add_index 'test_names', 'field_with_leading_space', :name => "index_on_virtual_col"
+            add_index "test_names", "field_with_leading_space", name: "index_on_virtual_col"
           end
         end
       end
       after(:all) do
         if @oracle11g_or_higher
           schema_define do
-            remove_index 'test_names', :name => 'index_on_virtual_col'
+            remove_index "test_names", name: "index_on_virtual_col"
           end
         end
       end
-      it 'should dump correctly' do
-        expect(standard_dump).not_to match(/add_index "test_names".+FIRST_NAME.+$/)
-        expect(standard_dump).to     match(/add_index "test_names".+field_with_leading_space.+$/)
+      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.+$/)
       end
     end
   end
@@ -458,7 +456,7 @@ describe "OracleEnhancedAdapter schema dump" do
   describe "table comments" do
     before(:each) do
       schema_define do
-        create_table :test_table_comments, :comment => "this is a \"table comment\"!", force: true do |t|
+        create_table :test_table_comments, comment: "this is a \"table comment\"!", force: true do |t|
           t.string :blah
         end
       end
@@ -471,7 +469,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump table comments" do
-      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+      expect(standard_dump).to match(/comment: "this is a \\"table comment\\"!"/)
     end
   end
 
@@ -479,7 +477,7 @@ describe "OracleEnhancedAdapter schema dump" do
     before(:each) do
       schema_define do
         create_table :test_column_comments, force: true do |t|
-          t.string :blah, :comment => "this is a \"column comment\"!"
+          t.string :blah, comment: "this is a \"column comment\"!"
         end
       end
     end
@@ -491,47 +489,33 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump column comments" do
-      standard_dump.should =~ /comment: "this is a \\"column comment\\"!"/
+      expect(standard_dump).to match(/comment: "this is a \\"column comment\\"!"/)
     end
   end
 
-  describe "table comments" do
-    before(:each) do
+  describe "schema.rb format" do
+    before do
+      create_test_posts_table
+
       schema_define do
-        create_table :test_table_comments, :comment => "this is a \"table comment\"!", force: true do |t|
-          t.string :blah
+        create_table :test_comments, force: true do |t|
+          t.string :title
         end
-      end
-    end
 
-    after(:each) do
-      schema_define do
-        drop_table :test_table_comments
+        add_index :test_comments, :title
       end
     end
 
-    it "should dump table comments" do
-      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+    it "should be only one blank line between create_table methods in schema dump" do
+      expect(standard_dump).to match(/end\n\n  create_table/)
     end
-  end
 
-  describe "column comments" do
-    before(:each) do
-      schema_define do
-        create_table :test_column_comments, force: true do |t|
-          t.string :blah, :comment => "this is a \"column comment\"!"
-        end
-      end
-    end
-
-    after(:each) do
+    after do
       schema_define do
-        drop_table :test_column_comments
+        drop_table :test_comments rescue nil
       end
-    end
 
-    it "should dump column comments" do
-      standard_dump.should =~ /comment: "this is a \\"column comment\\"!"/
+      drop_test_posts_table
     end
   end
 end