ridgepole 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f47329a42a0f1fae570e9c37d7ac12b21b2d542dd1f2a461c43e6f14813dd44
-  data.tar.gz: 1c0b84ce805e2aecb9fd12b5fdb5be9f9657468ba1f80bc6cee8d0611863458c
+  metadata.gz: 443c4cdeceedc5ddc1e9f3fc7cfbede2d2454cf3bc8fedd1b747ad5f0656db2e
+  data.tar.gz: 4d392f5b8328132651bf8e6b47505a20457756699f749380eefe9060f0ef86a0
 SHA512:
-  metadata.gz: 396a8059a3db35168cda1fba372e923561356230a7f8ffa8e0ee50bfbf51960c3f39b3e6469c34f0b2221d855954ecad20893f5d3d4b9f292893de38b5f758ba
-  data.tar.gz: f3a4bad14973e545a1a35593b08d26717f15fe5b7b9a32c2178efb84e8b6e99058dd377ae9a7f2ab54737b6cda7d8e678070362c6cce7f4dadc3ca37f7153319
+  metadata.gz: d4fbf8b89d03a6477ef56867faeddd2f9bc6f51f359d04426ef8752bdc5ea58f970d27df156e0c2f874a9bd6676a2520fbf413b9a17457c48d05a1870f518f4c
+  data.tar.gz: 87696482e889b7e753b6c17c58f8085814f9c0f5bce7e4a2cc151efd64aba12fad8068bf0f107c5f63667d2fd760ea422eb4787df16a9573a4c5f0072ea0b2c5

data/.rubocop.yml

@@ -58,3 +58,7 @@ Style/OptionalBooleanParameter:
   Enabled: false
 Gemspec/DevelopmentDependencies:
   Enabled: false
+Lint/LiteralInInterpolation:
+  Enabled: false
+Naming/PredicateMethod:
+  Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## 3.0
 
+### 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)
+- Support composite foreign key for non-primary key [pull#518](https://github.com/ridgepole/ridgepole/pull/518)
+
 ### 3.0.0 (2024/11/10)
 
 - Support Rails 8.0 [pull#504](https://github.com/ridgepole/ridgepole/pull/504)

data/README.md

@@ -6,8 +6,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](https://badge.fury.io/rb/ridgepole)
-[![Build Status](https://github.com/ridgepole/ridgepole/workflows/test/badge.svg?branch=1.2)](https://github.com/ridgepole/ridgepole/actions)
-[![Coverage Status](https://coveralls.io/repos/github/ridgepole/ridgepole/badge.svg?branch=1.2)](https://coveralls.io/github/ridgepole/ridgepole?branch=1.2)
+[![test](https://github.com/ridgepole/ridgepole/actions/workflows/test.yml/badge.svg)](https://github.com/ridgepole/ridgepole/actions/workflows/test.yml)
+[![Coverage Status](https://coveralls.io/repos/github/ridgepole/ridgepole/badge.svg?branch=3.0)](https://coveralls.io/github/ridgepole/ridgepole?branch=3.0)
 
 > [!note]
 > * ridgepole v3.0.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

@@ -3,6 +3,7 @@
 module Ridgepole
   class Diff
     PRIMARY_KEY_OPTIONS = %i[id limit default null precision scale collation unsigned].freeze
+    REGEX_COLUMN_IDENTIFIER_QUOTATION_CHARS = '"`'
 
     def initialize(options = {})
       @options = options
@@ -29,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)
@@ -413,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
@@ -486,7 +488,7 @@ module Ridgepole
         from_attrs = from.delete(name)
 
         if from_attrs
-          if from_attrs != to_attrs
+          if normalize_check_constraint(from_attrs) != normalize_check_constraint(to_attrs)
             check_constraints_delta[:add] ||= {}
             check_constraints_delta[:add][name] = to_attrs
 
@@ -509,6 +511,12 @@ module Ridgepole
       table_delta[:check_constraints] = check_constraints_delta unless check_constraints_delta.empty?
     end
 
+    def normalize_check_constraint(attr)
+      attr = attr.dup
+      attr[:expression] = attr[:expression].delete(REGEX_COLUMN_IDENTIFIER_QUOTATION_CHARS)
+      attr
+    end
+
     def scan_exclusion_constraints_change(from, to, table_delta)
       from = (from || {}).dup
       to = (to || {}).dup
@@ -725,5 +733,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/context.rb

@@ -77,8 +77,16 @@ module Ridgepole
         from_table = from_table.to_s
         to_table = to_table.to_s
         options[:name] = options[:name].to_s if options[:name]
-        options[:primary_key] = options[:primary_key].to_s if options[:primary_key]
-        options[:column] = options[:column].to_s if options[:column]
+        if options[:primary_key].is_a?(Array)
+          options[:primary_key] = options[:primary_key].map(&:to_s)
+        elsif options[:primary_key]
+          options[:primary_key] = options[:primary_key].to_s
+        end
+        if options[:column].is_a?(Array)
+          options[:column] = options[:column].map(&:to_s)
+        elsif options[:column]
+          options[:column] = options[:column].to_s
+        end
         @__definition[from_table] ||= {}
         @__definition[from_table][:foreign_keys] ||= {}
         idx = options[:name] || [from_table, to_table, options[:column]]

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)
@@ -36,14 +36,22 @@ module Ridgepole
 
       attrs[:foreign_keys].each_value do |foreign_key_attrs|
         fk_index = foreign_key_attrs[:options][:column] || "#{foreign_key_attrs[:to_table].singularize}_id"
-        next if attrs[:indices]&.any? { |_k, v| v[:column_name].first == fk_index }
-        # NOTE: For composite primary keys, the first column of the primary key is used as the foreign key index
-        next if Array(attrs[:options][:primary_key]).first == fk_index
+        next if attrs[:indices]&.any? { |_, v| match_column_name?(v[:column_name], fk_index) }
+        next if match_column_name?(attrs[:options][:primary_key], fk_index)
 
         raise("The column `#{fk_index}` of the table `#{table_name}` has a foreign key but no index. " \
               'Although InnoDB creates an index automatically, ' \
               'please add one explicitly in order for ridgepole to manage it.')
       end
     end
+
+    def match_column_name?(index_column_name, fk_index)
+      if fk_index.is_a?(Array)
+        index_column_name == fk_index
+      else
+        # NOTE: For composite primary keys, the first column of the primary key is used as the foreign key index
+        Array(index_column_name).first == fk_index
+      end
+    end
   end
 end

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.0'
+  VERSION = '3.0.2'
 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.68.0'
+  spec.add_development_dependency 'rubocop', '1.76.1'
   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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2025-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -232,14 +231,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.68.0
+        version: 1.76.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.68.0
+        version: 1.76.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -363,7 +362,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -378,8 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
-signing_key:
+rubygems_version: 3.6.1
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files: []