sqlmesh 0.194.2.dev9__tar.gz → 0.194.2.dev10__tar.gz

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.194.2.dev9
+Version: 0.194.2.dev10
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.194.2.dev9'
-__version_tuple__ = version_tuple = (0, 194, 2, 'dev9')
+__version__ = version = '0.194.2.dev10'
+__version_tuple__ = version_tuple = (0, 194, 2, 'dev10')

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/sqlmesh/cli/main.py

@@ -191,6 +191,7 @@ def init(
     help="The SQL dialect to render the query as.",
 )
 @click.option("--no-format", is_flag=True, help="Disable fancy formatting of the query.")
+@opt.format_options
 @click.pass_context
 @error_handler
 @cli_analytics
@@ -203,6 +204,7 @@ def render(
     expand: t.Optional[t.Union[bool, t.Iterable[str]]] = None,
     dialect: t.Optional[str] = None,
     no_format: bool = False,
+    **format_kwargs: t.Any,
 ) -> None:
     """Render a model's query, optionally expanding referenced models."""
     rendered = ctx.obj.render(
@@ -213,7 +215,17 @@ def render(
         expand=expand,
     )
 
-    sql = rendered.sql(pretty=True, dialect=ctx.obj.config.dialect if dialect is None else dialect)
+    format_config = ctx.obj.config_for_node(model).format
+    format_kwargs = {
+        **format_config.generator_options,
+        **{k: v for k, v in format_kwargs.items() if v is not None},
+    }
+
+    sql = rendered.sql(
+        pretty=True,
+        dialect=ctx.obj.config.dialect if dialect is None else dialect,
+        **format_kwargs,
+    )
     if no_format:
         print(sql)
     else:
@@ -264,55 +276,23 @@ def evaluate(
     help="Transpile project models to the specified dialect.",
 )
 @click.option(
-    "--append-newline",
-    is_flag=True,
-    help="Include a newline at the end of each file.",
-    default=None,
-)
-@click.option(
-    "--no-rewrite-casts",
-    is_flag=True,
-    help="Preserve the existing casts, without rewriting them to use the :: syntax.",
-    default=None,
-)
-@click.option(
-    "--normalize",
+    "--check",
     is_flag=True,
-    help="Whether or not to normalize identifiers to lowercase.",
+    help="Whether or not to check formatting (but not actually format anything).",
     default=None,
 )
 @click.option(
-    "--pad",
-    type=int,
-    help="Determines the pad size in a formatted string.",
-)
-@click.option(
-    "--indent",
-    type=int,
-    help="Determines the indentation size in a formatted string.",
-)
-@click.option(
-    "--normalize-functions",
-    type=str,
-    help="Whether or not to normalize all function names. Possible values are: 'upper', 'lower'",
-)
-@click.option(
-    "--leading-comma",
+    "--rewrite-casts/--no-rewrite-casts",
     is_flag=True,
-    help="Determines whether or not the comma is leading or trailing in select expressions. Default is trailing.",
+    help="Rewrite casts to use the :: syntax.",
     default=None,
 )
 @click.option(
-    "--max-text-width",
-    type=int,
-    help="The max number of characters in a segment before creating new lines in pretty mode.",
-)
-@click.option(
-    "--check",
+    "--append-newline",
     is_flag=True,
-    help="Whether or not to check formatting (but not actually format anything).",
-    default=None,
+    help="Include a newline at the end of each file.",
 )
+@opt.format_options
 @click.pass_context
 @error_handler
 @cli_analytics
@@ -320,9 +300,6 @@ def format(
     ctx: click.Context, paths: t.Optional[t.Tuple[str, ...]] = None, **kwargs: t.Any
 ) -> None:
     """Format all SQL models and audits."""
-    if kwargs.pop("no_rewrite_casts", None):
-        kwargs["rewrite_casts"] = False
-
     if not ctx.obj.format(**{k: v for k, v in kwargs.items() if v is not None}, paths=paths):
         ctx.exit(1)
 

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/sqlmesh/cli/options.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import typing as t
 
 import click
 
@@ -54,3 +55,38 @@ verbose = click.option(
     count=True,
     help="Verbose output. Use -vv for very verbose output.",
 )
+
+
+def format_options(func: t.Callable) -> t.Callable:
+    """Decorator to add common format options to CLI commands."""
+    func = click.option(
+        "--normalize",
+        is_flag=True,
+        help="Whether or not to normalize identifiers to lowercase.",
+    )(func)
+    func = click.option(
+        "--pad",
+        type=int,
+        help="Determines the pad size in a formatted string.",
+    )(func)
+    func = click.option(
+        "--indent",
+        type=int,
+        help="Determines the indentation size in a formatted string.",
+    )(func)
+    func = click.option(
+        "--normalize-functions",
+        type=str,
+        help="Whether or not to normalize all function names. Possible values are: 'upper', 'lower'",
+    )(func)
+    func = click.option(
+        "--leading-comma",
+        is_flag=True,
+        help="Determines whether or not the comma is leading or trailing in select expressions. Default is trailing.",
+    )(func)
+    func = click.option(
+        "--max-text-width",
+        type=int,
+        help="The max number of characters in a segment before creating new lines in pretty mode.",
+    )(func)
+    return func

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/sqlmesh/magics.py

@@ -93,6 +93,43 @@ def pass_sqlmesh_context(func: t.Callable) -> t.Callable:
     return wrapper
 
 
+def format_arguments(func: t.Callable) -> t.Callable:
+    """Decorator to add common format arguments to magic commands."""
+    func = argument(
+        "--normalize",
+        action="store_true",
+        help="Whether or not to normalize identifiers to lowercase.",
+        default=None,
+    )(func)
+    func = argument(
+        "--pad",
+        type=int,
+        help="Determines the pad size in a formatted string.",
+    )(func)
+    func = argument(
+        "--indent",
+        type=int,
+        help="Determines the indentation size in a formatted string.",
+    )(func)
+    func = argument(
+        "--normalize-functions",
+        type=str,
+        help="Whether or not to normalize all function names. Possible values are: 'upper', 'lower'",
+    )(func)
+    func = argument(
+        "--leading-comma",
+        action="store_true",
+        help="Determines whether or not the comma is leading or trailing in select expressions. Default is trailing.",
+        default=None,
+    )(func)
+    func = argument(
+        "--max-text-width",
+        type=int,
+        help="The max number of characters in a segment before creating new lines in pretty mode.",
+    )(func)
+    return func
+
+
 @magics_class
 class SQLMeshMagics(Magics):
     @property
@@ -579,23 +616,39 @@ class SQLMeshMagics(Magics):
     )
     @argument("--dialect", type=str, help="SQL dialect to render.")
     @argument("--no-format", action="store_true", help="Disable fancy formatting of the query.")
+    @format_arguments
     @line_magic
     @pass_sqlmesh_context
     def render(self, context: Context, line: str) -> None:
         """Renders a model's query, optionally expanding referenced models."""
         context.refresh()
-        args = parse_argstring(self.render, line)
+        render_opts = vars(parse_argstring(self.render, line))
+        model = render_opts.pop("model")
+        dialect = render_opts.pop("dialect", None)
 
         query = context.render(
-            args.model,
-            start=args.start,
-            end=args.end,
-            execution_time=args.execution_time,
-            expand=args.expand,
+            model,
+            start=render_opts.pop("start", None),
+            end=render_opts.pop("end", None),
+            execution_time=render_opts.pop("execution_time", None),
+            expand=render_opts.pop("expand", False),
         )
 
-        sql = query.sql(pretty=True, dialect=args.dialect or context.config.dialect)
-        if args.no_format:
+        no_format = render_opts.pop("no_format", False)
+
+        format_config = context.config_for_node(model).format
+        format_options = {
+            **format_config.generator_options,
+            **{k: v for k, v in render_opts.items() if v is not None},
+        }
+
+        sql = query.sql(
+            pretty=True,
+            dialect=context.config.dialect if dialect is None else dialect,
+            **format_options,
+        )
+
+        if no_format:
             context.console.log_status_update(sql)
         else:
             context.console.show_sql(sql)
@@ -853,55 +906,24 @@ class SQLMeshMagics(Magics):
         help="Transpile project models to the specified dialect.",
     )
     @argument(
-        "--append-newline",
-        action="store_true",
-        help="Whether or not to append a newline to the end of the file.",
-        default=None,
-    )
-    @argument(
-        "--no-rewrite-casts",
-        action="store_true",
-        help="Whether or not to preserve the existing casts, without rewriting them to use the :: syntax.",
-        default=None,
-    )
-    @argument(
-        "--normalize",
+        "--check",
         action="store_true",
-        help="Whether or not to normalize identifiers to lowercase.",
+        help="Whether or not to check formatting (but not actually format anything).",
         default=None,
     )
     @argument(
-        "--pad",
-        type=int,
-        help="Determines the pad size in a formatted string.",
-    )
-    @argument(
-        "--indent",
-        type=int,
-        help="Determines the indentation size in a formatted string.",
-    )
-    @argument(
-        "--normalize-functions",
-        type=str,
-        help="Whether or not to normalize all function names. Possible values are: 'upper', 'lower'",
-    )
-    @argument(
-        "--leading-comma",
+        "--append-newline",
         action="store_true",
-        help="Determines whether or not the comma is leading or trailing in select expressions. Default is trailing.",
+        help="Include a newline at the end of the output.",
         default=None,
     )
     @argument(
-        "--max-text-width",
-        type=int,
-        help="The max number of characters in a segment before creating new lines in pretty mode.",
-    )
-    @argument(
-        "--check",
+        "--no-rewrite-casts",
         action="store_true",
-        help="Whether or not to check formatting (but not actually format anything).",
+        help="Preserve the existing casts, without rewriting them to use the :: syntax.",
         default=None,
     )
+    @format_arguments
     @line_magic
     @pass_sqlmesh_context
     def format(self, context: Context, line: str) -> bool:

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.194.2.dev9
+Version: 0.194.2.dev10
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/tests/cli/test_cli.py

@@ -1791,3 +1791,35 @@ def test_table_diff_schema_diff_ignore_case(runner: CliRunner, tmp_path: Path):
     assert result.exit_code == 0
     stripped_output = "".join((x for x in result.output if x in string.printable))
     assert "Schema Diff Between 'T1' and 'T2':\n Schemas match" in stripped_output
+
+
+def test_render(runner: CliRunner, tmp_path: Path):
+    create_example_project(tmp_path)
+
+    ctx = Context(paths=tmp_path)
+
+    result = runner.invoke(
+        cli,
+        [
+            "--paths",
+            str(tmp_path),
+            "render",
+            "sqlmesh_example.full_model",
+            "--max-text-width",
+            "10",
+        ],
+    )
+    assert result.exit_code == 0
+
+    cleaned_output = "\n".join(l.rstrip(" ") for l in result.output.split("\n"))
+    expected = """SELECT
+  "incremental_model"."item_id" AS "item_id",
+  COUNT(
+    DISTINCT "incremental_model"."id"
+  ) AS "num_orders"
+FROM "db"."sqlmesh_example"."incremental_model" AS "incremental_model"
+GROUP BY
+  "incremental_model"."item_id"
+"""
+
+    assert expected in cleaned_output

{sqlmesh-0.194.2.dev9 → sqlmesh-0.194.2.dev10}/tests/core/test_dialect.py

@@ -207,7 +207,7 @@ SELECT
         parse(
             """
             MODEL(name foo);
-            SELECT 1::INT AS bla
+            SELECT CAST(1 AS INT) AS bla
             """
         ),
         rewrite_casts=False,