ridgepole 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6de4765b254e55e4087b4fe7d99a9c23493e0c54b0a7c7e957b88488fa234d2
-  data.tar.gz: 6d05534c60e9f9f0967179520d8ecd83bee84b96cbe1e80cd4336327f7cb8c37
+  metadata.gz: 58a248172bd53075285dcb1fa69f4c8e3bcfa8ab382445e78823d1a284695c3d
+  data.tar.gz: f7568382f78041f9279ff389e1b4f17f389f6ebfef37bde0c9b557ea2f0efeed
 SHA512:
-  metadata.gz: 1bb9273027a3b3d74c7c18faf25ba4b47033a44b98b12b1de80e04cd521aeb994f45168e97603b56c87dac6839990322eb8b2131e438320772983b9636a8695e
-  data.tar.gz: 49099509a1f3d8e5ae98fb7fe442e942ba7c7def24cf8a065e7c0d8838826e8ba4ec6394e4f9a5fa12cb906f2e850cb1a89e10496bbd07801ba746bf429f6389
+  metadata.gz: 331e86965d4537a88a18d56fc593bf7359a8cee7d4ea69e1e401d53cf2c704b86dae70db004b29738025b2851b528d4a03cc8cea0270b56ffe96cbb41df4d3a9
+  data.tar.gz: 1704cb3599ee8de9695efa8a4af09134f876192ff902ec111a705bdb0ab6f56a8af7bf2e59148fee9037866dab605e622b99c11137330f66decf4df316728e00

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## 3.0
+## 3.2
+
+### 3.2.0 (2026/03/28)
+
+- Fix spurious diff for `timestamp`/`datetime` with `precision: 6` on MySQL. [pull#665](https://github.com/ridgepole/ridgepole/pull/665)
+- Use `udiff` instead of `diffy`. [pull#657](https://github.com/ridgepole/ridgepole/pull/657)
+
+## 3.1
 
 ### 3.1.5 (2026/03/21)
 
@@ -29,6 +36,8 @@
 - Support Rails 8.1 [pull#589](https://github.com/ridgepole/ridgepole/pull/589)
 - Support for migrating PostgreSQL table comments [pull#587](https://github.com/ridgepole/ridgepole/pull/587)
 
+## 3.0
+
 ### 3.0.4 (2025/08/31)
 
 - Fix checking foreign key without index [pull#571](https://github.com/ridgepole/ridgepole/pull/571)

data/README.md

@@ -15,6 +15,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 > If you do not want to sort the columns, use `--disable-sort-columns` option.
 
 > [!note]
+> * ridgepole v3.2.0
+>   * Use `udiff` instead of `diffy` (cf. https://github.com/ridgepole/ridgepole/pull/657)
 > * ridgepole v3.1.0
 >   * Support Rails 8.1 (cf. https://github.com/ridgepole/ridgepole/pull/589)
 > * ridgepole v3.0.0
@@ -301,6 +303,46 @@ execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFE
 end
 ```
 
+### Manage View using `execute`
+
+#### MySQL
+
+```ruby
+# NOTE: view_select must match the normalized form stored in information_schema.views.VIEW_DEFINITION
+view_select = <<-EOS.strip
+  select `mydb`.`users`.`id` AS `id`,`mydb`.`users`.`name` AS `name`,`mydb`.`users`.`active` AS `active` from `mydb`.`users` where (`mydb`.`users`.`active` = 1)
+EOS
+
+execute("CREATE OR REPLACE VIEW `active_users` AS #{view_select}") do |c|
+  definition = c.raw_connection.query(<<-SQL).first&.first
+    SELECT SHA(VIEW_DEFINITION) FROM information_schema.views
+     WHERE TABLE_SCHEMA = 'mydb'
+       AND TABLE_NAME = 'active_users';
+  SQL
+  definition != view_select
+end
+```
+
+#### PostgreSQL
+
+```ruby
+# NOTE: view_select must match the normalized form stored in pg_views.definition
+view_select = <<~EOS.strip
+  SELECT users.name
+     FROM users
+    WHERE (users.active = false);
+EOS
+
+execute("CREATE OR REPLACE VIEW active_users AS #{view_select}") do |c|
+  definition = c.raw_connection.query(<<-SQL).first&.dig("definition")
+    SELECT definition FROM pg_views
+      WHERE schemaname = 'public'
+        AND viewname = 'active_users';
+  SQL
+  definition&.strip != view_select
+end
+```
+
 ## Diff
 ```sh
 $ ridgepole --diff file1.schema file2.schema

data/lib/ridgepole/diff.rb

@@ -445,6 +445,15 @@ module Ridgepole
           end
         end
 
+        # Since ActiveRecord >= 7.0.5, datetime/timestamp columns default to precision: 6 on MySQL.
+        # Strip precision: 6 when it matches the default to avoid spurious diffs.
+        # cf. https://github.com/ridgepole/ridgepole/issues/515
+        if %i[datetime timestamp].include?(attrs[:type]) &&
+           opts[:precision] == 6 &&
+           ActiveRecord.gem_version >= Gem::Version.new('7.0.5')
+          opts.delete(:precision)
+        end
+
         if opts[:size] && %i[text blob binary].include?(attrs[:type])
           case opts.delete(:size)
           when :tiny
@@ -697,13 +706,12 @@ module Ridgepole
       obj1 = Ridgepole::Ext::PpSortHash.extend_if_hash(obj1)
       obj2 = Ridgepole::Ext::PpSortHash.extend_if_hash(obj2)
 
-      diffy = Diffy::Diff.new(
+      diff = Udiff::Diff.new(
         obj1.pretty_inspect,
-        obj2.pretty_inspect,
-        diff: '-u'
+        obj2.pretty_inspect
       )
 
-      diffy.to_s(@options[:color] ? :color : :text).gsub(/\s+\z/m, '')
+      diff.to_s(@options[:color] ? :color : :text).gsub(/\s+\z/m, '')
     end
 
     def collect_relation_info!(table_name, table_attr, relation_info)

data/lib/ridgepole/version.rb

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

data/lib/ridgepole.rb

@@ -11,7 +11,7 @@ require 'active_record'
 require 'active_support'
 require 'active_support/core_ext'
 
-require 'diffy'
+require 'udiff'
 
 module Ridgepole; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Genki Sugawara
@@ -30,7 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '8.3'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,19 +44,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: udiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement