schema_plus_indexes 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d3bfc7477305f922af889109040fc663c5f02a2
-  data.tar.gz: aa44cff033d8bc35026cc0ac78b821dc0f5cef3b
+  metadata.gz: 59c1cc31f6d11ef0482b7592f398503e4de3081b
+  data.tar.gz: cb27adde0cb695f05991c39275bb3219fc41bffa
 SHA512:
-  metadata.gz: 1211fb491159c60fab14c1829170326944e60aa67af3fae43ccb80e17761be54c203e25b33aac2d21c6305dd32ffa5ebc09a11cfd8a1a7d46be6a3b89386cb22
-  data.tar.gz: 5a7b893f6e89058df0b8a2f23af5012a6fc0f126775b1c2aabfc1380d5516bb2919bb81be686303a3a2883176075c78c5d29f325486cbf367ce5c818528cfcb9
+  metadata.gz: d51dd7ccb1d59af210e3ab66a1e32dc138586e54547b88cfad701c001d3401ce2c1b7c9b781484286a8ddd13059112a801285aa50ab5bc9ae3a5431c27e89b93
+  data.tar.gz: 6d7744f9e799a81d8e23bdc7793b9563070c33dc9b7f2b9d09e1d8661b8d52b0278c94f512ca891b1951cbca4c94970f2feb9b4f265724a163784262543f6998

data/.travis.yml

@@ -13,6 +13,9 @@ gemfile:
 - gemfiles/activerecord-5.0/Gemfile.mysql2
 - gemfiles/activerecord-5.0/Gemfile.postgresql
 - gemfiles/activerecord-5.0/Gemfile.sqlite3
+- gemfiles/activerecord-5.1/Gemfile.mysql2
+- gemfiles/activerecord-5.1/Gemfile.postgresql
+- gemfiles/activerecord-5.1/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -107,14 +107,19 @@ schema_plus_indexes is tested on
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.3.1** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
 * ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
-## History
+## Release Notes
+
+### v0.2.5
+
+* Supports AR 5.1.  Thanks to [@iagopiimenta](https://github.com/iagopiimenta)
 
 ### v0.2.4
 
-* Supports AR 5.0.  Thanks to [@myabc][https://github.com/myabc]
+* Supports AR 5.0.  Thanks to [@myabc](https://github.com/myabc)
 
 
 ### v0.2.3

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 5.0.1"

data/gemfiles/activerecord-5.1/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 5.1.0"

data/gemfiles/activerecord-5.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/indexes/active_record/base.rb

@@ -9,7 +9,7 @@ module SchemaPlus::Indexes
         # defind on this model's table.
         #
         def indexes
-          @indexes ||= connection.indexes(table_name, "#{name} Indexes")
+          @indexes ||= connection.indexes(table_name)
         end
 
         # (reset_index_information gets called by by Middleware::Model::ResetColumnInformation)

data/lib/schema_plus/indexes/active_record/connection_adapters/index_definition.rb

@@ -25,7 +25,11 @@ module SchemaPlus::Indexes
           return false unless self.name == other.name
           return false unless Array.wrap(self.columns).collect(&:to_s).sort == Array.wrap(other.columns).collect(&:to_s).sort
           return false unless !!self.unique == !!other.unique
-          return false unless Array.wrap(self.lengths).compact.sort == Array.wrap(other.lengths).compact.sort
+          if self.lengths.is_a?(Hash) or other.lengths.is_a?(Hash)
+            return false if (self.lengths || {}) != (other.lengths || {}) # treat nil same as empty hash
+          else
+            return false if Array.wrap(self.lengths).compact.sort != Array.wrap(other.lengths).compact.sort
+          end
           return false unless self.where == other.where
           return false unless (self.using||:btree) == (other.using||:btree)
           true

data/lib/schema_plus/indexes/middleware/migration.rb

@@ -44,6 +44,7 @@ module SchemaPlus::Indexes
           yield env
         rescue => e
           raise unless e.message.match(/["']([^"']+)["'].*already exists/)
+
           name = $1
           existing = env.caller.indexes(env.table_name).find{|i| i.name == name}
           attempted = ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(env.table_name, env.column_names, env.options.merge(:name => name))

data/lib/schema_plus/indexes/remove_if_exists.rb

@@ -6,7 +6,7 @@ module SchemaPlus::Indexes
       options = args.extract_options!
       if_exists = options.delete(:if_exists)
       args << options if options.any?
-      return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, *args), false)
+      return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, *args), nil)
       super table_name, *args
     end
   end

data/lib/schema_plus/indexes/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Indexes
-    VERSION = "0.2.4"
+    VERSION = "0.3.0"
   end
 end

data/schema_dev.yml

@@ -3,6 +3,7 @@ ruby:
 activerecord:
     - 4.2
     - 5.0
+    - 5.1
 db:
     - mysql2
     - sqlite3

data/schema_plus_indexes.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", ">= 4.2", "< 5.1"
+  gem.add_dependency "activerecord", ">= 4.2", "< 5.2"
   gem.add_dependency "schema_plus_core"
   gem.add_dependency "its-it", "~> 1.2"
 

data/spec/index_definition_spec.rb

@@ -24,7 +24,7 @@ describe "Index definition" do
   end
 
   after(:each) do
-    migration.remove_index :users, :name => 'users_login_index' if migration.index_name_exists? :users, 'users_login_index', true
+    migration.remove_index :users, :name => 'users_login_index' if migration.index_name_exists? :users, 'users_login_index', nil
   end
 
   context "when index is multicolumn" do

data/spec/migration_spec.rb

@@ -62,7 +62,12 @@ describe ActiveRecord::Migration do
         t.string :bar, :index => { :with => :foo, :length => { :foo => 8, :bar => 12 }}
       end
       index = @model.indexes.first
-      expect(Hash[index.columns.zip(index.lengths.map(&:to_i))]).to eq({ "foo" => 8, "bar" => 12})
+
+      if index.lengths.is_a? Hash  # as of AR 5.1
+        expect(index.lengths).to eq({ "foo" => 8, "bar" => 12})
+      else
+        expect(Hash[index.columns.zip(index.lengths.map(&:to_i))]).to eq({ "foo" => 8, "bar" => 12})
+      end
     end
 
     it "should create an index if specified explicitly" do

data/spec/schema_dumper_spec.rb

@@ -67,7 +67,8 @@ describe "Schema dump" do
 
   it "should include index order", :mysql => :skip do
     with_index Post, [:user_id, :first_comment_id, :short_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
-      expect(dump_posts).to match(/"user_id".*:index=>{.*:with=>\["first_comment_id", "short_id"\],.*:order=>{"user_id"=>:asc, "first_comment_id"=>:desc, "short_id"=>:asc}/)
+      # allow :order hash to key on strings (AR 5.0) or symbols (AR 5.1)
+      expect(dump_posts).to match(/"user_id".*:index=>{.*:with=>\["first_comment_id", "short_id"\],.*:order=>{[:"]user_id"?=>:asc, [:"]first_comment_id"?=>:desc, [:"]short_id"?=>:asc}/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_indexes
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,10 @@ files:
 - gemfiles/activerecord-5.0/Gemfile.mysql2
 - gemfiles/activerecord-5.0/Gemfile.postgresql
 - gemfiles/activerecord-5.0/Gemfile.sqlite3
+- gemfiles/activerecord-5.1/Gemfile.base
+- gemfiles/activerecord-5.1/Gemfile.mysql2
+- gemfiles/activerecord-5.1/Gemfile.postgresql
+- gemfiles/activerecord-5.1/Gemfile.sqlite3
 - lib/schema_plus/indexes.rb
 - lib/schema_plus/indexes/active_record/base.rb
 - lib/schema_plus/indexes/active_record/connection_adapters/abstract_adapter.rb