activerecord-pg-format-db-structure 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f52ec941c9e147d32ce581a4e5384263455ca48295539f0d3a2b518cc7e4e51
-  data.tar.gz: 1ab211061fe2fca72d364dc8b92636e01c294ad4efddbd684a1a2b1b072d02a8
+  metadata.gz: 1b2d206493754a88a3913e3fb7e3532364f2adbd0dea689226d73d9544c73e98
+  data.tar.gz: df009fb052c07eb578b063785ee2186bfbda7ccd758643ae52285b99c784b49b
 SHA512:
-  metadata.gz: 87322b447a211cce08c5beebf137ca7a5da4947f0a01f37192978ea6a873d6f990201450ae3764501cccaa04667089b595bce39829d544e417ee7a9426d8ca5d
-  data.tar.gz: 27ebd693ed145add5112b35805c94e06b4f6f32e03419ffc92c62187116e3ec93d02694b0c67abf153e5a8582643989c2831e74b00f002b5758ba3fc7f6f7c5f
+  metadata.gz: 9e519793dec134c227413416d750ef8be1d3da7414c921369022fc663ae4ae75b789de632e18cd1f08cfa85e719cd87a0b2ed61336db7130e01094196fcb1823
+  data.tar.gz: 64558806595fdecbe27035f5c22b8f3c90b56909a5a2a19b20a1fe6cf2cdbd5dac153cf5d9d860e5ee372144cea5609751b5b1f52dd41072586830a1ae93109e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.1.2] - 2025-01-30
+
+- Get rid of `anbt-sql-formatter` dependency since it breaks queries with type casting
+
 ## [0.1.1] - 2025-01-29
 
 - Proper deparsing of all statements

data/README.md

@@ -338,7 +338,7 @@ Should be run after other operations that inline alter statements.
 
 Returns an SQL string from raw PgQuery statements.
 
-Relying mostly on `PgQuery.deparse`, but applying some formatting using the [anbt-sql-formatter](https://github.com/sonota88/anbt-sql-formatter) gem on select & insert statements.
+Relying mostly on `PgQuery.deparse`, and does a best effort to add some indentation where possible.
 
 ## Development
 

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "pg_query"
-require "anbt-sql-formatter/formatter"
 
 module ActiveRecordPgFormatDbStructure
   # Returns a list of SQL strings from a list of PgQuery::RawStmt.
@@ -23,7 +22,7 @@ module ActiveRecordPgFormatDbStructure
       in stmt: { alter_table_stmt: _ }
         deparse_alter_table_stmt(raw_statement.stmt.alter_table_stmt)
       in stmt: { select_stmt: _ }
-        deparse_query_statement(raw_statement.stmt.select_stmt)
+        deparse_select_stmt(raw_statement.stmt.select_stmt)
       in stmt: { insert_stmt: _ }
         deparse_insert_statement(raw_statement.stmt.insert_stmt)
       in stmt: { create_table_as_stmt: _ }
@@ -41,9 +40,9 @@ module ActiveRecordPgFormatDbStructure
       "\n#{PgQuery.deparse_stmt(stmt)};"
     end
 
-    def deparse_query_statement(stmt)
+    def deparse_select_stmt(select_stmt)
       generic_query_str = +"\n\n"
-      generic_query_str << pretty_formt_sql_string(PgQuery.deparse_stmt(stmt))
+      generic_query_str << deparse_leaf_select_stmt(select_stmt)
       generic_query_str << ";"
     end
 
@@ -126,7 +125,7 @@ module ActiveRecordPgFormatDbStructure
       create_table_as_stmt_str << ";"
 
       query_str = +"(\n"
-      query_str << pretty_formt_sql_string(PgQuery.deparse_stmt(stmt.query.inner)).gsub(/^/, PRETTY_INDENT_STRING)
+      query_str << deparse_leaf_select_stmt(stmt.query.select_stmt).gsub(/^/, PRETTY_INDENT_STRING)
       query_str << "\n)"
 
       create_table_as_stmt_str[placeholder_query_string] = query_str
@@ -144,7 +143,7 @@ module ActiveRecordPgFormatDbStructure
       view_stmt_str << ";"
 
       query_str = +"(\n"
-      query_str << pretty_formt_sql_string(PgQuery.deparse_stmt(stmt.query.inner)).gsub(/^/, PRETTY_INDENT_STRING)
+      query_str << deparse_leaf_select_stmt(stmt.query.select_stmt).gsub(/^/, PRETTY_INDENT_STRING)
       query_str << "\n)"
 
       view_stmt_str[placeholder_query_string] = query_str
@@ -161,27 +160,86 @@ module ActiveRecordPgFormatDbStructure
       )
       insert_stmt_str << "\n;"
 
-      query_str = pretty_formt_sql_string(PgQuery.deparse_stmt(insert_stmt.select_stmt.inner))
-      query_str.gsub!(/\AVALUES /, "VALUES\n ")
+      query_str = if insert_stmt.select_stmt.inner.values_lists.any?
+                    deparse_values_list_select_stmt(insert_stmt.select_stmt.inner)
+                  else
+                    deparse_leaf_select_stmt(insert_stmt.select_stmt.inner)
+                  end
 
       insert_stmt_str[placeholder_query_string] = query_str
       insert_stmt_str
     end
 
-    def pretty_formt_sql_string(sql)
-      rule = AnbtSql::Rule.new
-      rule.keyword = AnbtSql::Rule::KEYWORD_UPPER_CASE
-      rule.indent_string = PRETTY_INDENT_STRING
-      formatter = AnbtSql::Formatter.new(rule)
-      formatter.format(sql)
+    def deparse_values_list_select_stmt(select_stmt)
+      values_str = +"VALUES\n "
+      values_str << select_stmt.values_lists.map do |values_list|
+        PgQuery.deparse_stmt(PgQuery::SelectStmt.new(values_lists: [values_list])).gsub(/\AVALUES /, "")
+      end.join("\n,")
+      values_str
     end
 
-    def placeholder_query_string
-      @placeholder_query_string ||= PgQuery.deparse_stmt(placeholder_query_stmt)
+    def deparse_leaf_select_stmt(select_stmt) # rubocop:disable Metrics/PerceivedComplexity
+      target_list_placeholder = PgQuery::ResTarget.new(
+        val: { a_const: { sval: { sval: "target_list_placeholder" } } }
+      )
+
+      if select_stmt.with_clause
+        placeholder_with_clause = PgQuery::WithClause.new(
+          **select_stmt.with_clause.to_h,
+          ctes: select_stmt.with_clause.ctes.map do |cte|
+            PgQuery::Node.from(
+              PgQuery::CommonTableExpr.new(
+                **cte.inner.to_h,
+                ctequery: PgQuery::Node.from(placeholder_query_stmt("placeholder_for_#{cte.inner.ctename}_cte"))
+              )
+            )
+          end
+        )
+      end
+
+      select_stmt_str = PgQuery.deparse_stmt(
+        PgQuery::SelectStmt.new(
+          **select_stmt.to_h,
+          with_clause: placeholder_with_clause,
+          target_list: ([PgQuery::Node.from(target_list_placeholder)] if select_stmt.target_list.any?)
+        )
+      )
+
+      if select_stmt.target_list.any?
+        target_list_str = +"\n"
+        target_list_str << select_stmt.target_list.map do |target|
+          deparse_res_target(target.inner).gsub(/^/, PRETTY_INDENT_STRING)
+        end.join(",\n")
+        target_list_str << "\n"
+
+        select_stmt_str[deparse_res_target(target_list_placeholder)] = target_list_str
+      end
+
+      select_stmt.with_clause&.ctes&.each do |cte|
+        cte_str = +"\n"
+        cte_str << deparse_leaf_select_stmt(cte.inner.ctequery.inner).gsub(/^/, PRETTY_INDENT_STRING)
+        cte_str << "\n"
+
+        select_stmt_str["SELECT placeholder_for_#{cte.inner.ctename}_cte"] = cte_str
+      end
+
+      select_stmt_str.gsub!(/ +$/, "")
+
+      select_stmt_str
+    end
+
+    def deparse_res_target(res_target)
+      PgQuery.deparse_stmt(
+        PgQuery::SelectStmt.new(target_list: [PgQuery::Node.from(res_target)])
+      ).gsub(/\ASELECT /, "")
+    end
+
+    def placeholder_query_string(placeholder_name = "placeholder")
+      PgQuery.deparse_stmt(placeholder_query_stmt(placeholder_name))
     end
 
-    def placeholder_query_stmt
-      @placeholder_query_stmt ||= PgQuery.parse("SELECT placeholder").tree.stmts.first.stmt.select_stmt
+    def placeholder_query_stmt(placeholder_name = "placeholder")
+      PgQuery.parse("SELECT #{placeholder_name}").tree.stmts.first.stmt.select_stmt
     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.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,28 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg-format-db-structure
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jell
 bindir: exe
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: anbt-sql-formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pg_query
   requirement: !ruby/object:Gem::Requirement