schema_plus 1.2.0 → 1.3.0

data/spec/migration_spec.rb

@@ -150,7 +150,7 @@ describe ActiveRecord::Migration do
 
     it "should create an index if specified on column" do
       recreate_table(@model) do |t|
-        t.integer :state, :index => true 
+        t.integer :state, :index => true
       end
       @model.should have_index.on(:state)
     end
@@ -203,7 +203,7 @@ describe ActiveRecord::Migration do
       end
       @model.should have_index.on([:state, :city])
     end
-    
+
     it "should auto-index foreign keys only" do
       recreate_table(@model) do |t|
         t.integer :user_id
@@ -234,7 +234,7 @@ describe ActiveRecord::Migration do
     end
 
     it "should override foreign key auto_index positively" do
-      with_fk_config(:auto_index => false) do 
+      with_fk_config(:auto_index => false) do
         recreate_table @model, :foreign_keys => {:auto_index => true} do |t|
           t.integer :user_id
         end
@@ -365,7 +365,7 @@ describe ActiveRecord::Migration do
 
     unless SchemaPlusHelpers.mysql?
       it "should override foreign key auto_index negatively" do
-        with_fk_config(:auto_index => true) do 
+        with_fk_config(:auto_index => true) do
           recreate_table @model, :foreign_keys => {:auto_index => false} do |t|
             t.integer :user_id
           end
@@ -386,6 +386,66 @@ describe ActiveRecord::Migration do
 
   end
 
+  context "when table is changed" do
+    before(:each) do
+      @model = Post
+    end
+    [false, true].each do |bulk|
+      suffix = bulk ? ' with :bulk option' : ""
+
+      it "should create an index if specified on column"+suffix do
+        change_table(@model, :bulk => bulk) do |t|
+          t.integer :state, :index => true
+        end
+        @model.should have_index.on(:state)
+      end
+
+      unless SchemaPlusHelpers.sqlite3?
+
+        it "should create a foreign key constraint"+suffix do
+          change_table(@model, :bulk => bulk) do |t|
+            t.integer :user_id
+          end
+          @model.should reference(:users, :id).on(:user_id)
+        end
+
+        context "migrate down" do
+          it "should remove a foreign key constraint"+suffix do
+            Comment.reset_column_information
+            Comment.should reference(:users, :id).on(:user_id)
+            migration = Class.new ::ActiveRecord::Migration do
+              define_method(:change) {
+                change_table("comments", :bulk => bulk) do |t|
+                  t.integer :user_id
+                end
+              }
+            end
+            ActiveRecord::Migration.suppress_messages do
+              migration.migrate(:down)
+            end
+            Comment.reset_column_information
+            Comment.should_not reference(:users, :id).on(:user_id)
+          end
+        end if ActiveRecord::VERSION::MAJOR >= 4
+
+        it "should create a foreign key constraint using :references"+suffix do
+          change_table(@model, :bulk => bulk) do |t|
+            t.references :user
+          end
+          @model.should reference(:users, :id).on(:user_id)
+        end
+
+        it "should create a foreign key constraint using :belongs_to"+suffix do
+          change_table(@model, :bulk => bulk) do |t|
+            t.belongs_to :user
+          end
+          @model.should reference(:users, :id).on(:user_id)
+        end
+      end
+    end
+  end
+
+
   unless SchemaPlusHelpers.sqlite3?
 
     context "when column is added" do
@@ -419,8 +479,8 @@ describe ActiveRecord::Migration do
       end
 
       it "should create foreign key to explicitly given table and column name" do
-        add_column(:author_login, :string, :foreign_key => { :references => [:users, :login]}) do 
-          @model.should reference(:users, :login).on(:author_login) 
+        add_column(:author_login, :string, :foreign_key => { :references => [:users, :login]}) do
+          @model.should reference(:users, :login).on(:author_login)
         end
       end
 
@@ -504,7 +564,7 @@ describe ActiveRecord::Migration do
       it "should use default on_update action" do
         SchemaPlus.config.foreign_keys.on_update = :cascade
         add_column(:post_id, :integer) do
-          @model.should reference.on(:post_id).on_update(:cascade) 
+          @model.should reference.on(:post_id).on_update(:cascade)
         end
         SchemaPlus.config.foreign_keys.on_update = nil
       end
@@ -512,7 +572,7 @@ describe ActiveRecord::Migration do
       it "should use default on_delete action" do
         SchemaPlus.config.foreign_keys.on_delete = :cascade
         add_column(:post_id, :integer) do
-          @model.should reference.on(:post_id).on_delete(:cascade) 
+          @model.should reference.on(:post_id).on_delete(:cascade)
         end
         SchemaPlus.config.foreign_keys.on_delete = nil
       end
@@ -643,7 +703,7 @@ describe ActiveRecord::Migration do
         remove_column(:post_id)
         @model.should_not have_index.on(:post_id)
       end
-      
+
       protected
       def remove_column(column_name)
         table = @model.table_name
@@ -728,7 +788,7 @@ describe ActiveRecord::Migration do
     end
 
   end
-    
+
   def recreate_table(model, opts={}, &block)
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Migration.create_table model.table_name, opts.merge(:force => true), &block
@@ -736,7 +796,12 @@ describe ActiveRecord::Migration do
     model.reset_column_information
   end
 
-
+  def change_table(model, opts={}, &block)
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.change_table model.table_name, opts, &block
+    end
+    model.reset_column_information
+  end
 
 end
 

data/spec/schema_dumper_spec.rb

@@ -9,7 +9,7 @@ describe "Schema dump" do
     end
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table end
+        connection.tables.each do |table| drop_table table, :cascade => true end
 
         create_table :users, :force => true do |t|
           t.string :login
@@ -91,7 +91,7 @@ describe "Schema dump" do
     if SchemaPlusHelpers.postgresql?
       it "should dump the default hash expr as now()" do
         with_additional_column Post, :posted_at, :datetime, :default => :now do
-          dump_posts.should match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"now\(\)"\s*\}})
+          dump_posts.should match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
         end
       end
 
@@ -103,7 +103,7 @@ describe "Schema dump" do
 
       it "can dump a complex default expression" do
         with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
-          dump_posts.should match(%r{t\.string\s+"name",\s*(?:default:|:default =>)\s*{\s*(?:expr:|:expr =>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
+          dump_posts.should match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
         end
       end
     end
@@ -164,8 +164,8 @@ describe "Schema dump" do
   unless SchemaPlusHelpers.mysql?
 
     it "should include index order" do
-      with_index Post, [:user_id, :first_comment_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
-        dump_posts.should match(%r{t.index \["user_id", "first_comment_id"\],.*:order => {"user_id" => :asc, "first_comment_id" => :desc}})
+      with_index Post, [:user_id, :first_comment_id, :short_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
+        dump_posts.should match(%r{t.index \["user_id", "first_comment_id", "short_id"\],.*:order => {"user_id" => :asc, "first_comment_id" => :desc, "short_id" => :asc}})
       end
     end
 
@@ -179,6 +179,13 @@ describe "Schema dump" do
       end
     end
 
+    it "should define index with type cast" do
+      with_index Post, [:integer_col], :name => "index_with_type_cast", :expression => "LOWER(integer_col::text)" do
+        dump_posts.should match(to_regexp(%q{t.index :name => "index_with_type_cast", :expression => "lower((integer_col)::text)"}))
+      end
+    end
+
+
     it "should define case insensitive index with mixed ids and strings" do
       with_index Post, [:user_id, :str_short, :short_id, :body], :case_sensitive => false do
         dump_posts.should match(to_regexp(%q{t.index ["user_id", "str_short", "short_id", "body"], :name => "index_posts_on_user_id_and_str_short_and_short_id_and_body", :case_sensitive => false}))
@@ -219,6 +226,13 @@ describe "Schema dump" do
       end
     end
 
+    it "should not include index order for non-ordered index types" do
+      with_index Post, :user_id, :kind => :hash do
+        dump_posts.should match(to_regexp(%q{t.index ["user_id"], :name => "index_posts_on_user_id", :kind => "hash"}))
+        dump_posts.should_not match(%r{:order})
+      end
+    end
+
   end
 
   unless SchemaPlusHelpers.sqlite3?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - lib/schema_plus/active_record/connection_adapters/table_definition.rb
 - lib/schema_plus/active_record/db_default.rb
 - lib/schema_plus/active_record/foreign_keys.rb
+- lib/schema_plus/active_record/migration/command_recorder.rb
 - lib/schema_plus/active_record/schema.rb
 - lib/schema_plus/active_record/schema_dumper.rb
 - lib/schema_plus/railtie.rb