schema_plus 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f36351daeeb9863e7b0344d565b2f67125ed9cea
-  data.tar.gz: cb88da4066f4db2f2dfb35f018cc38d82cf6aebc
+  metadata.gz: 65c72cd47992bb6bf783d19b59e5d518e9256acc
+  data.tar.gz: fc0f8382dfb38c00719a1e86286390de3b7726a7
 SHA512:
-  metadata.gz: f7f2ab813dcf8bd3c02c780337fefc2ae2c5cd793dee59b1cecc76d1706749918bf534685d3d53b7c31bce4989b56e906d292ff1c254f26e9f80d56ac450aca3
-  data.tar.gz: 79c000eaa5312482df33ec2d09638d93038ba213320172eb6a029a077efbb41164996cc344a8f3325b06d4cb7702a9aaa3153eeba8f65acf9a9e33e2bc80a651
+  metadata.gz: cdedc86c2659b80c404e189f178848426e60aea035fec8e3dc144fe48212dff4ce8139a24b34103f01c57a72a8099f5c9901d105cab5ffcb800d38983b1d1914
+  data.tar.gz: 251070435963c3a912f0f097020f707adae3aae4861316f33a245448ba32fd1fef90e908816ee239c70f9e92309f891ada6c12fc9111bb4bf83484db7ca5d760

data/README.md

@@ -300,6 +300,10 @@ of foreign key constraints, you can re-enable it:
 
 * (nothing new yet)
 
+### 1.3.1
+
+* Regression bug fix, non-option arguemnts to remove_index
+
 ### 1.3.0
 
 * Added :if_exists option for remove_index

data/lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb

@@ -131,10 +131,12 @@ module SchemaPlus
 
         # Extends rails' remove_index to include this options:
         #   :if_exists
-        def remove_index_with_schema_plus(table_name, options={})
-          return if options.delete(:if_exists) and not index_name_exists?(table_name, options[:name] || index_name(table_name, options), false)
+        def remove_index_with_schema_plus(table_name, *args)
+          options = args.extract_options!
+          return if options.delete(:if_exists) and not index_name_exists?(table_name, options[:name] || index_name(table_name, *args), false)
           options.delete(:column) if options[:name] and ::ActiveRecord::VERSION::MAJOR < 4
-          remove_index_without_schema_plus(table_name, options)
+          args << options if options.any?
+          remove_index_without_schema_plus(table_name, *args)
         end
 
         # called from individual adpaters, after renaming table from old

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/index_spec.rb

@@ -1,126 +1,201 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "add_index" do
+describe "index" do
 
-  before(:all) do
-    define_schema(:auto_create => false) do
-      create_table :users, :force => true do |t|
-        t.string :login
-        t.datetime :deleted_at
+  let(:migration) { ::ActiveRecord::Migration }
+  let(:connection) { ::ActiveRecord::Base.connection }
+
+  describe "add_index" do
+
+    before(:each) do
+      connection.tables.each do |table| connection.drop_table table, cascade: true end
+
+      define_schema(:auto_create => false) do
+        create_table :users, :force => true do |t|
+          t.string :login
+          t.datetime :deleted_at
+        end
+
+        create_table :posts, :force => true do |t|
+          t.text :body
+          t.integer :user_id
+          t.integer :author_id
+        end
+
+        create_table :comments, :force => true do |t|
+          t.text :body
+          t.integer :post_id
+          t.foreign_key :post_id, :posts, :id
+        end
       end
+      class User < ::ActiveRecord::Base ; end
+      class Post < ::ActiveRecord::Base ; end
+      class Comment < ::ActiveRecord::Base ; end
+    end
 
-      create_table :posts, :force => true do |t|
-        t.text :body
-        t.integer :user_id
-        t.integer :author_id
-      end
 
-      create_table :comments, :force => true do |t|
-        t.text :body
-        t.integer :post_id
-        t.foreign_key :post_id, :posts, :id
+    after(:each) do
+      migration.suppress_messages do
+        migration.remove_index(:users, :name => @index.name) if @index
       end
     end
-    class User < ::ActiveRecord::Base ; end
-    class Post < ::ActiveRecord::Base ; end
-    class Comment < ::ActiveRecord::Base ; end
-  end
 
-  let(:migration) { ::ActiveRecord::Migration }
-
-  after(:each) do
-    migration.suppress_messages do
-      migration.remove_index(:users, :name => @index.name) if @index
+    it "should create index when called without additional options" do
+      add_index(:users, :login)
+      index_for(:login).should_not be_nil
     end
-  end
 
-  it "should create index when called without additional options" do
-    add_index(:users, :login)
-    index_for(:login).should_not be_nil
-  end
+    it "should create unique index" do
+      add_index(:users, :login, :unique => true)
+      index_for(:login).unique.should == true
+    end
 
-  it "should create unique index" do
-    add_index(:users, :login, :unique => true)
-    index_for(:login).unique.should == true
-  end
+    it "should assign given name" do
+      add_index(:users, :login, :name => 'users_login_index')
+      index_for(:login).name.should == 'users_login_index'
+    end
 
-  it "should assign given name" do
-    add_index(:users, :login, :name => 'users_login_index')
-    index_for(:login).name.should == 'users_login_index'
-  end
+    unless SchemaPlusHelpers.mysql?
+      it "should assign order" do
+        add_index(:users, [:login, :deleted_at], :order => {:login => :desc, :deleted_at => :asc})
+        index_for([:login, :deleted_at]).orders.should == {"login" => :desc, "deleted_at" => :asc}
+      end
+    end
 
-  unless SchemaPlusHelpers.mysql?
-    it "should assign order" do
-      add_index(:users, [:login, :deleted_at], :order => {:login => :desc, :deleted_at => :asc})
-      index_for([:login, :deleted_at]).orders.should == {"login" => :desc, "deleted_at" => :asc}
+    context "for duplicate index" do
+      it "should not complain if the index is the same" do
+        add_index(:users, :login)
+        index_for(:login).should_not be_nil
+        ActiveRecord::Base.logger.should_receive(:warn).with(/login.*Skipping/)
+        expect { add_index(:users, :login) }.to_not raise_error
+        index_for(:login).should_not be_nil
+      end
+      it "should complain if the index is different" do
+        add_index(:users, :login, :unique => true)
+        index_for(:login).should_not be_nil
+        expect { add_index(:users, :login) }.to raise_error
+        index_for(:login).should_not be_nil
+      end
     end
-  end
 
+    if SchemaPlusHelpers.postgresql?
 
-  context "for duplicate index" do
-    it "should not complain if the index is the same" do
-      add_index(:users, :login)
-      index_for(:login).should_not be_nil
-      ActiveRecord::Base.logger.should_receive(:warn).with(/login.*Skipping/)
-      expect { add_index(:users, :login) }.to_not raise_error
-      index_for(:login).should_not be_nil
-    end
-    it "should complain if the index is different" do
-      add_index(:users, :login, :unique => true)
-      index_for(:login).should_not be_nil
-      expect { add_index(:users, :login) }.to raise_error
-      index_for(:login).should_not be_nil
+      it "should assign conditions" do
+        add_index(:users, :login, :conditions => 'deleted_at IS NULL')
+        index_for(:login).conditions.should == '(deleted_at IS NULL)'
+      end
+
+      it "should assign expression, conditions and kind" do
+        add_index(:users, :expression => "USING hash (upper(login)) WHERE deleted_at IS NULL", :name => 'users_login_index')
+        @index = User.indexes.detect { |i| i.expression.present? }
+        @index.expression.should == "upper((login)::text)"
+        @index.conditions.should == "(deleted_at IS NULL)"
+        @index.kind.should       == "hash"
+      end
+
+      it "should allow to specify expression, conditions and kind separately" do
+        add_index(:users, :kind => "hash", :expression => "upper(login)", :conditions => "deleted_at IS NULL", :name => 'users_login_index')
+        @index = User.indexes.detect { |i| i.expression.present? }
+        @index.expression.should == "upper((login)::text)"
+        @index.conditions.should == "(deleted_at IS NULL)"
+        @index.kind.should       == "hash"
+      end
+
+      it "should allow to specify kind" do
+        add_index(:users, :login, :kind => "hash")
+        index_for(:login).kind.should == 'hash'
+      end
+
+      it "should allow to specify actual expression only" do
+        add_index(:users, :expression => "upper(login)", :name => 'users_login_index')
+        @index = User.indexes.detect { |i| i.name == 'users_login_index' }
+        @index.expression.should == "upper((login)::text)"
+      end
+
+      it "should raise if no column given and expression is missing" do
+        expect { add_index(:users, :name => 'users_login_index') }.to raise_error(ArgumentError, /expression/)
+      end
+
+      it "should raise if expression without name is given" do
+        expect { add_index(:users, :expression => "USING btree (login)") }.to raise_error(ArgumentError, /name/)
+      end
+
+      it "should raise if expression is given and case_sensitive is false" do
+        expect { add_index(:users, :name => 'users_login_index', :expression => "USING btree (login)", :case_sensitive => false) }.to raise_error(ArgumentError, /use LOWER/i)
+      end
+
+
+    end # of postgresql specific examples
+
+    protected
+
+    def index_for(column_names)
+      @index = User.indexes.detect { |i| i.columns == Array(column_names).collect(&:to_s) }
     end
+
   end
 
-  if SchemaPlusHelpers.postgresql?
+  describe "remove_index" do
 
-    it "should assign conditions" do
-      add_index(:users, :login, :conditions => 'deleted_at IS NULL')
-      index_for(:login).conditions.should == '(deleted_at IS NULL)'
+    before(:each) do
+      connection.tables.each do |table| connection.drop_table table, cascade: true end
+      define_schema(:auto_create => false) do
+        create_table :users, :force => true do |t|
+          t.string :login
+          t.datetime :deleted_at
+        end
+      end
+      class User < ::ActiveRecord::Base ; end
     end
 
-    it "should assign expression, conditions and kind" do
-      add_index(:users, :expression => "USING hash (upper(login)) WHERE deleted_at IS NULL", :name => 'users_login_index')
-      @index = User.indexes.detect { |i| i.expression.present? }
-      @index.expression.should == "upper((login)::text)"
-      @index.conditions.should == "(deleted_at IS NULL)"
-      @index.kind.should       == "hash"
-    end
 
-    it "should allow to specify expression, conditions and kind separately" do
-      add_index(:users, :kind => "hash", :expression => "upper(login)", :conditions => "deleted_at IS NULL", :name => 'users_login_index')
-      @index = User.indexes.detect { |i| i.expression.present? }
-      @index.expression.should == "upper((login)::text)"
-      @index.conditions.should == "(deleted_at IS NULL)"
-      @index.kind.should       == "hash"
+    it "removes index by column name (symbols)" do
+      add_index :users, :login
+      User.indexes.length.should == 1
+      remove_index :users, :login
+      User.indexes.length.should == 0
     end
 
-    it "should allow to specify kind" do
-      add_index(:users, :login, :kind => "hash")
-      index_for(:login).kind.should == 'hash'
+    it "removes index by column name (symbols)" do
+      add_index :users, :login
+      User.indexes.length.should == 1
+      remove_index 'users', 'login'
+      User.indexes.length.should == 0
     end
 
-    it "should allow to specify actual expression only" do
-      add_index(:users, :expression => "upper(login)", :name => 'users_login_index')
-      @index = User.indexes.detect { |i| i.name == 'users_login_index' }
-      @index.expression.should == "upper((login)::text)"
+    it "removes multi-column index by column names (symbols)" do
+      add_index :users, [:login, :deleted_at]
+      User.indexes.length.should == 1
+      remove_index :users, [:login, :deleted_at]
+      User.indexes.length.should == 0
     end
 
-    it "should raise if no column given and expression is missing" do
-      expect { add_index(:users, :name => 'users_login_index') }.to raise_error(ArgumentError, /expression/)
+    it "removes multi-column index by column names (strings)" do
+      add_index 'users', [:login, :deleted_at]
+      User.indexes.length.should == 1
+      remove_index 'users', ['login', 'deleted_at']
+      User.indexes.length.should == 0
     end
 
-    it "should raise if expression without name is given" do
-      expect { add_index(:users, :expression => "USING btree (login)") }.to raise_error(ArgumentError, /name/)
+    it "removes index if_exists" do
+      add_index :users, :login
+      User.indexes.length.should == 1
+      remove_index :users, :login, :if_exists => true
+      User.indexes.length.should == 0
     end
 
-    it "should raise if expression is given and case_sensitive is false" do
-      expect { add_index(:users, :name => 'users_login_index', :expression => "USING btree (login)", :case_sensitive => false) }.to raise_error(ArgumentError, /use LOWER/i)
+    it "raises exception if doesn't exist" do
+      expect {
+        remove_index :users, :login
+      }.to raise_error
     end
 
-
-  end # of postgresql specific examples
+    it "doesn't raise exception with :if_exists" do
+      expect {
+        remove_index :users, :login, :if_exists => true
+      }.to_not raise_error
+    end
+  end
 
   protected
   def add_index(*args)
@@ -130,9 +205,11 @@ describe "add_index" do
     User.reset_column_information
   end
 
-  def index_for(column_names)
-    @index = User.indexes.detect { |i| i.columns == Array(column_names).collect(&:to_s) }
+  def remove_index(*args)
+    migration.suppress_messages do
+      migration.remove_index(*args)
+    end
+    User.reset_column_information
   end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails