ridgepole 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f47329a42a0f1fae570e9c37d7ac12b21b2d542dd1f2a461c43e6f14813dd44
-  data.tar.gz: 1c0b84ce805e2aecb9fd12b5fdb5be9f9657468ba1f80bc6cee8d0611863458c
+  metadata.gz: cccf60348e4baf7ac0988edb6e68bc14b0cbb945a167e4a2e6d9ef71d5e35c8a
+  data.tar.gz: 9ff98ff1c8a823fe988129816db0bcc4dac1c9f1a5c565faa47ef8aa3852507b
 SHA512:
-  metadata.gz: 396a8059a3db35168cda1fba372e923561356230a7f8ffa8e0ee50bfbf51960c3f39b3e6469c34f0b2221d855954ecad20893f5d3d4b9f292893de38b5f758ba
-  data.tar.gz: f3a4bad14973e545a1a35593b08d26717f15fe5b7b9a32c2178efb84e8b6e99058dd377ae9a7f2ab54737b6cda7d8e678070362c6cce7f4dadc3ca37f7153319
+  metadata.gz: f0dc88f6715d8500bb4edfa106140ea7ca6cd1c207edd51cf65d12a76453ed2eb3d575ee8b73d7d96a0e386c4dec3e34ff985bf81bcc7a8026529946c3b40f74
+  data.tar.gz: 750a855f189b49cafbc35db15d227b2b2cbf8f2a545075b46a390697f768b3b9c606d9c6403c74c3491fdc76a408944aba2a3a2f7781dd475d096b82ec6f330a

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 3.0
 
+### 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/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
@@ -486,7 +487,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 +510,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

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

@@ -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/version.rb

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

data/ridgepole.gemspec

@@ -40,7 +40,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.69.2'
   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.1
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2025-01-12 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.69.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.68.0
+        version: 1.69.2
 - !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.2
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files: []