Merge branch 'main' into test-local-flag

Author: cmgoffena13

.github/workflows/pr.yaml

@@ -470,6 +470,10 @@ jobs:
           path: vscode/extension/playwright-report/
           retention-days: 30
   test-dbt-versions:
+    needs: changes
+    if:
+      needs.changes.outputs.python == 'true' || needs.changes.outputs.ci ==
+      'true' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.prettierignore

@@ -30,6 +30,7 @@ docs
 examples
 posts
 .circleci
+.github/
 README.md
 mkdocs.yml
 .readthedocs.yaml

CONTRIBUTING.md

@@ -65,10 +65,12 @@ See [docs/development.md](docs/development.md) for full setup instructions. Key
 python -m venv .venv
 source .venv/bin/activate
 make install-dev
-make style    # Run before submitting
+make style     # Run before submitting
 make fast-test # Quick test suite
 ```
 
+Optionally, `make install-pre-commit` installs git hooks so ruff and mypy run on `git commit`. Hooks do not replace `make style`: they run on staged files, while CI runs `make style` across the tree.
+
 ## Coding Standards
 
 - Run `make style` before submitting a pull request

docs/development.md

@@ -42,7 +42,7 @@ Once you have activated your virtual environment, you can install the dependenci
 make install-dev
 ```
 
-Optionally, you can use pre-commit to automatically run linters/formatters:
+Optionally, `make install-pre-commit` installs git hooks so ruff and mypy run on `git commit`. Hooks do not replace `make style`: they run on staged files, while CI runs `make style` across the tree.
 
 ```bash
 make install-pre-commit

package.json

@@ -5,8 +5,8 @@
   },
   "scripts": {
     "ci": "pnpm run lint && pnpm run -r ci",
-    "fmt": "prettier --write .",
-    "fmt:check": "prettier --check .",
+    "fmt": "prettier --write vscode web/client web/common",
+    "fmt:check": "prettier --check vscode web/client web/common",
     "lint": "pnpm run fmt:check && pnpm run -r lint",
     "lint:fix": "pnpm run fmt && pnpm run -r lint:fix"
   },

pnpm-lock.yaml

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
+import hashlib
 import os
 import pathlib
+import secrets
 import sys
 import typing as t
 import time
@@ -20,7 +22,7 @@
 from sqlmesh.core.engine_adapter import SparkEngineAdapter, TrinoEngineAdapter, AthenaEngineAdapter
 from sqlmesh.core.engine_adapter.shared import DataObject
 from sqlmesh.core.model.definition import SqlModel, load_sql_based_model
-from sqlmesh.utils import random_id
+from sqlmesh.utils import ALPHANUMERIC, random_id
 from sqlmesh.utils.date import to_ds
 from sqlmesh.utils.pydantic import PydanticModel
 from tests.utils.pandas import compare_dataframes
@@ -205,7 +207,13 @@ def __init__(
         self.mark = mark
         self.gateway = gateway
         self._columns_to_types = columns_to_types
-        self.test_id = random_id(short=True)
+        # The id is appended to schema names, so it has to keep concurrent test params apart
+        # while staying short: temp table names built from these schemas are already close to
+        # Postgres's 63 character identifier limit. A tag derived from the param guarantees two
+        # params never share a schema, and the random part separates concurrent runs and retries.
+        param_tag = hashlib.sha1(mark.encode()).hexdigest()[:3]
+        random_part = "".join(secrets.choice(ALPHANUMERIC) for _ in range(5))
+        self.test_id = f"{param_tag}{random_part}"
         self._context: t.Optional[Context] = None
         self.is_remote = is_remote
         self._schemas: t.List[

tests/core/engine_adapter/integration/__init__.py

@@ -180,6 +180,6 @@
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.38.0",
     "vitest": "^3.2.4",
-    "yaml": "^2.8.0"
+    "yaml": "^2.9.0"
   }
 }

vscode/extension/package.json

@@ -181,6 +181,6 @@ def _get_file_with_content(file_path: Path, relative_path: str) -> models.File:
 
     return models.File(
         name=file_path.name,
-        path=relative_path,
+        path=str(Path(relative_path).as_posix()),
         content=content,
     )