PR feedback

Author: georgesittas

docs/reference/cli.md

@@ -431,9 +431,6 @@ Options:
                               only they will be expanded as raw queries.
   --dialect TEXT              The SQL dialect to render the query as.
   --no-format                 Disable fancy formatting of the query.
-  --no-rewrite-casts          Preserve the existing casts, without rewriting
-                              them to use the :: syntax.
-  --append-newline            Include a newline at the end of each file.
   --max-text-width INTEGER    The max number of characters in a segment before
                               creating new lines in pretty mode.
   --leading-comma             Determines whether or not the comma is leading

docs/reference/notebook.md

@@ -223,9 +223,6 @@ options:
                         models are expanded as raw queries.
   --dialect DIALECT     SQL dialect to render.
   --no-format           Disable fancy formatting of the query.
-  --no-rewrite-casts    Preserve the existing casts, without rewriting them
-                        to use the :: syntax.
-  --append-newline      Include a newline at the end of the output.
   --normalize           Whether or not to normalize identifiers to lowercase.
   --pad PAD             Determines the pad size in a formatted string.
   --indent INDENT       Determines the indentation size in a formatted string.

sqlmesh/cli/main.py

@@ -215,20 +215,16 @@ def render(
         expand=expand,
     )
 
-    format_options = {}
-    if format_kwargs.get("no_rewrite_casts"):
-        format_options["rewrite_casts"] = False
-        format_kwargs.pop("no_rewrite_casts")
-
-    format_options.update({k: v for k, v in format_kwargs.items() if v is not None})
-
     format_config = ctx.obj.config_for_node(model).format
-    format_options = {**format_config.generator_options, **format_options}
+    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_options,
+        **format_kwargs,
     )
     if no_format:
         print(sql)
@@ -285,6 +281,17 @@ def evaluate(
     help="Whether or not to check formatting (but not actually format anything).",
     default=None,
 )
+@click.option(
+    "--rewrite-casts/--no-rewrite-casts",
+    is_flag=True,
+    help="Rewrite casts to use the :: syntax.",
+    default=None,
+)
+@click.option(
+    "--append-newline",
+    is_flag=True,
+    help="Include a newline at the end of each file.",
+)
 @opt.format_options
 @click.pass_context
 @error_handler
@@ -293,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/cli/options.py

@@ -63,7 +63,6 @@ def format_options(func: t.Callable) -> t.Callable:
         "--normalize",
         is_flag=True,
         help="Whether or not to normalize identifiers to lowercase.",
-        default=None,
     )(func)
     func = click.option(
         "--pad",
@@ -84,23 +83,10 @@ def format_options(func: t.Callable) -> t.Callable:
         "--leading-comma",
         is_flag=True,
         help="Determines whether or not the comma is leading or trailing in select expressions. Default is trailing.",
-        default=None,
     )(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)
-    func = click.option(
-        "--append-newline",
-        is_flag=True,
-        help="Include a newline at the end of each file.",
-        default=None,
-    )(func)
-    func = click.option(
-        "--no-rewrite-casts",
-        is_flag=True,
-        help="Preserve the existing casts, without rewriting them to use the :: syntax.",
-        default=None,
-    )(func)
     return func

sqlmesh/magics.py

@@ -127,18 +127,6 @@ def format_arguments(func: t.Callable) -> t.Callable:
         type=int,
         help="The max number of characters in a segment before creating new lines in pretty mode.",
     )(func)
-    func = argument(
-        "--append-newline",
-        action="store_true",
-        help="Include a newline at the end of the output.",
-        default=None,
-    )(func)
-    func = argument(
-        "--no-rewrite-casts",
-        action="store_true",
-        help="Preserve the existing casts, without rewriting them to use the :: syntax.",
-        default=None,
-    )(func)
     return func
 
 
@@ -648,15 +636,11 @@ def render(self, context: Context, line: str) -> None:
 
         no_format = render_opts.pop("no_format", False)
 
-        format_options = {}
-        if render_opts.get("no_rewrite_casts"):
-            format_options["rewrite_casts"] = False
-            render_opts.pop("no_rewrite_casts")
-
-        format_options.update({k: v for k, v in render_opts.items() if v is not None})
-
         format_config = context.config_for_node(model).format
-        format_options = {**format_config.generator_options, **format_options}
+        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,
@@ -927,6 +911,18 @@ def rewrite(self, context: Context, line: str, sql: str) -> None:
         help="Whether or not to check formatting (but not actually format anything).",
         default=None,
     )
+    @argument(
+        "--append-newline",
+        action="store_true",
+        help="Include a newline at the end of the output.",
+        default=None,
+    )
+    @argument(
+        "--no-rewrite-casts",
+        action="store_true",
+        help="Preserve the existing casts, without rewriting them to use the :: syntax.",
+        default=None,
+    )
     @format_arguments
     @line_magic
     @pass_sqlmesh_context

tests/core/test_dialect.py

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