Merge branch 'main' of https://github.com/TobikoData/sqlmesh into sung/vscode-env-vars

Author: sungchun12

.circleci/config.yml

@@ -7,14 +7,14 @@ on_main_or_tag_filter: &on_main_or_tag_filter
     branches:
       only: main
     tags:
-      only: /^v.+/
+      only: /^v\d+\.\d+\.\d+/
 
 on_tag_filter: &on_tag_filter
   filters:
     branches:
       ignore: /.*/
     tags:
-      only: /^v.+/
+      only: /^v\d+\.\d+\.\d+/
 
 orbs:
   path-filtering: circleci/[email protected]

.github/workflows/release_extension.yaml

@@ -0,0 +1,44 @@
+name: Release VSCode Extension
+on:
+  push:
+    tags:
+      - 'vscode@v*'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 10
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Extract version from tag
+        id: extract_version
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/vscode@v}
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+      - name: Update package.json version
+        working-directory: vscode/extension
+        run: |
+          npm version ${{ steps.extract_version.outputs.VERSION }} --no-git-tag-version
+      - name: Install dependencies
+        working-directory: vscode/extension
+        run: pnpm install
+      - name: Run CI
+        run: pnpm run ci
+      - name: Build extension
+        working-directory: vscode/extension
+        run: pnpm run vscode:package
+      - name: Upload extension to Marketplace
+        working-directory: vscode/extension
+        run: |
+          pnpx vsce publish --packagePath sqlmesh-${{ steps.extract_version.outputs.VERSION }}.vsix
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}

sqlmesh/core/linter/definition.py

@@ -8,7 +8,7 @@
 from collections.abc import Iterator, Iterable, Set, Mapping, Callable
 from functools import reduce
 from sqlmesh.core.model import Model
-from sqlmesh.core.linter.rule import Rule, RuleViolation, Range
+from sqlmesh.core.linter.rule import Rule, RuleViolation, Range, Fix
 from sqlmesh.core.console import LinterConsole, get_console
 
 if t.TYPE_CHECKING:
@@ -75,6 +75,7 @@ def lint_model(
                 model=model,
                 violation_type="error",
                 violation_range=violation.violation_range,
+                fixes=violation.fixes,
             )
             for violation in error_violations
         ] + [
@@ -84,6 +85,7 @@ def lint_model(
                 model=model,
                 violation_type="warning",
                 violation_range=violation.violation_range,
+                fixes=violation.fixes,
             )
             for violation in warn_violations
         ]
@@ -152,7 +154,8 @@ def __init__(
         model: Model,
         violation_type: t.Literal["error", "warning"],
         violation_range: t.Optional[Range] = None,
+        fixes: t.Optional[t.List[Fix]] = None,
     ) -> None:
-        super().__init__(rule, violation_msg, violation_range)
+        super().__init__(rule, violation_msg, violation_range, fixes)
         self.model = model
         self.violation_type = violation_type

sqlmesh/core/linter/rule.py

@@ -39,6 +39,22 @@ class Range:
     end: Position
 
 
+@dataclass(frozen=True)
+class TextEdit:
+    """A text edit to apply to a file."""
+
+    range: Range
+    new_text: str
+
+
+@dataclass(frozen=True)
+class Fix:
+    """A fix that can be applied to resolve a rule violation."""
+
+    title: str
+    edits: t.List[TextEdit]
+
+
 class _Rule(abc.ABCMeta):
     def __new__(cls: Type[_Rule], clsname: str, bases: t.Tuple, attrs: t.Dict) -> _Rule:
         attrs["name"] = clsname.lower()
@@ -66,10 +82,14 @@ def violation(
         self,
         violation_msg: t.Optional[str] = None,
         violation_range: t.Optional[Range] = None,
+        fixes: t.Optional[t.List[Fix]] = None,
     ) -> RuleViolation:
         """Create a RuleViolation instance for this rule"""
         return RuleViolation(
-            rule=self, violation_msg=violation_msg or self.summary, violation_range=violation_range
+            rule=self,
+            violation_msg=violation_msg or self.summary,
+            violation_range=violation_range,
+            fixes=fixes,
         )
 
     def get_definition_location(self) -> RuleLocation:
@@ -103,11 +123,16 @@ def __repr__(self) -> str:
 
 class RuleViolation:
     def __init__(
-        self, rule: Rule, violation_msg: str, violation_range: t.Optional[Range] = None
+        self,
+        rule: Rule,
+        violation_msg: str,
+        violation_range: t.Optional[Range] = None,
+        fixes: t.Optional[t.List[Fix]] = None,
     ) -> None:
         self.rule = rule
         self.violation_msg = violation_msg
         self.violation_range = violation_range
+        self.fixes = fixes or []
 
     def __repr__(self) -> str:
         return f"{self.rule.name}: {self.violation_msg}"

sqlmesh/core/linter/rules/builtin.py

@@ -8,7 +8,7 @@
 from sqlglot.helper import subclasses
 
 from sqlmesh.core.linter.helpers import TokenPositionDetails
-from sqlmesh.core.linter.rule import Rule, RuleViolation, Range
+from sqlmesh.core.linter.rule import Rule, RuleViolation, Range, Fix, TextEdit
 from sqlmesh.core.linter.definition import RuleSet
 from sqlmesh.core.model import Model, SqlModel
 
@@ -22,7 +22,8 @@ def check_model(self, model: Model) -> t.Optional[RuleViolation]:
             return None
         if model.query.is_star:
             violation_range = self._get_range(model)
-            return self.violation(violation_range=violation_range)
+            fixes = self._create_fixes(model, violation_range)
+            return self.violation(violation_range=violation_range, fixes=fixes)
         return None
 
     def _get_range(self, model: SqlModel) -> t.Optional[Range]:
@@ -37,6 +38,28 @@ def _get_range(self, model: SqlModel) -> t.Optional[Range]:
 
         return None
 
+    def _create_fixes(
+        self, model: SqlModel, violation_range: t.Optional[Range]
+    ) -> t.Optional[t.List[Fix]]:
+        """Create fixes for the SELECT * violation."""
+        if not violation_range:
+            return None
+        columns = model.columns_to_types
+        if not columns:
+            return None
+        new_text = ", ".join(columns.keys())
+        return [
+            Fix(
+                title="Replace SELECT * with explicit column list",
+                edits=[
+                    TextEdit(
+                        range=violation_range,
+                        new_text=new_text,
+                    )
+                ],
+            )
+        ]
+
 
 class InvalidSelectStarExpansion(Rule):
     def check_model(self, model: Model) -> t.Optional[RuleViolation]:

sqlmesh/core/state_sync/db/environment.py

@@ -172,13 +172,9 @@ def get_expired_environments(self, current_ts: int) -> t.List[EnvironmentSummary
         Returns:
             The list of environment summaries to remove.
         """
-
-        environment_summaries = self.get_environments_summary()
-        return [
-            env_summary
-            for env_summary in environment_summaries
-            if env_summary.expiration_ts is not None and env_summary.expiration_ts <= current_ts
-        ]
+        return self._fetch_environment_summaries(
+            where=self._create_expiration_filter_expr(current_ts)
+        )
 
     def delete_expired_environments(
         self, current_ts: t.Optional[int] = None
@@ -225,13 +221,7 @@ def get_environments_summary(self) -> t.List[EnvironmentSummary]:
         Returns:
             A list of all environment summaries.
         """
-        return [
-            self._environment_summmary_from_row(row)
-            for row in fetchall(
-                self.engine_adapter,
-                self._environments_query(required_fields=list(EnvironmentSummary.all_fields())),
-            )
-        ]
+        return self._fetch_environment_summaries()
 
     def get_environment(
         self, environment: str, lock_for_update: bool = False
@@ -327,6 +317,20 @@ def _create_expiration_filter_expr(self, current_ts: int) -> exp.Expression:
             expression=exp.Literal.number(current_ts),
         )
 
+    def _fetch_environment_summaries(
+        self, where: t.Optional[str | exp.Expression] = None
+    ) -> t.List[EnvironmentSummary]:
+        return [
+            self._environment_summmary_from_row(row)
+            for row in fetchall(
+                self.engine_adapter,
+                self._environments_query(
+                    where=where,
+                    required_fields=list(EnvironmentSummary.all_fields()),
+                ),
+            )
+        ]
+
 
 def _environment_to_df(environment: Environment) -> pd.DataFrame:
     import pandas as pd

sqlmesh/core/state_sync/db/facade.py

@@ -69,10 +69,6 @@
 T = t.TypeVar("T")
 
 
-if t.TYPE_CHECKING:
-    pass
-
-
 class EngineAdapterStateSync(StateSync):
     """Manages state of nodes and snapshot with an existing engine adapter.