sqlmesh 0.194.2.dev9__py3-none-any.whl → 0.194.2.dev11__py3-none-any.whl

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.dev11'
+__version_tuple__ = version_tuple = (0, 194, 2, 'dev11')

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/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/core/dialect.py

@@ -346,12 +346,14 @@ def _parse_select(
     table: bool = False,
     parse_subquery_alias: bool = True,
     parse_set_operation: bool = True,
+    consume_pipe: bool = True,
 ) -> t.Optional[exp.Expression]:
     select = self.__parse_select(  # type: ignore
         nested=nested,
         table=table,
         parse_subquery_alias=parse_subquery_alias,
         parse_set_operation=parse_set_operation,
+        consume_pipe=consume_pipe,
     )
 
     if (

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.dist-info → sqlmesh-0.194.2.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.194.2.dev9
+Version: 0.194.2.dev11
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License
@@ -233,7 +233,7 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot[rs]~=26.29.0
+Requires-Dist: sqlglot[rs]~=26.30.0
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.194.2.dev9.dist-info → sqlmesh-0.194.2.dev11.dist-info}/RECORD

@@ -1,21 +1,21 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=ROnxoSchqF5Mlj88PjpE5GRJwgCe1mrGEpio2fy4Z08,528
-sqlmesh/magics.py,sha256=ysPC5ohXpgQ8IHQPwtQtwGoVypmVq_YBlm1noUueDIw,40448
+sqlmesh/_version.py,sha256=MNQTsCYy-w7J4BscaAPLUKS1LdzZ-X95OrTOYfZBTr8,530
+sqlmesh/magics.py,sha256=d7udR_sieKWzp_YXNFPA2O173xDCqk6u9CIKB7Skb2c,41206
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/bot.py,sha256=2zlbn-DXkqQzr3lA0__IGU4XaIfXBXBKLWXNI2DRJX8,759
 sqlmesh/cicd/config.py,sha256=mpgkisSBBovlNrNZir2unT8Wes6b38RW2UsU_o4e8vY,109
 sqlmesh/cli/__init__.py,sha256=MAXAyO7isbyM-PaSdFjkJNcjn32WjOl0XzxT5gvp_vo,1690
 sqlmesh/cli/example_project.py,sha256=QAFQbw_kzqn30GLTthqsuWXbFDBpX8W6RsCgQ-jx65M,9308
-sqlmesh/cli/main.py,sha256=CM97CwI_DkrcE6TfJOwpiAaheYDr8WE7Tl-8asgV-Yw,33845
-sqlmesh/cli/options.py,sha256=aC_L5WnMScKzMU55BD1Y-8R-QzqCkPSYrlCI-payHRA,1333
+sqlmesh/cli/main.py,sha256=wo5_057ofKgB6D32bl6zBCNZDKwBSXrZv5IzGpRnB3o,33179
+sqlmesh/cli/options.py,sha256=-4ZclMIeIg8tghLowtmQNmpEFlm0QtOVEh40NqRdFHA,2499
 sqlmesh/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/core/_typing.py,sha256=e1f7xO2aZCy38M_3VoDy-XI3shyd99-IFctgIFSgXWM,497
 sqlmesh/core/console.py,sha256=pMIkBjaigneVqGkoGxOKVmT423RPfbDKX8TQ8D1SzpU,153466
 sqlmesh/core/constants.py,sha256=gUABXWYgH_XOSbaZAJsR5o1dmA61JDCvBDyxqqXX3LM,2630
 sqlmesh/core/context.py,sha256=jo-qLN33tDXEI7G2_r7inSDAAzQ6H97rFdN3M2z7lk8,118394
 sqlmesh/core/context_diff.py,sha256=TCzM8egBE35DskpouOB-GQM2Qf5iUHWbRgiB5yZ6tzg,21552
-sqlmesh/core/dialect.py,sha256=93cXYVuNoZ9CvJNTVn2Yz7WDOdHINwVXflbn0eZ-p14,49764
+sqlmesh/core/dialect.py,sha256=h9bDZWbVs7SvIBGvlIAxqdWWFOwE2qzpzs7LwNQX7vc,49830
 sqlmesh/core/environment.py,sha256=7DbJX0r5nZRU3LhcgIxbSV-JosQYDjAt3V5Wc2Fpns8,13005
 sqlmesh/core/lineage.py,sha256=zjB0Zfamo2Fja2r5SSZPMbrEKTXr1WjozZPVqvxdybI,3143
 sqlmesh/core/loader.py,sha256=XVUd1UwK8jlJUaZdFBghSslipH2L80YVykjFzdGMCYA,40474
@@ -282,7 +282,7 @@ sqlmesh/utils/pydantic.py,sha256=I898jAFqa3qU6lG2uPpRebVFncOUo8ZrLWM_R3K3DHU,116
 sqlmesh/utils/rich.py,sha256=BpB47G0-JcU41LkGkeGKroexj4NOV5fox4-GOIXPgIc,3545
 sqlmesh/utils/windows.py,sha256=r7Yin4WEwbvH7sKA3hOJtRsclmscNuBeCklCfVPvtQs,611
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.194.2.dev9.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.194.2.dev11.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=w71qWSLmp-xwmVJO8m41k8Rtni3iZlF0hmhiTr-NeCI,5472
 web/client/dist/assets/Audits-sYYNn2gO.js,sha256=zSAKkif2kU0JuPH05xjNYITNPmsbDlvLKUc2-orr8AY,1041
@@ -400,8 +400,8 @@ web/server/api/endpoints/models.py,sha256=ud-lRwriyI_OYg9tZchrBgeiXELiRTLNEodraf
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=OYuQ_4dgbhG9ibTcX1a8mvYgH3ANxw9Fhbb4wg6QWqc,9222
 web/server/api/endpoints/table_diff.py,sha256=SCy3-pr5x6bEEiOaZGCDbiHQhpgxwmnz3Acqa2Ie6jI,2090
-sqlmesh-0.194.2.dev9.dist-info/METADATA,sha256=Fknqrc_KTyWU6dymgfpdeou0Ua8gKcaA6i4X-A-ewX0,26690
-sqlmesh-0.194.2.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.194.2.dev9.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.194.2.dev9.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.194.2.dev9.dist-info/RECORD,,
+sqlmesh-0.194.2.dev11.dist-info/METADATA,sha256=oq74Uag6ssiJ86MvYiKIxlOyrCeQLWxuEJI98oMSQ54,26691
+sqlmesh-0.194.2.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.194.2.dev11.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.194.2.dev11.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.194.2.dev11.dist-info/RECORD,,