jarify 0.3.2__tar.gz → 0.3.3__tar.gz

{jarify-0.3.2 → jarify-0.3.3}/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.3.3] - 2026-04-27
+### Bug Fixes
+
+- place trailing rust fmt placeholder before statement terminator ([#201](https://github.com/amfaro/jarify/pull/201)) ([#201](https://github.com/amfaro/jarify/pull/201))
+
 ## [0.3.2] - 2026-04-27
 ### Bug Fixes
 

{jarify-0.3.2 → jarify-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarify
-Version: 0.3.2
+Version: 0.3.3
 Summary: Bespoke SQL linter and formatter for DuckDB, powered by sqlglot
 Project-URL: Homepage, https://github.com/amfaro/jarify
 Project-URL: Repository, https://github.com/amfaro/jarify

{jarify-0.3.2 → jarify-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jarify"
-version = "0.3.2"
+version = "0.3.3"
 description = "Bespoke SQL linter and formatter for DuckDB, powered by sqlglot"
 readme = "README.md"
 requires-python = ">=3.12"

{jarify-0.3.2 → jarify-0.3.3}/src/jarify/formatter.py

@@ -88,11 +88,20 @@ def format_sql(
         tree = _apply_rules(tree, rules)
         formatted_parts.append(generator.generate(tree))
 
-    formatted = "\n;\n\n".join(formatted_parts) + ("\n;\n" if formatted_parts else "")
+    # Join statements but hold off on the trailing ;\n -- it must come *after*
+    # no-anchor line placeholders are re-inserted, otherwise a trailing
+    # {placeholder} ends up after the semicolon instead of before it, which
+    # breaks SQL templates that use the placeholder as an optional WHERE clause.
+    # A trailing \n is appended to ensure the last line ends with a newline so
+    # that no-anchor placeholder re-insertion does not concatenate directly onto
+    # the last SQL token without a line break.
+    formatted = "\n;\n\n".join(formatted_parts) + ("\n" if formatted_parts else "")
     formatted = _unmask_rust_fmt_placeholders(formatted, inline_mask)
     formatted = _unmask_ifnull(formatted)
     formatted = _unmask_numeric(formatted)
     result = _reinsert_line_rust_fmt_placeholders(formatted, line_insertions)
+    if formatted_parts:
+        result = result.rstrip() + "\n;\n"
     return _restore_ctas_body_placeholders(result, ctas_body_map), warnings
 
 

jarify-0.3.3/tests/fixtures/templates/rust_fmt_trailing_placeholder.expected.sql

@@ -0,0 +1,7 @@
+SELECT
+   request_id
+  ,invoice_date
+  ,sku_key
+FROM transactions
+{filter}
+;

jarify-0.3.3/tests/fixtures/templates/rust_fmt_trailing_placeholder.input.sql

@@ -0,0 +1,6 @@
+SELECT
+   request_id
+  ,invoice_date
+  ,sku_key
+FROM transactions
+{filter}

{jarify-0.3.2 → jarify-0.3.3}/tests/test_formatter.py

@@ -225,3 +225,27 @@ class TestGroupByPerLine:
         out, _ = format_sql("SELECT a, count(*) FROM t GROUP BY a")
         assert "GROUP BY" in out
         assert "a" in out
+
+
+class TestTrailingRustFmtPlaceholder:
+    """Trailing whole-line Rust format placeholders must land *before* the
+    statement-terminating semicolon, not after it.
+
+    Regression for: formatter inserts ';' between the last SQL clause and a
+    trailing {placeholder}, producing invalid SQL when Rust substitutes a
+    non-empty value (e.g. 'WHERE seller_key = ...').
+    """
+
+    def test_placeholder_before_semicolon(self):
+        sql = "SELECT a, b\nFROM t\n{filter}"
+        out, _ = format_sql(sql)
+        lines = out.splitlines()
+        filter_idx = next(i for i, line in enumerate(lines) if "{filter}" in line)
+        semi_idx = next(i for i, line in enumerate(lines) if line.strip() == ";")
+        assert filter_idx < semi_idx, f"{{filter}} (line {filter_idx}) must appear before ';' (line {semi_idx}):\n{out}"
+
+    def test_idempotent(self):
+        sql = "SELECT a, b\nFROM t\n{filter}"
+        out, _ = format_sql(sql)
+        out2, _ = format_sql(out)
+        assert out == out2, f"Formatting is not idempotent:\nFirst pass:\n{out}\nSecond pass:\n{out2}"

{jarify-0.3.2 → jarify-0.3.3}/uv.lock

@@ -34,7 +34,7 @@ wheels = [
 
 [[package]]
 name = "jarify"
-version = "0.3.2"
+version = "0.3.3"
 source = { editable = "." }
 dependencies = [
     { name = "click" },