schema_plus_indexes 1.0.0 → 1.0.1.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: decc66bcf6d7441ebc8722b1f6391d13240d897df6f940fc0543f6450cee507b
-  data.tar.gz: 429fb39c11a09a551d65fb8f8fd88b9baee2e4508c422cbfbaeddc0b630f3c56
+  metadata.gz: ae9c92be40f007f2a0abca44e57811a656f522994ea91fdb8d4d93b9888f4388
+  data.tar.gz: 69500fc76a9781e9432d0cf151b16f98b66f9df732a5cbeeb95ee20541c118ca
 SHA512:
-  metadata.gz: 1579a9a36aaee5fc3445f5c239bf6a245ae88bd4628b96af588ec0c83cec1e2e7dca6b8bc895ca574038ab9d895cc62b193b1fcbfc3208d98d706c0ffb3b23f9
-  data.tar.gz: e896e9910e9773aba80263462ad1c03c9b9517c376797ac6afa17f37d66a0e1a34c2b976eb9a81284b6e2a640cb9259e479bc848baed9b4c171998c3bc584a8b
+  metadata.gz: 56cfb3212bde9bf4422cc079b99ac647dbbcf80defe6930a507aa0f7eefda21f6abfe981cdcda5bdd7b3f64691ef676ab32a0869d233e0f776fa22272d1a1959
+  data.tar.gz: aaca9da71db99846cc7639e550cb3e7694bd839b5bdbf3c4e0754c574977a0d40295160e1a3a7f050a8fdfe76ad2410871052f9141e13e52d3ba35b86f2715e3

data/.github/workflows/prs.yml

@@ -22,9 +22,12 @@ jobs:
         - '2.5'
         - '2.7'
         - '3.0'
+        - '3.1'
         activerecord:
         - '5.2'
         - '6.0'
+        - '6.1'
+        - '7.0'
         db:
         - mysql2
         - sqlite3
@@ -34,6 +37,10 @@ jobs:
         exclude:
         - ruby: '3.0'
           activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
         - db: skip
           dbversion: skip
         include:
@@ -45,6 +52,10 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '2.7'
           activerecord: '5.2'
           db: postgresql
@@ -53,10 +64,38 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       MYSQL_DB_HOST: 127.0.0.1

data/README.md

@@ -107,9 +107,17 @@ schema_plus_indexes is tested on
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.5** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.5** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.5** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.7** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.7** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.0** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 

data/gemfiles/activerecord-6.1/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

data/gemfiles/activerecord-6.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

data/gemfiles/activerecord-7.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+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/connection_adapters/index_definition.rb

@@ -21,6 +21,10 @@ module SchemaPlus::Indexes
           end
         end
 
+        def case_sensitive?
+          false
+        end
+
         # tests if the corresponding indexes would be the same
         def ==(other)
           return false if other.nil?

data/lib/schema_plus/indexes/active_record/migration/command_recorder.rb

@@ -8,7 +8,8 @@ module SchemaPlus::Indexes
         # inversion of add_index will be remove_index.  add if_exists
         # option for cases where the index doesn't actually exist
         def invert_add_index(args)
-          super.tap { |(command, (arg, options))|
+          super.tap { |(_, args)|
+            options = args[-1]
             options[:if_exists] = true
           }
         end

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

@@ -14,12 +14,23 @@ module SchemaPlus::Indexes
           end
         end
 
-        # Support :index option in Migration.add_column
-        def after(env)
-          return unless env.options[:index]
-          case env.operation
-          when :add, :record
-            env.caller.add_index(env.table_name, env.column_name, env.options[:index])
+        if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+          # Support :index option in Migration.add_column
+          def after(env)
+            return unless env.options[:index]
+            case env.operation
+            when :add, :record
+              env.caller.add_index(env.table_name, env.column_name, env.options[:index])
+            end
+          end
+        else
+          # Support :index option in Migration.add_column
+          def after(env)
+            return unless env.options[:index]
+            case env.operation
+            when :add, :record
+              env.caller.add_index(env.table_name, env.column_name, **env.options[:index])
+            end
           end
         end
       end

data/lib/schema_plus/indexes/remove_if_exists.rb

@@ -2,14 +2,24 @@
 
 module SchemaPlus::Indexes
   module RemoveIfExists
-    # Extends rails' remove_index to include this options:
-    #   :if_exists
-    def remove_index(table_name, *args)
-      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))
-      super table_name, *args
+    if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+      # Extends rails' remove_index to include this options:
+      #   :if_exists
+      def remove_index(table_name, *args)
+        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))
+        super table_name, *args
+      end
+    else
+      # Extends rails' remove_index to include this options:
+      #   :if_exists
+      def remove_index(table_name, column_name = nil, other = nil, **options)
+        if_exists = options.delete(:if_exists)
+        return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, column_name || options))
+        super table_name, column_name, **options
+      end
     end
   end
 end

data/lib/schema_plus/indexes/version.rb

@@ -2,6 +2,6 @@
 
 module SchemaPlus
   module Indexes
-    VERSION = "1.0.0"
+    VERSION = "1.0.1.beta.2"
   end
 end

data/schema_dev.yml

@@ -2,9 +2,12 @@ ruby:
     - 2.5
     - 2.7
     - 3.0
+    - 3.1
 activerecord:
     - 5.2
     - 6.0
+    - 6.1
+    - 7.0
 db:
     - mysql2
     - sqlite3

data/schema_plus_indexes.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
-  gem.add_dependency "schema_plus_core", "~> 3.0"
+  gem.add_dependency "activerecord", ">= 5.2", "< 7.1"
+  gem.add_dependency "schema_plus_core", "~> 3.1.0.beta.1"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake", "~> 13.0"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 4.1"
+  gem.add_development_dependency "schema_dev", "~> 4.2.beta.1"
 end

data/spec/index_spec.rb

@@ -12,14 +12,14 @@ describe "index" do
     before(:each) do
       each_table connection do |table| connection.drop_table table, cascade: true end
 
-      define_schema(:auto_create => false) do
-        create_table :users, :force => true do |t|
+      define_schema(auto_create: false) do
+        create_table :users, force: true do |t|
           t.string :login
           t.text :address
           t.datetime :deleted_at
         end
 
-        create_table :posts, :force => true do |t|
+        create_table :posts, force: true do |t|
           t.text :body
           t.integer :user_id
           t.integer :author_id
@@ -32,7 +32,7 @@ describe "index" do
 
 
     after(:each) do
-      migration.remove_index(:users, :name => @index.name) if (@index ||= nil)
+      migration.remove_index(:users, name: @index.name) if (@index ||= nil)
     end
 
     it "should create index when called without additional options" do
@@ -41,26 +41,26 @@ describe "index" do
     end
 
     it "should create unique index" do
-      add_index(:users, :login, :unique => true)
+      add_index(:users, :login, unique: true)
       expect(index_for(:login).unique).to eq(true)
     end
 
     it "should assign given name" do
-      add_index(:users, :login, :name => 'users_login_index')
+      add_index(:users, :login, name: 'users_login_index')
       expect(index_for(:login).name).to eq('users_login_index')
     end
 
-    it "should assign order", :mysql => :skip do
-      add_index(:users, [:login, :deleted_at], :order => {:login => :desc, :deleted_at => :asc})
+    it "should assign order", mysql: :skip do
+      add_index(:users, [:login, :deleted_at], order: {login: :desc, deleted_at: :asc})
       expect(index_for([:login, :deleted_at]).orders).to eq({"login" => :desc, "deleted_at" => :asc})
     end
 
-    it "should assign order (all same direction)", :mysql => :skip do
-      add_index(:users, [:login, :deleted_at], :order => {:login => :desc, :deleted_at => :desc})
+    it "should assign order (all same direction)", mysql: :skip do
+      add_index(:users, [:login, :deleted_at], order: {login: :desc, deleted_at: :desc})
       expect(index_for([:login, :deleted_at]).orders).to eq({"login" => :desc, "deleted_at" => :desc})
     end
 
-    context "for duplicate index" do
+    context "for duplicate index", rails: '< 6.1' do
       it "should not complain if the index is the same" do
         add_index(:users, :login)
         expect(index_for(:login)).not_to be_nil
@@ -69,13 +69,43 @@ describe "index" do
         expect(index_for(:login)).not_to be_nil
       end
       it "should complain if the index is different" do
-        add_index(:users, :login, :unique => true)
+        add_index(:users, :login, unique: true)
         expect(index_for(:login)).not_to be_nil
         expect { add_index(:users, :login) }.to raise_error(ArgumentError, /already exists/)
         expect(index_for(:login)).not_to be_nil
       end
     end
 
+    context "for duplicate index", rails: '>= 6.1' do
+      it "should raise a statement invalid if the index is the same", postgresql: :skip do
+        add_index(:users, :login)
+        expect(index_for(:login)).not_to be_nil
+        expect { add_index(:users, :login) }.to raise_error(ActiveRecord::StatementInvalid)
+        expect(index_for(:login)).not_to be_nil
+      end
+      it "should raises a statement invalid if the index is different" do
+        add_index(:users, :login, unique: true)
+        expect(index_for(:login)).not_to be_nil
+        expect { add_index(:users, :login) }.to raise_error(ActiveRecord::StatementInvalid)
+        expect(index_for(:login)).not_to be_nil
+      end
+      context 'when if_not_exists is passed' do
+        it "should not raise an error if the index is the same" do
+          add_index(:users, :login)
+          expect(index_for(:login)).not_to be_nil
+          expect { add_index(:users, :login, if_not_exists: true) }.to_not raise_error
+          expect(index_for(:login)).not_to be_nil
+        end
+
+        it "should raise an error if the index is different" do
+          add_index(:users, :login, unique: true)
+          expect(index_for(:login)).not_to be_nil
+          expect { add_index(:users, :login) }.to raise_error(ActiveRecord::StatementInvalid)
+          expect(index_for(:login)).not_to be_nil
+        end
+      end
+    end
+
     protected
 
     def index_for(column_names)
@@ -88,8 +118,8 @@ describe "index" do
 
     before(:each) do
       each_table connection do |table| connection.drop_table table, cascade: true end
-      define_schema(:auto_create => false) do
-        create_table :users, :force => true do |t|
+      define_schema(auto_create: false) do
+        create_table :users, force: true do |t|
           t.string :login
           t.datetime :deleted_at
         end
@@ -136,21 +166,21 @@ describe "index" do
     it "removes index if_exists" do
       add_index :users, :login
       expect(User.indexes.length).to eq(1)
-      remove_index :users, :login, :if_exists => true
+      remove_index :users, :login, if_exists: true
       expect(User.indexes.length).to eq(0)
     end
 
     it "removes multi-column index if exists" do
       add_index :users, [:login, :deleted_at]
       expect(User.indexes.length).to eq(1)
-      remove_index :users, [:login, :deleted_at], :if_exists => true
+      remove_index :users, [:login, :deleted_at], if_exists: true
       expect(User.indexes.length).to eq(0)
     end
 
     it "removes index if_exists using column option" do
       add_index :users, :login
       expect(User.indexes.length).to eq(1)
-      remove_index :users, column: :login, :if_exists => true
+      remove_index :users, column: :login, if_exists: true
       expect(User.indexes.length).to eq(0)
     end
 
@@ -162,19 +192,19 @@ describe "index" do
 
     it "doesn't raise exception with :if_exists" do
       expect {
-        remove_index :users, :login, :if_exists => true
+        remove_index :users, :login, if_exists: true
       }.to_not raise_error
     end
   end
 
   protected
-  def add_index(*args)
-    migration.add_index(*args)
+  def add_index(*args, **kwargs)
+    migration.add_index(*args, **kwargs)
     User.reset_column_information
   end
 
-  def remove_index(*args)
-    migration.remove_index(*args)
+  def remove_index(*args, **kwargs)
+    migration.remove_index(*args, **kwargs)
     User.reset_column_information
   end
 

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 require 'simplecov'
 
-SimpleCov.start
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -24,6 +24,11 @@ RSpec.configure do |config|
       example.run
     end
   end
+  config.filter_run_excluding rails: -> (v) {
+    rails_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+    test = Gem::Requirement.new(v)
+    !test.satisfied_by?(rails_version)
+  }
 end
 
 # shim to handle connection.tables deprecation in favor of
@@ -44,4 +49,3 @@ def define_schema(config={}, &block)
 end
 
 SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_indexes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.beta.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0.beta.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.beta.1
 description:
 email:
 - ronen@barzel.org
@@ -123,6 +123,14 @@ files:
 - gemfiles/activerecord-6.0/Gemfile.mysql2
 - gemfiles/activerecord-6.0/Gemfile.postgresql
 - gemfiles/activerecord-6.0/Gemfile.sqlite3
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.mysql2
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.mysql2
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/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
@@ -163,11 +171,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Adds shorthands and conveniences to ActiveRecord's handling of indexes