ridgepole 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cccf60348e4baf7ac0988edb6e68bc14b0cbb945a167e4a2e6d9ef71d5e35c8a
-  data.tar.gz: 9ff98ff1c8a823fe988129816db0bcc4dac1c9f1a5c565faa47ef8aa3852507b
+  metadata.gz: 5d9ad7e2017aa2af02dd9f0fb5c45cdc7fd1a4f3925778e966246589e352d5ea
+  data.tar.gz: b07a08f0001ed86483597794962e0293be0dc609b7c0a5fdc4425c28c10b8b49
 SHA512:
-  metadata.gz: f0dc88f6715d8500bb4edfa106140ea7ca6cd1c207edd51cf65d12a76453ed2eb3d575ee8b73d7d96a0e386c4dec3e34ff985bf81bcc7a8026529946c3b40f74
-  data.tar.gz: 750a855f189b49cafbc35db15d227b2b2cbf8f2a545075b46a390697f768b3b9c606d9c6403c74c3491fdc76a408944aba2a3a2f7781dd475d096b82ec6f330a
+  metadata.gz: 5747b6d95e0fb69c35c40508935d5474f1ed3750d09354218cfdda6a35de7b5ecbe2a45307bcdca718f2d15a1af12e9c7d95271837c1ae46e0903def31568e09
+  data.tar.gz: 1ca608fb67b6fcfb6b21fd2c2d4a6fd354a1f7e93333c7e183b5af01a7fbf711693ba4910a43019145d342cb311523c6b54395c5afceb5624b36fddb7a0d361d

data/.rubocop.yml

@@ -60,3 +60,5 @@ Gemspec/DevelopmentDependencies:
   Enabled: false
 Lint/LiteralInInterpolation:
   Enabled: false
+Naming/PredicateMethod:
+  Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## 3.0
 
+### 3.0.3 (2025/07/23)
+
+- Fix for index `algorithm` option [pull#555](https://github.com/ridgepole/ridgepole/pull/555)
+
+### 3.0.2 (2025/06/22)
+
+- Faster table definition comparisons [pull#549](https://github.com/ridgepole/ridgepole/pull/549)
+
 ### 3.0.1 (2025/01/12)
 
 - Normalize `check_constraint` [pull#512](https://github.com/ridgepole/ridgepole/pull/512)

data/Gemfile

@@ -4,3 +4,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ridgepole.gemspec
 gemspec
+
+gem 'mutex_m' if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('3.4.0')

data/lib/ridgepole/delta.rb

@@ -271,7 +271,7 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
 end
       RUBY
 
-      if !(@options[:create_table_with_index]) && !indices.empty?
+      if !@options[:create_table_with_index] && !indices.empty?
         append_change_table(table_name, buf) do
           indices.each do |index_name, index_attrs|
             append_add_index(table_name, index_name, index_attrs, buf)

data/lib/ridgepole/diff.rb

@@ -30,8 +30,9 @@ module Ridgepole
           @logger.verbose_info("#   #{table_name}")
 
           unless @options[:drop_table_only]
-            unless (attrs_delta = diff_inspect(from_attrs, to_attrs)).empty?
-              @logger.verbose_info(attrs_delta)
+            unless hash_deep_equal?(from_attrs, to_attrs)
+              attrs_delta = diff_inspect(from_attrs, to_attrs)
+              @logger.verbose_info(attrs_delta) unless attrs_delta.empty?
             end
 
             scan_change(table_name, from_attrs, to_attrs, delta)
@@ -414,7 +415,7 @@ module Ridgepole
           end
         end
 
-        if opts[:size] && (attrs[:type] == :text || attrs[:type] == :blob || attrs[:type] == :binary)
+        if opts[:size] && %i[text blob binary].include?(attrs[:type])
           case opts.delete(:size)
           when :tiny
             attrs[:type] = :blob if attrs[:type] == :binary
@@ -432,6 +433,9 @@ module Ridgepole
       # XXX: MySQL only?
       opts[:using] = :btree unless opts.key?(:using)
       opts[:unique] = false unless opts.key?(:unique)
+
+      # 'algorithm: concurrently' is required for index creation but not stored in PostgreSQL DB metadata, so remove 'algorithm' to prevent diff
+      opts.delete(:algorithm)
     end
 
     def columns_all_include?(expected_columns, actual_columns, table_options)
@@ -732,5 +736,16 @@ module Ridgepole
         @logger.warn "[WARNING] '#{table_name}' definition is not found" unless definition.key?(table_name)
       end
     end
+
+    def hash_deep_equal?(hash1, hash2)
+      return false unless hash1.is_a?(Hash) && hash2.is_a?(Hash)
+      return false if hash1.keys.to_set != hash2.keys.to_set
+
+      hash1.each do |k, v|
+        return false unless hash2.key?(k) && v == hash2[k]
+      end
+
+      true
+    end
   end
 end

data/lib/ridgepole/dsl_parser.rb

@@ -23,11 +23,11 @@ module Ridgepole
     end
 
     def check_orphan_index(table_name, attrs)
-      raise "Table `#{table_name}` to create the index is not defined: #{attrs[:indices].keys.join(',')}" if attrs[:indices] && !(attrs[:definition])
+      raise "Table `#{table_name}` to create the index is not defined: #{attrs[:indices].keys.join(',')}" if attrs[:indices] && !attrs[:definition]
     end
 
     def check_orphan_foreign_key(table_name, attrs)
-      raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}" if attrs[:foreign_keys] && !(attrs[:definition])
+      raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}" if attrs[:foreign_keys] && !attrs[:definition]
     end
 
     def check_foreign_key_without_index(table_name, attrs)

data/lib/ridgepole/dumper.rb

@@ -85,7 +85,7 @@ module Ridgepole
     end
 
     def target?(table_name)
-      !(@options[:tables]) || @options[:tables].include?(table_name)
+      !@options[:tables] || @options[:tables].include?(table_name)
     end
 
     def dump_from(conn)

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '3.0.1'
+  VERSION = '3.0.3'
 end

data/lib/ridgepole.rb

@@ -2,7 +2,7 @@
 
 require 'logger'
 require 'open3'
-require 'pp' # rubocop:disable Lint/RedundantRequireStatement
+require 'pp'
 require 'shellwords'
 require 'singleton'
 require 'stringio'

data/ridgepole.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.'
   spec.homepage      = 'https://github.com/ridgepole/ridgepole'
   spec.license       = 'MIT'
+  spec.platform      = Gem::Platform::RUBY
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -40,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.2.0'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '1.69.2'
+  spec.add_development_dependency 'rubocop', '1.78.0'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Genki Sugawara
 bindir: bin
 cert_chain: []
-date: 2025-01-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -231,14 +231,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.69.2
+        version: 1.78.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.69.2
+        version: 1.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files: []