schema_plus 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c72cd47992bb6bf783d19b59e5d518e9256acc
-  data.tar.gz: fc0f8382dfb38c00719a1e86286390de3b7726a7
+  metadata.gz: 72d678562e79aad7720350482d28f4a9f5c49130
+  data.tar.gz: 5d64c187a751e8a22c1b00af12c8e93e2e426318
 SHA512:
-  metadata.gz: cdedc86c2659b80c404e189f178848426e60aea035fec8e3dc144fe48212dff4ce8139a24b34103f01c57a72a8099f5c9901d105cab5ffcb800d38983b1d1914
-  data.tar.gz: 251070435963c3a912f0f097020f707adae3aae4861316f33a245448ba32fd1fef90e908816ee239c70f9e92309f891ada6c12fc9111bb4bf83484db7ca5d760
+  metadata.gz: c30849dd3016aa030dbd39aaceaa6358931908492159aca58703f3a2d7d57821ce17365f137dae123fb44a574beb86f08f06d40a819ae538764186fedede689c
+  data.tar.gz: 1c654a69c17dd13a6d898b5b308c865d4487f1df33e95fc1672e011a0ad9e756cf6df8252eec5dbd7034d2b1d72f3e75a0115b6b0796d89f22cebd99e60bdb38

data/README.md

@@ -43,7 +43,7 @@ or in a Gemfile
 
 ## Features
 
-Here some examples that show off the high points.  For full details see the
+This README lists the major features, with examples of use.  For full details see the
 [RDoc documentation](http://rubydoc.info/gems/schema_plus).
 
 ### Indexes
@@ -103,14 +103,14 @@ expressions, index methods, and case-insensitive indexes:
     t.string :last_name,  index: { kind: 'hash' }
     t.string :last_name,  index: { case_sensitive: false }        # shorthand for expression: 'lower(last_name)'
 
-These features are available also in ActiveRecord::Migration.add_index.  See
-doc at SchemaPlus::ActiveRecord::ConnectionAdapters::PostgresqlAdapter and
-SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition
+These features are available also in `ActiveRecord::Migration.add_index`.  See
+doc for [SchemaPlus::ActiveRecord::ConnectionAdapters::PostgresqlAdapter](http://rubydoc.info/gems/schema_plus/SchemaPlus/ActiveRecord/ConnectionAdapters/PostgresqlAdapter) and
+[SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition](http://rubydoc.info/gems/schema_plus/SchemaPlus/ActiveRecord/ConnectionAdapters/IndexDefinition)
 
 When you query column information using ActiveRecord::Base#columns, SchemaPlus
 analogously provides index information relevant to each column: which indexes
-reference the column, whether the column must be unique, etc.  See doc at
-SchemaPlus::ActiveRecord::ConnectionAdapters::Column
+reference the column, whether the column must be unique, etc.  See doc for
+[SchemaPlus::ActiveRecord::ConnectionAdapters::Column](http://rubydoc.info/gems/schema_plus/SchemaPlus/ActiveRecord/ConnectionAdapters/Column).
 
 SchemaPlus also tidies some index-related behavior:
 
@@ -175,8 +175,8 @@ The foreign key behavior can be configured globally (see Config) or per-table
 To examine your foreign key constraints, `connection.foreign_keys` returns a
 list of foreign key constraints defined for a given table, and
 `connection.reverse_foreign_keys` returns a list of foreign key constraints
-that reference a given table.  See
-SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.
+that reference a given table.  See doc at
+[SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition](http://rubydoc.info/gems/schema_plus/SchemaPlus/ActiveRecord/ConnectionAdapters/ForeignKeyDefinition).
 
 #### Foreign Key Issues
 
@@ -298,7 +298,12 @@ of foreign key constraints, you can re-enable it:
 
 ### Master branch (to be released)
 
-* (nothing new yet)
+* *nothing currently waiting to be released*
+
+### 1.3.2
+
+* Bug fix, remove_index with if_exists but no name
+* Sort indexes alphabetically when dumping, like rails does
 
 ### 1.3.1
 

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

@@ -26,10 +26,11 @@ module SchemaPlus
                     when /^MySQL/i                 then 'MysqlAdapter'
                     when 'PostgreSQL', 'PostGIS'   then 'PostgresqlAdapter'
                     when 'SQLite'                  then 'Sqlite3Adapter'
-                    end or raise "SchemaPlus: Unsupported adapter name #{adapter_name.inspect}"
-                      # use 'end or raise' instead of 'else raise' to get
-                      # 100% C0 code coverage despite having no test case
-                      # for this.
+                    end
+          unless adapter
+            ::ActiveRecord::Base.logger.warn "SchemaPlus: Unsupported adapter name #{adapter_name.inspect}.  Leaving it alone."
+            return
+          end
           adapter_module = SchemaPlus::ActiveRecord::ConnectionAdapters.const_get(adapter)
           self.class.send(:include, adapter_module) unless self.class.include?(adapter_module)
 
@@ -133,9 +134,10 @@ module SchemaPlus
         #   :if_exists
         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)
+          if_exists = options.delete(:if_exists)
           options.delete(:column) if options[:name] and ::ActiveRecord::VERSION::MAJOR < 4
           args << options if options.any?
+          return if if_exists and not index_name_exists?(table_name, options[:name] || index_name(table_name, *args), false)
           remove_index_without_schema_plus(table_name, *args)
         end
 

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -133,7 +133,7 @@ module SchemaPlus
             dump << ", :expression => #{index.expression.inspect}"
           end
           dump << "\n"
-        }.join
+        }.sort.join
       end
 
       def dump_foreign_keys(foreign_keys, opts={}) #:nodoc:

data/lib/schema_plus/version.rb

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

data/spec/index_spec.rb

@@ -177,6 +177,13 @@ describe "index" do
       User.indexes.length.should == 0
     end
 
+    it "removes index using column option" do
+      add_index :users, :login
+      User.indexes.length.should == 1
+      remove_index :users, column: :login
+      User.indexes.length.should == 0
+    end
+
     it "removes index if_exists" do
       add_index :users, :login
       User.indexes.length.should == 1
@@ -184,6 +191,20 @@ describe "index" do
       User.indexes.length.should == 0
     end
 
+    it "removes multi-column index if exists" do
+      add_index :users, [:login, :deleted_at]
+      User.indexes.length.should == 1
+      remove_index :users, [:login, :deleted_at], :if_exists => true
+      User.indexes.length.should == 0
+    end
+
+    it "removes index if_exists using column option" do
+      add_index :users, :login
+      User.indexes.length.should == 1
+      remove_index :users, column: :login, :if_exists => true
+      User.indexes.length.should == 0
+    end
+
     it "raises exception if doesn't exist" do
       expect {
         remove_index :users, :login

data/spec/schema_dumper_spec.rb

@@ -161,6 +161,14 @@ describe "Schema dump" do
     end
   end
 
+  it "should sort indexes" do
+    with_index Post, :user_id do
+      with_index Post, :short_id do
+        dump_posts.should match(/on_short_id.+on_user_id/m)
+      end
+    end
+  end
+
   unless SchemaPlusHelpers.mysql?
 
     it "should include index order" do

metadata

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