activerecord-pg-format-db-structure 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 476baa5e7f08de7b010ef98240bf4dc9d5f92d8c381759682dfdcbdd33ba5723
-  data.tar.gz: 8a9337bff151ccadbfc77cb638aca3b1097831979206cf971d4e3af4b3258c7c
+  metadata.gz: 74eff8ba4546f71002cc784146845e66b74a38cfdfe6f2604b6ee34994269564
+  data.tar.gz: 330f056b6883d6dbbfc253ac9230794756f0a45b19527ecdb8af3005b01dc55e
 SHA512:
-  metadata.gz: a6c728fe8aba0d6c943ff8ac5cf16d386099ea85f4a35c101eed701b899ab3ec266b9004313007bba2d5e2567273f5aedfff857567743ea64c1a2d5bdaa1961c
-  data.tar.gz: 17b9b5722ac383a92969640cf30a6a68aaee073eec784cbe8545eae6f85d983a5fc7a5b2bebd66755bcf097340a8e931a4e831cc298647759f039078b51663f4
+  metadata.gz: 64f5bcc1ca4e2b6033b83acc918372e20c19765315f7c03bfb8666190d255a7e9c8bb4fde73c28ce2c2af109423bc739af0938e638c003bb6dabdcb277a12861
+  data.tar.gz: 30fb3d9e684ac251b20f6eee82a791c075173cf2385f8e8c69b14e726ceda554cc6ab768f8bca0fea6f4fedc1b08d7b34a71c64d0002fbff95b8d32f8951ae06

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rake
   - rubocop-rspec
 
@@ -119,6 +119,8 @@ Lint/UnexpectedBlockArity: # new in 1.5
   Enabled: true
 Lint/UnmodifiedReduceAccumulator: # new in 1.1
   Enabled: true
+Lint/UselessConstantScoping:
+  Enabled: false
 Lint/UselessDefined: # new in 1.69
   Enabled: true
 Lint/UselessNumericOperation: # new in 1.66

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.4.0] - 2025-03-21
+
+- Remove no-op `NOT VALID` setting when inlining constraints
+
+## [0.3.0] - 2025-03-15
+
+- Introduce StatementAppender for better spacing between statements
+
 ## [0.2.1] - 2025-02-15
 
 - Add transform to remove SET commands with default values

data/README.md

@@ -5,7 +5,7 @@
 
 Automatically cleans up your PostgreSQL `structure.sql` file after each rails migration.
 
-Say good-bye to small those small diffs you get between coworkers!
+Say good-bye to those pesky diffs you get between coworkers!
 
 By default, it will:
 
@@ -191,8 +191,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 into this normalize (and much more compatch & readable) version:
 
 ```sql
-
-
 CREATE EXTENSION IF NOT EXISTS pgcrypto SCHEMA public;
 
 
@@ -349,7 +347,9 @@ sequence indeed has default settings.
 
 ### InlineConstraints
 
-Inline non-foreign key constraints into table declaration
+Inline non-foreign key constraints into table declaration.
+
+Note that this also remove the `NOT VALID` setting if present, since that's a no-op when the constraint is created at the same time as the table.
 
 ### MoveIndicesAfterCreateTable
 

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

@@ -32,42 +32,42 @@ module ActiveRecordPgFormatDbStructure
     private
 
     def deparse_stmt_generic(stmt)
-      generic_str = +"\n\n"
+      generic_str = +""
       generic_str << deparse_stmt_and_indent(stmt)
       generic_str << ";"
       generic_str
     end
 
     def deparse_stmt_compact(stmt)
-      compact_str = +"\n"
+      compact_str = +""
       compact_str << deparse_stmt(stmt)
       compact_str << ";"
       compact_str
     end
 
     def deparse_insert_stmt(stmt)
-      insert_str = +"\n\n\n"
+      insert_str = +""
       insert_str << deparse_stmt_and_indent(stmt)
       insert_str << "\n;"
       insert_str
     end
 
     def deparse_create_stmt(stmt)
-      table_str = "\n\n\n-- Name: #{stmt.relation.relname}; Type: TABLE;\n\n"
+      table_str = "-- Name: #{stmt.relation.relname}; Type: TABLE;\n\n"
       table_str << deparse_stmt_and_indent(stmt)
       table_str << ";"
       table_str
     end
 
     def deparse_view_stmt(stmt)
-      table_str = "\n\n\n-- Name: #{stmt.view.relname}; Type: VIEW;\n\n"
+      table_str = "-- Name: #{stmt.view.relname}; Type: VIEW;\n\n"
       table_str << deparse_stmt_and_indent(stmt)
       table_str << ";"
       table_str
     end
 
     def deparse_create_table_as_stmt(stmt)
-      table_str = "\n\n\n-- Name: #{stmt.into.rel.relname}; Type: MATERIALIZED VIEW;\n\n"
+      table_str = "-- Name: #{stmt.into.rel.relname}; Type: MATERIALIZED VIEW;\n\n"
       table_str << deparse_stmt_and_indent(stmt)
 
       # couldn't find a better solution for this, but probably an OK workaround?

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

@@ -6,14 +6,16 @@ require_relative "../activerecord-pg-format-db-structure"
 module ActiveRecordPgFormatDbStructure
   # Formats & normalizes in place the given SQL string
   class Formatter
-    attr_reader :transforms, :deparser
+    attr_reader :transforms, :deparser, :statement_appender
 
     def initialize(
       transforms: DEFAULT_TRANSFORMS,
-      deparser: DEFAULT_DEPARSER
+      deparser: DEFAULT_DEPARSER,
+      statement_appender: DEFAULT_STATEMENT_APPENDER
     )
       @transforms = transforms
       @deparser = deparser
+      @statement_appender = statement_appender
     end
 
     def format(source)
@@ -23,9 +25,17 @@ module ActiveRecordPgFormatDbStructure
         transform.new(raw_statements).transform!
       end
 
-      raw_statements.map do |raw_statement|
-        deparser.new(source).deparse_raw_statement(raw_statement)
-      end.compact.join
+      appender = statement_appender.new
+      raw_statements.each do |raw_statement|
+        statement = deparser.new(source).deparse_raw_statement(raw_statement)
+        appender.append_statement!(
+          statement,
+          statement_kind: PgQuery::Node.inner_class_to_name(
+            raw_statement.stmt.inner.class
+          )
+        )
+      end
+      appender.output
     end
   end
 end

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

@@ -6,6 +6,7 @@ module ActiveRecordPgFormatDbStructure
     config.activerecord_pg_format_db_structure = ActiveSupport::OrderedOptions.new
     config.activerecord_pg_format_db_structure.transforms = DEFAULT_TRANSFORMS.dup
     config.activerecord_pg_format_db_structure.deparser = DEFAULT_DEPARSER
+    config.activerecord_pg_format_db_structure.statement_appender = DEFAULT_STATEMENT_APPENDER
 
     rake_tasks do
       load "activerecord-pg-format-db-structure/tasks/clean_db_structure.rake"

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "pg_query"
+require_relative "indenter"
+
+module ActiveRecordPgFormatDbStructure
+  # Appends statements with reasonable spacing in-between
+  class StatementAppender
+    attr_reader :output
+
+    def initialize(output = +"")
+      @output = output
+      @previous_statement_kind = nil
+    end
+
+    def append_statement!(statement, statement_kind:)
+      output.chomp!
+      output << newlines_separator(
+        previous_kind: @previous_statement_kind,
+        current_kind: statement_kind
+      )
+      @previous_statement_kind = statement_kind
+      output << statement
+      output << "\n"
+    end
+
+    private
+
+    def newlines_separator(previous_kind:, current_kind:)
+      case [
+        previous_kind,
+        current_kind
+      ]
+      in [
+        nil,
+        _
+      ]
+        ""
+      in [
+        _,
+        :insert_stmt | :create_stmt | :view_stmt | :create_table_as_stmt
+      ]
+        "\n\n\n"
+      in [
+        :create_stmt | :view_stmt | :create_table_as_stmt | :index_stmt,
+        :index_stmt
+      ] | [
+        :variable_set_stmt,
+        :variable_set_stmt
+      ]
+        "\n"
+      else
+        "\n\n"
+      end
+    end
+  end
+end

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

@@ -64,7 +64,7 @@ module ActiveRecordPgFormatDbStructure
 
       def add_constraint!(raw_statement, constraint)
         raw_statement.stmt.create_stmt.table_elts << PgQuery::Node.from(
-          PgQuery::Constraint.new(constraint)
+          PgQuery::Constraint.new(constraint.merge(skip_validation: nil))
         )
       end
     end

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

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

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

@@ -3,6 +3,7 @@
 require_relative "activerecord-pg-format-db-structure/version"
 
 require_relative "activerecord-pg-format-db-structure/deparser"
+require_relative "activerecord-pg-format-db-structure/statement_appender"
 require_relative "activerecord-pg-format-db-structure/transforms/remove_comments_on_extensions"
 require_relative "activerecord-pg-format-db-structure/transforms/inline_serials"
 require_relative "activerecord-pg-format-db-structure/transforms/inline_primary_keys"
@@ -29,6 +30,7 @@ module ActiveRecordPgFormatDbStructure
   ].freeze
 
   DEFAULT_DEPARSER = Deparser
+  DEFAULT_STATEMENT_APPENDER = StatementAppender
 end
 
 # :nocov:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg-format-db-structure
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jell
 bindir: exe
 cert_chain: []
-date: 2025-02-15 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query
@@ -43,6 +43,7 @@ files:
 - lib/activerecord-pg-format-db-structure/formatter.rb
 - lib/activerecord-pg-format-db-structure/indenter.rb
 - lib/activerecord-pg-format-db-structure/railtie.rb
+- lib/activerecord-pg-format-db-structure/statement_appender.rb
 - lib/activerecord-pg-format-db-structure/tasks/clean_db_structure.rake
 - lib/activerecord-pg-format-db-structure/transforms/base.rb
 - lib/activerecord-pg-format-db-structure/transforms/group_alter_table_statements.rb