activerecord-pg-format-db-structure 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eadcc90f7e5d8ec76f9f9494e7049646bf68ed37df502df31a1dc9fae87d2b6
-  data.tar.gz: bee026074f768393231546155fc52e0d00098cbdec981729a63c5a8d1efeb1c4
+  metadata.gz: b1360637cb5c24ce89e734dd5bd544c80cd29e019102e2ea7268e49ab32f6f71
+  data.tar.gz: 4ff8913438ffb2991e1c23d734cd8b5b8e0327b1286ca483c5d46e2b422ac7c4
 SHA512:
-  metadata.gz: efe9804695f586ea988faa923d5db83483b0a0e1395bdaaaabd3dcdbd93358d96a7c5a0f7688b5bf1512d4e14d49bf68f46c65000c9700cb3ad8ef7d63094908
-  data.tar.gz: dbdfa7873bd2551f2c1284befbd039c194cc87aaafea7690df8daabc84724c78a06ff3f021940204aa80cdef569566b9c81bfe4cc0aa3aa6180cb7a660e0bb21
+  metadata.gz: 5b95bb982ba987fed4a4ae273a337e3d00ee738012bf6c913a81c4d87b2c0e1a3e5ba5caa55bb829df6c242143ffff59e8cecfaab1ab4c517da2232d081023e1
+  data.tar.gz: 9e6b856118e64bf1de2370206057082f9e34cfea208c201c71f0cc6cdd52ad6c9bdd1c06b0c0ea5e4183b6a9711a126724a9c6398471d1e5fd32ec3c689a4bd7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.1.4] - 2025-02-08
+
+- Sort schema migrations inserts
+
 ## [0.1.3] - 2025-02-02
 
 - Rework SQL formatting by only adding indentation to deparsed statements

data/README.md

@@ -259,6 +259,7 @@ Rails.application.configure do
 
   config.activerecord_pg_format_db_structure.transforms = [
     ActiveRecordPgFormatDbStructure::Transforms::RemoveCommentsOnExtensions,
+    ActiveRecordPgFormatDbStructure::Transforms::SortSchemaMigrations,
     ActiveRecordPgFormatDbStructure::Transforms::InlinePrimaryKeys,
     # ActiveRecordPgFormatDbStructure::Transforms::InlineForeignKeys,
     ActiveRecordPgFormatDbStructure::Transforms::InlineSerials,
@@ -293,6 +294,10 @@ Remove unnecessary comment, whitespase and empty lines.
 
 Remove COMMENT statement applied to extensions
 
+### SortSchemaMigrations
+
+Sort schema_migrations inserts to be in chronological order, helps with reducing merge conflicts.
+
 ### InlinePrimaryKeys
 
 Inlines primary keys with the table declaration

data/lib/activerecord-pg-format-db-structure/transforms/sort_schema_migrations.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module ActiveRecordPgFormatDbStructure
+  module Transforms
+    # Sort schema migration inserts to reduce merge conflicts
+    class SortSchemaMigrations < Base
+      def transform!
+        raw_statements.each do |raw_statement|
+          next unless raw_statement.stmt.to_h in insert_stmt: {
+            relation: { relname: "schema_migrations" },
+            select_stmt: { select_stmt: { values_lists: _ } }
+          }
+
+          raw_statement.stmt.insert_stmt.select_stmt.select_stmt.values_lists.sort_by! do |list|
+            list.list.items.first.a_const.sval.sval
+          end
+        end
+      end
+    end
+  end
+end

data/lib/activerecord-pg-format-db-structure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordPgFormatDbStructure
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/activerecord-pg-format-db-structure.rb

@@ -11,6 +11,7 @@ require_relative "activerecord-pg-format-db-structure/transforms/inline_foreign_
 require_relative "activerecord-pg-format-db-structure/transforms/move_indices_after_create_table"
 require_relative "activerecord-pg-format-db-structure/transforms/inline_constraints"
 require_relative "activerecord-pg-format-db-structure/transforms/group_alter_table_statements"
+require_relative "activerecord-pg-format-db-structure/transforms/sort_schema_migrations"
 
 module ActiveRecordPgFormatDbStructure
   DEFAULT_PREPROCESSORS = [
@@ -19,6 +20,7 @@ module ActiveRecordPgFormatDbStructure
 
   DEFAULT_TRANSFORMS = [
     Transforms::RemoveCommentsOnExtensions,
+    Transforms::SortSchemaMigrations,
     Transforms::InlinePrimaryKeys,
     # Transforms::InlineForeignKeys,
     Transforms::InlineSerials,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg-format-db-structure
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jell
 bindir: exe
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query
@@ -53,6 +53,7 @@ files:
 - lib/activerecord-pg-format-db-structure/transforms/inline_serials.rb
 - lib/activerecord-pg-format-db-structure/transforms/move_indices_after_create_table.rb
 - lib/activerecord-pg-format-db-structure/transforms/remove_comments_on_extensions.rb
+- lib/activerecord-pg-format-db-structure/transforms/sort_schema_migrations.rb
 - lib/activerecord-pg-format-db-structure/version.rb
 homepage: https://github.com/ReifyAB/activerecord-pg-format-db-structure
 licenses: