Extend replace database in query

labs.yml

@@ -9,9 +9,13 @@ commands:
     flags:
       - name: folder
         description: The folder with dashboard files. By default, the current working directory.
+      - name: catalog
+        description: |
+          Overwrite the catalog in the queries' `FROM` clauses with given value. 
+          Useful when developing with seperated catalogs, for example, for production and development.
       - name: database
         description: |
-          Overwrite the database in query with given value. Useful when developing with seperated databases, for 
-          example, for production and development.
+          Overwrite the database in the queries' `FROM` clauses with given value. 
+          Useful when developing with seperated databases, for example, for production and development.
       - name: no-open
         description: Do not open the dashboard in the browser after creating

src/databricks/labs/lsql/cli.py

@@ -1,13 +1,11 @@
-import functools
 import webbrowser
 from pathlib import Path
 
 from databricks.labs.blueprint.cli import App
 from databricks.labs.blueprint.entrypoint import get_logger
 from databricks.sdk import WorkspaceClient
 
-from databricks.labs.lsql import dashboards
-from databricks.labs.lsql.dashboards import Dashboards
+from databricks.labs.lsql.dashboards import DashboardMetadata, Dashboards
 
 logger = get_logger(__file__)
 lsql = App(__file__)
@@ -18,17 +16,18 @@ def create_dashboard(
     w: WorkspaceClient,
     folder: Path = Path.cwd(),
     *,
+    catalog: str = "",
     database: str = "",
     no_open: bool = False,
 ):
     """Create a dashboard from queries"""
     logger.debug("Creating dashboard ...")
     lakeview_dashboards = Dashboards(w)
     folder = Path(folder)
-    replace_database_in_query = None
-    if database:
-        replace_database_in_query = functools.partial(dashboards.replace_database_in_query, database=database)
-    lakeview_dashboard = lakeview_dashboards.create_dashboard(folder, query_transformer=replace_database_in_query)
+    dashboard_metadata = DashboardMetadata.from_path(folder).replace_database(
+        catalog=catalog or None, database=database or None
+    )
+    lakeview_dashboard = lakeview_dashboards.create_dashboard(dashboard_metadata)
     sdk_dashboard = lakeview_dashboards.deploy_dashboard(lakeview_dashboard)
     if not no_open:
         assert sdk_dashboard.dashboard_id is not None