sqlakit 0.22.8__tar.gz → 0.22.9__tar.gz

{sqlakit-0.22.8 → sqlakit-0.22.9}/PKG-INFO

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

{sqlakit-0.22.8 → sqlakit-0.22.9}/pyproject.toml

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

{sqlakit-0.22.8 → sqlakit-0.22.9}/pyproject.toml.orig

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

{sqlakit-0.22.8 → sqlakit-0.22.9}/sqlakit/_sql.py

@@ -613,6 +613,9 @@ def sql_macros(path: Path | str, source: str | None = None) -> list[SqlMacro]:
             problem = f"its arguments in {path.name}:{line} name one twice: {params}"
             raise MacroDefinitionError(name, problem, line=line)
         named = offset + statement.start("name")
+        # The body may start below its `SELECT`, where its lines count from.
+        body = statement.group("body")
+        body_at = offset + statement.start("body") + len(body) - len(body.lstrip())
         found.append(
             SqlMacro(
                 name,
@@ -621,7 +624,7 @@ def sql_macros(path: Path | str, source: str | None = None) -> list[SqlMacro]:
                 doc=" ".join(one for one in doc if one),
                 path=path,
                 line=line,
-                body_line=line,
+                body_line=source.count("\n", 0, body_at) + 1,
                 name_at=(
                     source.count("\n", 0, named) + 1,
                     named - (source.rfind("\n", 0, named) + 1),