sql_beautifier 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9557199079511cec5188c694dd32e2d114aaedebb896b90dc4ebe9e95308f116
-  data.tar.gz: da7fe2c4ff35032c6908a8ea10b5e8c4482cb607a78ac3c241b7d4f2093bbc88
+  metadata.gz: a1cd21cc5cba64d3579b6d403693f139a96c958d3d5676a885745dee86ca4cb8
+  data.tar.gz: 03f72e555878220eed0b09646c262e1b70efd678b55fb130d83f8b17d0dcc149
 SHA512:
-  metadata.gz: d363570c1c0add348461b8b9069eb4f7075036140f6c7b86f03130c88903f5fcf17613123841a28ca28b55eeb6b3f16905572017222904a58595586dbb782134
-  data.tar.gz: da33c33ada19314d1421d7a1cab384b9f6fa25b456909f2086b662bf8c235089443a8513b95049bbebe7db70d4535d32cefec664de3927a0d5ca7a0f9da10c87
+  metadata.gz: ed584adbe928ae529abd6f3a67896f31d846064795a317e61a3f8074c59e20d27898c5e17e39b78f5d40b74e6e9c4a2bfd7aa99ec6a9cc6ab4ce7fcd776bc31a
+  data.tar.gz: 9bc2a921e9ba76d00e55fad61f5d34999267d926aed65069981fb3e81b215968c2e60f3958fbf8a67aa645ac13495573396d38f8249bc9871c2df3658ac6c418

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [X.X.X] - YYYY-MM-DD
 
+## [0.10.1] - 2026-03-30
+
+- Fix nested subquery indentation growing excessively at each depth level — `subquery_base_indent_for` was adding the parent formatter's `depth` to the base indent calculation for subqueries on `from`/`where` lines, double-counting indentation that the parent's `format_as_subquery` would also apply; the method now computes base indentation relative to column 0 of the clause text
+- Fix subqueries on non-clause continuation lines (e.g. `inner join lateral (select...)`) using the formatter depth instead of the line's leading spaces for base indentation, causing misaligned closing parentheses
+- Fix subqueries in DML `WHERE` clauses (`DELETE`, `UPDATE`, `INSERT`) not being expanded — `DmlRendering#render_where` now applies `Query.format_subqueries_in_text` to the rendered WHERE output
+- Fix subqueries in DELETE `USING` clauses not being expanded — `DeleteQuery#render_using` now applies `Query.format_subqueries_in_text`, and `using` is recognized as a clause keyword for subquery base indentation
+
 ## [0.10.0] - 2026-03-30
 
 - Add CASE expression formatting — searched CASE (`CASE WHEN ... THEN ... ELSE ... END`) and simple CASE (`CASE expr WHEN value THEN ... END`) are detected and formatted with consistent indentation of `when`/`else`/`end` lines relative to the `case` keyword

data/lib/sql_beautifier/delete_query.rb

@@ -118,7 +118,8 @@ module SqlBeautifier
     end
 
     def render_using
-      "\n#{Util.keyword_padding('using')}#{@using_clause}"
+      formatted_using_text = "\n#{Util.keyword_padding('using')}#{@using_clause}"
+      Query.format_subqueries_in_text(formatted_using_text, depth: @depth)
     end
   end
 end

data/lib/sql_beautifier/dml_rendering.rb

@@ -8,11 +8,16 @@ module SqlBeautifier
       keyword_column_width = SqlBeautifier.config_for(:keyword_column_width)
       conditions = Condition.parse_all(@where_clause)
 
-      return "\n#{Util.keyword_padding('where')}#{@where_clause.strip}" if conditions.length <= 1 && conditions.first&.leaf?
+      formatted_where_text = begin
+        if conditions.length <= 1 && conditions.first&.leaf?
+          "\n#{Util.keyword_padding('where')}#{@where_clause.strip}"
+        else
+          formatted_conditions = Condition.render_all(conditions, indent_width: keyword_column_width)
+          "\n#{formatted_conditions.sub(Util.continuation_padding, Util.keyword_padding('where'))}"
+        end
+      end
 
-      formatted_conditions = Condition.render_all(conditions, indent_width: keyword_column_width)
-
-      "\n#{formatted_conditions.sub(Util.continuation_padding, Util.keyword_padding('where'))}"
+      Query.format_subqueries_in_text(formatted_where_text, depth: @depth)
     end
 
     def render_returning

data/lib/sql_beautifier/query.rb

@@ -11,7 +11,7 @@ module SqlBeautifier
     ].freeze
 
     LEADING_WHITESPACE_PATTERN = %r{\A[[:space:]]*}
-    CLAUSE_KEYWORD_PREFIX_PATTERN = %r{\A(?:where|from)(?:[[:space:]]|$)}i
+    CLAUSE_KEYWORD_PREFIX_PATTERN = %r{\A(?:where|from|using)(?:[[:space:]]|$)}i
 
     attr_reader :clauses
     attr_reader :depth
@@ -87,10 +87,22 @@ module SqlBeautifier
       line_start_position = line_start_position ? line_start_position + 1 : 0
       line_before_subquery = text[line_start_position...subquery_position]
       line_leading_spaces = line_before_subquery[LEADING_WHITESPACE_PATTERN].to_s.length
+      keyword_column_width = SqlBeautifier.config_for(:keyword_column_width)
+      paren_position_on_line = subquery_position - line_start_position
 
-      return default_base_indent unless line_before_subquery.lstrip.match?(CLAUSE_KEYWORD_PREFIX_PATTERN)
+      clause_body_position = line_leading_spaces + keyword_column_width
 
-      default_base_indent + line_leading_spaces + SqlBeautifier.config_for(:keyword_column_width)
+      if line_before_subquery.lstrip.match?(CLAUSE_KEYWORD_PREFIX_PATTERN)
+        if paren_position_on_line == clause_body_position
+          default_base_indent.zero? ? clause_body_position : line_leading_spaces
+        else
+          clause_body_position
+        end
+      elsif paren_position_on_line > line_leading_spaces
+        line_leading_spaces
+      else
+        default_base_indent
+      end
     end
 
     def self.select_follows?(text, position)

data/lib/sql_beautifier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SqlBeautifier
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sql_beautifier
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Kinnell Shah