sqlakit 0.22.4__tar.gz → 0.22.6__tar.gz

{sqlakit-0.22.4 → sqlakit-0.22.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlakit
-Version: 0.22.4
+Version: 0.22.6
 Summary: A toolkit for SQLAlchemy applications.
 Keywords: sqlalchemy,database,orm,sql,asyncio
 Author: Anton Ruhlov

{sqlakit-0.22.4 → sqlakit-0.22.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit"
-version = "0.22.4"
+version = "0.22.6"
 description = "A toolkit for SQLAlchemy applications."
 readme = "README.md"
 license = "MIT"

{sqlakit-0.22.4 → sqlakit-0.22.6}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit"
-version = "0.22.4"
+version = "0.22.6"
 description = "A toolkit for SQLAlchemy applications."
 readme = "README.md"
 license = "MIT"

{sqlakit-0.22.4 → sqlakit-0.22.6}/sqlakit/_render.py

@@ -278,23 +278,20 @@ def _place(
     starts = [0, *(index + 1 for index, char in enumerate(one.sql) if char == "\n")]
     for line, column in places:
         offset = starts[min(line, len(starts)) - 1] + column - 1
-        text = one.sql[starts[line - 1] :].split("\n", 1)[0].strip()
+        written = one.sql[starts[line - 1] :].split("\n", 1)[0]
+        text = written.strip()
+        # The line the linter stopped on, and a caret under where it stopped.
+        indent = len(written) - len(written.lstrip())
+        shown = f"\n    {text}\n    {' ' * max(column - 1 - indent, 0)}^"
         piece = one.written_by(offset)
         if piece is not None:
-            what = " ".join(one.sql[piece.start : piece.end].split())
-            message = (
-                f"{piece.call} writes SQL {linter.name} cannot parse, {{}}: {what}"
-            )
+            message = f"{piece.call} writes SQL {linter.name} cannot parse, {{}}{shown}"
             key = (path, *piece.span, message)
         else:
             at = source.find(text) if text else -1
             start = max(at, 0)
-            key = (
-                path,
-                start,
-                start + len(text),
-                f"{linter.name} cannot parse the rendered SQL, {{}}: {text}",
-            )
+            message = f"{linter.name} cannot parse the rendered SQL, {{}}{shown}"
+            key = (path, start, start + len(text), message)
         ways = found.setdefault(key, [])
         if _WAYS[one.variant] not in ways:
             ways.append(_WAYS[one.variant])

{sqlakit-0.22.4 → sqlakit-0.22.6}/sqlakit/_sql.py

@@ -1954,6 +1954,16 @@ def unless_set(value: Param, expr: Sql, otherwise: Sql = Sql("TRUE")) -> str:  #
     return _grouped(str(otherwise if _is_set(value.value) else expr))
 
 
+@sql_macro(optional=True, lazy=True)
+def if_not_set(value: Param, expr: Sql, otherwise: Sql = Sql("TRUE")) -> str:  # noqa: B008
+    """`expr` when the parameter holds no value: another name for `unless_set`.
+
+    It reads as the other way round from `if_set`:
+    `AND tpl.if_not_set(:status, status <> 'archived')`.
+    """
+    return _grouped(str(otherwise if _is_set(value.value) else expr))
+
+
 @sql_macro(optional=True)
 def array(ctx: Context, values: Param, type_name: Sql = Sql("")) -> str:  # noqa: B008
     """Write a list as an array, one parameter per value.
@@ -2564,6 +2574,7 @@ BUILTIN_MACROS: Mapping[str, Macro] = {
     for macro in (
         if_set,
         unless_set,
+        if_not_set,
         order_by,
         icontains,
         icollate,