activerecord-pg-format-db-structure 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 951bd79c320d7f072e3127b173f0f10a62e3790ec723898560b96c20be48687a
-  data.tar.gz: 3dfe0017a38748c7514db4354f39d4c12e6c3ae19a2828414798f6ec24dd7e32
+  metadata.gz: 2bcae1d47f44267453aaaf6928f5e62ddb6b49ff5bb1f045f46aea31fc7d8b05
+  data.tar.gz: 859b427c2235969091c80aeb4f43c8b396ba6a9c54d19aac393e9f3cede64471
 SHA512:
-  metadata.gz: 17a295ed4ffc4052905dc7ef1b40ee85038598b6114ea5c3eef766fe77580ca52f06cf956652abbddd285823e9c2706eee90891890f1b0ce3a1bb5c747a922c8
-  data.tar.gz: e04dc537cd946efe5dc0064e19f933ffa9fb6315bd5f10a2102318d4149f35479cf31ef06d2c6a2abeeae623f30dbaa07edd5fe7e01f3c8b6a723c2180994093
+  metadata.gz: d47dddf87abc9126064f870ad38a730f11b871fed40c9a2e0b131d2ed4ef7f201edf01db1fc364f3fba56f891e9c3972486fc0f79d439e8f25bca422baae9681
+  data.tar.gz: 0a10698d05e4582cc676e08f40cd188e9ab7129dafe2899bd2b3db5b4e48cc89bb3fc1a10f9ad1ef25745054653b6aac826edc1246d3ea7f9f01a9b08253b027

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.6.1] - 2025-11-24
+
+- Fix bug with aggregate filter where clause
+
+## [0.6.0] - 2025-08-21
+
+- Add preprocessors config that allows applying text transforms to the input before parsing
+- Add preprocessor to remove `\restrict` and `\unrestrict` pragmas that appeared in newer versions of pg_dump
+
 ## [0.5.0] - 2025-08-04
 
 - Upgrade pg_query to 6.1 to add support for latest mac OS version

data/README.md

@@ -9,6 +9,7 @@ Say good-bye to those pesky diffs you get between coworkers!
 
 By default, it will:
 
+* remove `\restrict` and `\unrestrict` pragmas
 * Inline primary key declarations
 * Inline SERIAL type declarations
 * Inline table constraints
@@ -27,6 +28,8 @@ As an example, the task will transform this raw `structure.sql`:
 <summary>Click to expand</summary>
 
 ```sql
+\restrict 1234
+
 --
 -- Name: pgcrypto; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -261,6 +264,10 @@ If you want to configure which transforms to use, you can configure the library
 
 ```ruby
 Rails.application.configure do
+  config.activerecord_pg_format_db_structure.preprocessors = [
+    Preprocessors::RemoveRestrictPragmas
+  ]
+
   config.activerecord_pg_format_db_structure.transforms = [
     ActiveRecordPgFormatDbStructure::Transforms::RemoveCommentsOnExtensions,
     ActiveRecordPgFormatDbStructure::Transforms::RemoveDefaultsSetCommands,
@@ -271,7 +278,7 @@ Rails.application.configure do
     ActiveRecordPgFormatDbStructure::Transforms::InlineConstraints,
     ActiveRecordPgFormatDbStructure::Transforms::MoveIndicesAfterCreateTable,
     ActiveRecordPgFormatDbStructure::Transforms::GroupAlterTableStatements,
-    ActiveRecordPgFormatDbStructure::Transforms::SortTableColumns,
+    ActiveRecordPgFormatDbStructure::Transforms::SortTableColumns
   ]
 
   config.activerecord_pg_format_db_structure.deparser = ActiveRecordPgFormatDbStructure::Deparser
@@ -287,6 +294,13 @@ structure = File.read("db/structure.sql")
 formatted = ActiveRecordPgFormatDbStructure::Formatter.new.format(structure)
 File.write("db/structure.sql", formatted)
 ```
+## Preprocessors
+
+### RemoveRestrictPragmas
+
+Remove `\restrict` and `\unrestrict` pragmas that were added in newer
+versions of `pg_dump`, since they are not valid SQL syntax and
+therefore prevent parsing the file as SQL.
 
 ## Transformers
 

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

@@ -6,19 +6,25 @@ require_relative "../activerecord-pg-format-db-structure"
 module ActiveRecordPgFormatDbStructure
   # Formats & normalizes in place the given SQL string
   class Formatter
-    attr_reader :transforms, :deparser, :statement_appender
+    attr_reader :preprocessors, :transforms, :deparser, :statement_appender
 
     def initialize(
+      preprocessors: DEFAULT_PREPROCESSORS,
       transforms: DEFAULT_TRANSFORMS,
       deparser: DEFAULT_DEPARSER,
       statement_appender: DEFAULT_STATEMENT_APPENDER
     )
+      @preprocessors = preprocessors
       @transforms = transforms
       @deparser = deparser
       @statement_appender = statement_appender
     end
 
     def format(source)
+      preprocessors.each do |preprocessor|
+        preprocessor.new(source).preprocess!
+      end
+
       raw_statements = PgQuery.parse(source).tree.stmts
 
       transforms.each do |transform|

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

@@ -125,6 +125,8 @@ module ActiveRecordPgFormatDbStructure
           output.append_token
           output.pop_scope
           output.append_scope(type:, indent: 0)
+        in { current_token: WHERE, inside: PARENS }
+          output.append_token
         in {
           current_token: FROM | WHERE | GROUP | ORDER | WINDOW | HAVING | LIMIT | OFFSET | FETCH | FOR | UNION |
             INTERSECT | EXCEPT => token_type

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "pg_query"
+
+module ActiveRecordPgFormatDbStructure
+  module Preprocessors
+    # :nodoc:
+    class Base
+      attr_reader :source
+
+      def initialize(source)
+        @source = source
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module ActiveRecordPgFormatDbStructure
+  module Preprocessors
+    # Remove \restrict and \unrestrict pragmas added by newer versions
+    # of pg_dump
+    class RemoveRestrictPragmas < Base
+      def preprocess!
+        source.gsub!(/^(\\restrict .*)$/, "")
+        source.gsub!(/^(\\unrestrict .*)$/, "")
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ module ActiveRecordPgFormatDbStructure
   # Setup for Rails
   class Railtie < Rails::Railtie
     config.activerecord_pg_format_db_structure = ActiveSupport::OrderedOptions.new
+    config.activerecord_pg_format_db_structure.preprocessors = DEFAULT_PREPROCESSORS.dup
     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

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

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

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

@@ -4,6 +4,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/preprocessors/remove_restrict_pragmas"
 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"
@@ -16,6 +17,10 @@ require_relative "activerecord-pg-format-db-structure/transforms/sort_schema_mig
 require_relative "activerecord-pg-format-db-structure/transforms/sort_table_columns"
 
 module ActiveRecordPgFormatDbStructure
+  DEFAULT_PREPROCESSORS = [
+    Preprocessors::RemoveRestrictPragmas
+  ].freeze
+
   DEFAULT_TRANSFORMS = [
     Transforms::RemoveCommentsOnExtensions,
     Transforms::RemoveDefaultsSetCommands,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg-format-db-structure
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jell
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query
@@ -42,6 +42,8 @@ files:
 - lib/activerecord-pg-format-db-structure/deparser.rb
 - lib/activerecord-pg-format-db-structure/formatter.rb
 - lib/activerecord-pg-format-db-structure/indenter.rb
+- lib/activerecord-pg-format-db-structure/preprocessors/base.rb
+- lib/activerecord-pg-format-db-structure/preprocessors/remove_restrict_pragmas.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