index_shotgun 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2170564fedea98e55841bdf9c3c775e9d17f82829cd0a4f4e6e373152187ff
-  data.tar.gz: bd302f0a23894d679d67e0e32379f6a2a0631a69af57a5e5ae0ac2c04ad39edd
+  metadata.gz: c478302e50cc543624c0fc3c8dd1d97b4c6baf6beca5ea9ddadb1a7d01d2f758
+  data.tar.gz: 7e2e320e790201a5989de7152fd22e34d5d7752ca6518930ed1d3ca97bd01320
 SHA512:
-  metadata.gz: ee13a990a519dee3c290e94782924c6d1a9eed815ebc7444867c82855e6e7600ae3ab844b882ce1149f6264ba6b122dadd5e9153e8c84dbe5dd761ddff7c9a12
-  data.tar.gz: d49b22e234b7b96d20b559872a43780359ae81241465871bd6a8205d58aeaa215c36097d28357fadfed5cbae19e40c887e3e9bd5207d717638a74bad5d5ae1a9
+  metadata.gz: c62ebe57d4484a06f20e20e615d3709a15f415b2cca4425229ebd62f98cf2d2ca7191794ea8766b0b5bb3217700ee6bbf958ef8a9b96cd08b66de2dc71aecd04
+  data.tar.gz: 5e27c96ce0440d081c73ac3fd0ec52a65ee56012f163c8beb6faccbe85e2954e25a250a595a6e4d6edc7fad7f79d69025a0ec6ae5cd6989592e12aa8d8e7f037

data/.github/workflows/pages.yml

@@ -44,7 +44,7 @@ jobs:
       - run: bundle exec yard
 
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
@@ -55,12 +55,9 @@ jobs:
         uses: actions/deploy-pages@main
 
       - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
+        uses: act10ns/slack@v2
         if: "! success()"
         continue-on-error: true
         with:
-          job_name: "*pages*"
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}

data/.github/workflows/test.yml

@@ -25,7 +25,6 @@ jobs:
 
       matrix:
         ruby:
-          - "2.4"
           - "2.5"
           - "2.6"
           - "2.7"
@@ -34,9 +33,6 @@ jobs:
           - "3.2"
           - "3.3"
         gemfile:
-          - activerecord_5_0
-          - activerecord_5_1
-          - activerecord_5_2
           - activerecord_6_0
           - activerecord_6_1
           - activerecord_7_0
@@ -48,8 +44,6 @@ jobs:
           - oracle
         exclude:
           # Rails 7.0+ requires Ruby 2.7+
-          - ruby:    "2.4"
-            gemfile: activerecord_7_0
           - ruby:    "2.5"
             gemfile: activerecord_7_0
           - ruby:    "2.6"
@@ -61,38 +55,6 @@ jobs:
           - ruby:    "2.6"
             gemfile: activerecord_7_1
 
-          # Rails 6.0+ requires Ruby 2.5+
-          - ruby:    "2.4"
-            gemfile: activerecord_6_0
-          - ruby:    "2.4"
-            gemfile: activerecord_6_1
-
-          # Rails 5.x doesn't works on Ruby 3.0+
-          - ruby:    "3.0"
-            gemfile: activerecord_5_0
-          - ruby:    "3.0"
-            gemfile: activerecord_5_1
-          - ruby:    "3.0"
-            gemfile: activerecord_5_2
-          - ruby:    "3.1"
-            gemfile: activerecord_5_0
-          - ruby:    "3.1"
-            gemfile: activerecord_5_1
-          - ruby:    "3.1"
-            gemfile: activerecord_5_2
-          - ruby:    "3.2"
-            gemfile: activerecord_5_0
-          - ruby:    "3.2"
-            gemfile: activerecord_5_1
-          - ruby:    "3.2"
-            gemfile: activerecord_5_2
-          - ruby:    "3.3"
-            gemfile: activerecord_5_0
-          - ruby:    "3.3"
-            gemfile: activerecord_5_1
-          - ruby:    "3.3"
-            gemfile: activerecord_5_2
-
           # TODO: latest activerecord-oracle_enhanced-adapter doesn't support activerecord 7.1
           - database: oracle
             gemfile: activerecord_7_1
@@ -138,7 +100,7 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
 
       - name: Cache vendor/bundle
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache_gem
         with:
           path: vendor/bundle
@@ -180,21 +142,19 @@ jobs:
         continue-on-error: true
 
       - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
+        uses: act10ns/slack@v2
         if: "! success()"
         continue-on-error: true
         with:
-          job_name: ${{ format('*build* ({0}, {1}, {2})', matrix.ruby, matrix.gemfile, matrix.database) }}
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}
+          matrix: ${{ toJson(matrix) }}
 
   rubocop:
     runs-on: ubuntu-latest
 
     env:
-      RUBY_VERSION: 2.4
+      RUBY_VERSION: 2.5
       BUNDLE_WITHOUT: mysql postgresql sqlite3 oracle
 
     steps:
@@ -205,7 +165,7 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
 
       - name: Cache vendor/bundle
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache_gem_rubocop
         with:
           path: vendor/bundle
@@ -224,15 +184,12 @@ jobs:
           bundle exec rubocop
 
       - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
+        uses: act10ns/slack@v2
         if: "! success()"
         continue-on-error: true
         with:
-          job_name: '*rubocop*'
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}
 
   notify:
     needs:
@@ -243,12 +200,9 @@ jobs:
 
     steps:
       - name: Slack Notification (success)
-        uses: lazy-actions/slatify@master
+        uses: act10ns/slack@v2
         if: always()
         continue-on-error: true
         with:
-          job_name: '*build*'
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}

data/.rubocop.yml

@@ -4,14 +4,16 @@ inherit_gem:
     - "config/rspec.yml"
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  SuggestExtensions: false
+  NewCops: disable
 
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle:      table
 
 Metrics/AbcSize:
-  Max: 33
+  Max: 37
 
 Metrics/MethodLength:
   Max: 25
@@ -19,6 +21,9 @@ Metrics/MethodLength:
 RSpec/NestedGroups:
   Enabled: false
 
+RSpec/RepeatedDescription:
+  Enabled: false
+
 RSpec/SharedExamples:
   Enabled: false
 
@@ -26,3 +31,6 @@ Security/Eval:
   Exclude:
     - "Gemfile"
     - "gemfiles/*.gemfile"
+
+Style/ExplicitBlockArgument:
+  Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 ## Unreleased
-[Full Changelog](https://github.com/sue445/index_shotgun/compare/v1.0.2...master)
+[Full Changelog](https://github.com/sue445/index_shotgun/compare/v2.0.0...master)
+
+## [v2.0.0](https://github.com/sue445/index_shotgun/tree/v2.0.0) (2024/05/15)
+[Full Changelog](https://github.com/sue445/index_shotgun/compare/v1.0.3...v2.0.0)
+
+* :bomb: **[BREAKING CHANGE]** Requires Ruby2.5+ and activerecord 6.0+
+  * https://github.com/sue445/index_shotgun/pull/141
+* Upgrade to rubocop 1.28.2
+  * https://github.com/sue445/index_shotgun/pull/142
+
+## [v1.0.3](https://github.com/sue445/index_shotgun/tree/v1.0.3) (2024/05/14)
+[Full Changelog](https://github.com/sue445/index_shotgun/compare/v1.0.2...v1.0.3)
+
+* Fixed false positives when there are multiple unique indexes on a single table
+  * https://github.com/sue445/index_shotgun/pull/140
 
 ## [v1.0.2](https://github.com/sue445/index_shotgun/tree/v1.0.2) (2023/12/28)
 [Full Changelog](https://github.com/sue445/index_shotgun/compare/v1.0.1...v1.0.2)

data/Gemfile

@@ -19,5 +19,3 @@ end
 group :sqlite3 do
   gem "sqlite3"
 end
-
-eval_gemfile "#{__dir__}/gemfiles/common.gemfile"

data/README.md

@@ -45,7 +45,7 @@ ALTER TABLE `user_stocks` DROP INDEX `index_user_stocks_on_user_id`;
 ```
 
 ## Requirements
-* Ruby 2.3+
+* Ruby 2.5+
 * Database you want to use (ex. MySQL, PostgreSQL or SQLite3)
 
 ## Installation

data/gemfiles/activerecord_6_0.gemfile

@@ -22,6 +22,4 @@ group :sqlite3 do
   gem "sqlite3", "~> 1.4"
 end
 
-eval_gemfile "#{__dir__}/common.gemfile"
-
 gemspec path: "../"

data/gemfiles/activerecord_6_1.gemfile

@@ -22,6 +22,4 @@ group :sqlite3 do
   gem "sqlite3", "~> 1.4"
 end
 
-eval_gemfile "#{__dir__}/common.gemfile"
-
 gemspec path: "../"

data/gemfiles/activerecord_7_0.gemfile

@@ -24,6 +24,4 @@ group :sqlite3 do
   gem "sqlite3", "~> 1.4"
 end
 
-eval_gemfile "#{__dir__}/common.gemfile"
-
 gemspec path: "../"

data/gemfiles/activerecord_7_1.gemfile

@@ -23,6 +23,4 @@ group :sqlite3 do
   gem "sqlite3", "~> 1.4"
 end
 
-eval_gemfile "#{__dir__}/common.gemfile"
-
 gemspec path: "../"

data/index_shotgun.gemspec

@@ -19,25 +19,25 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://sue445.github.io/index_shotgun/"
   spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.0.0"
+  spec.add_dependency "activerecord", ">= 6.0.0"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls_reborn"
-  spec.add_development_dependency "onkcop", "0.53.0.2"
+  spec.add_development_dependency "onkcop", "1.0.0.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake_shared_context", "0.2.2"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
-  spec.add_development_dependency "rubocop", "0.62.0"
-  spec.add_development_dependency "rubocop_auto_corrector"
+  spec.add_development_dependency "rubocop", "1.28.2"
+  spec.add_development_dependency "rubocop_auto_corrector", "< 0.4.4" # FIXME: rubocop --autocorrect doesn't available on rubocop 1.28.2
   spec.add_development_dependency "simplecov", "< 0.18.0"
   spec.add_development_dependency "yard"
 end

data/lib/index_shotgun/analyzer.rb

@@ -78,6 +78,8 @@ module IndexShotgun
         indexes.permutation(2).each_with_object([]) do |(source_index, target_index), response|
           next unless source_index.columns.start_with?(target_index.columns)
 
+          next if source_index.unique && target_index.unique
+
           if target_index.unique
             response << {
               index:  source_index,

data/lib/index_shotgun/version.rb

@@ -1,3 +1,3 @@
 module IndexShotgun
-  VERSION = "1.0.2".freeze
+  VERSION = "2.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: index_shotgun
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0.2
+        version: 1.0.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0.2
+        version: 1.0.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: rubocop_auto_corrector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -223,14 +223,10 @@ files:
 - ci/database.yml.sqlite3
 - ci/install.sh
 - exe/index_shotgun
-- gemfiles/activerecord_5_0.gemfile
-- gemfiles/activerecord_5_1.gemfile
-- gemfiles/activerecord_5_2.gemfile
 - gemfiles/activerecord_6_0.gemfile
 - gemfiles/activerecord_6_1.gemfile
 - gemfiles/activerecord_7_0.gemfile
 - gemfiles/activerecord_7_1.gemfile
-- gemfiles/common.gemfile
 - index_shotgun.gemspec
 - lib/index_shotgun.rb
 - lib/index_shotgun/analyzer.rb
@@ -257,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/activerecord_5_0.gemfile

@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.7"
-
-group :postgresql do
-  # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L2
-  gem "pg", ">= 0.18", "< 2.0"
-end
-
-group :mysql do
-  # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L4
-  gem "mysql2", ">= 0.4.4", "< 0.6.0"
-end
-
-group :oracle do
-  gem "activerecord-oracle_enhanced-adapter", "~> 1.7.11"
-  gem "ruby-oci8"
-end
-
-group :sqlite3 do
-  gem "sqlite3", "~> 1.3.6"
-end
-
-eval_gemfile "#{__dir__}/common.gemfile"
-
-gemspec path: "../"

data/gemfiles/activerecord_5_1.gemfile

@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.6"
-
-group :postgresql do
-  # https://github.com/rails/rails/blob/v5.1.6/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L2
-  gem "pg", ">= 0.18", "< 2.0"
-end
-
-group :mysql do
-  # https://github.com/rails/rails/blob/v5.1.6/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L4-L6
-  gem "mysql2", ">= 0.4.4", "< 0.6.0"
-end
-
-group :oracle do
-  gem "activerecord-oracle_enhanced-adapter", "~> 1.8.2"
-  gem "ruby-oci8"
-end
-
-group :sqlite3 do
-  gem "sqlite3", "~> 1.3.6"
-end
-
-eval_gemfile "#{__dir__}/common.gemfile"
-
-gemspec path: "../"

data/gemfiles/activerecord_5_2.gemfile

@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.0"
-
-group :postgresql do
-  # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
-  gem "pg", ">= 0.18", "< 2.0"
-end
-
-group :mysql do
-  # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
-  gem "mysql2", ">= 0.4.4", "< 0.6.0"
-end
-
-group :oracle do
-  gem "activerecord-oracle_enhanced-adapter", "~> 5.2.3"
-  gem "ruby-oci8"
-end
-
-group :sqlite3 do
-  gem "sqlite3", "~> 1.3.6"
-end
-
-eval_gemfile "#{__dir__}/common.gemfile"
-
-gemspec path: "../"

data/gemfiles/common.gemfile

@@ -1,15 +0,0 @@
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.4.0")
-  # byebug v11.1.0+ requires Ruby 2.4.0+
-  gem "byebug", "< 11.1.0"
-
-  # simplecov-html v0.12.3+ requires Ruby 2.4.0+
-  gem "simplecov-html", "< 0.12.3"
-
-  # parallel v1.20.0 requires Ruby 2.5.0+ and parallel v1.20.1+ requires Ruby 2.4.0+
-  gem "parallel", "< 1.20.0"
-end
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.4.4")
-  # zeitwerk requires Ruby 2.4.4+
-  gem "activesupport", "< 6.0.0"
-end