Merge branch 'main' into feature/ty

a5chin · web-flow · commit 2d34d4fb7fac · 2026-01-07T16:39:48.000+09:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -14,6 +14,7 @@
             "extensions": [
                 "astral-sh.ty",
                 "charliermarsh.ruff",
+                "dorzey.vscode-sqlfluff",
                 "exiasr.hadolint",
                 "kevinrose.vsc-python-indent",
                 "mosapride.zenkaku",
diff --git a/.dockerignore b/.dockerignore
@@ -182,6 +182,7 @@ pytest-coverage.txt
 .coveragerc
 .env.local
 .pre-commit-config.yaml
+.sqlfluff
 assets
 LICENSE
 noxfile.py
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -6,7 +6,9 @@ on:
       - ".github/actions/setup-python-with-uv/action.yml"
       - ".github/workflows/format.yml"
       - "**.py"
+      - "**.sql"
       - ".python-version"
+      - ".sqlfluff"
       - "pyproject.toml"
       - "ruff.toml"
       - "uv.lock"
@@ -23,4 +25,17 @@ jobs:
         uses: ./.github/actions/setup-python-with-uv
 
       - name: Format by Ruff
-        run: uv run nox -s fmt
+        run: uv run nox -s fmt -- --ruff
+
+  sqlfluff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python with uv
+        uses: ./.github/actions/setup-python-with-uv
+
+      - name: Format by SQLFluff
+        run: uv run nox -s fmt -- --sqlfluff
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,7 +6,9 @@ on:
       - ".github/actions/setup-python-with-uv/action.yml"
       - ".github/workflows/lint.yml"
       - "**.py"
+      - "**.sql"
       - ".python-version"
+      - ".sqlfluff"
       - "pyproject.toml"
       - "ruff.toml"
       - "ty.toml"
@@ -26,6 +28,19 @@ jobs:
       - name: Lint by Ruff
         run: uv run nox -s lint -- --ruff
 
+  sqlfluff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python with uv
+        uses: ./.github/actions/setup-python-with-uv
+
+      - name: Lint by SQLFluff
+        run: uv run nox -s lint -- --sqlfluff
+
   ty:
     runs-on: ubuntu-latest
 
@@ -37,4 +52,4 @@ jobs:
         uses: ./.github/actions/setup-python-with-uv
 
       - name: Lint by ty
-        run: uv run nox -s lint -- --ty
+        run: uv run nox -s lint -- --ty
diff --git a/.github/workflows/publish-app.yml b/.github/workflows/publish-app.yml
@@ -49,14 +49,14 @@ jobs:
             type=sha,prefix={{branch}}-
             type=raw,value=latest,enable={{is_default_branch}}
           labels: |
-            maintainer=a5chin <a5chin.origin+contact@gmain.com>
+            maintainer=a5chin <a5chin.origin+contact@gmail.com>
             org.opencontainers.image.url=https://github.com/${{ github.repository }}
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.vendor=a5chin <a5chin.origin+contact@gmain.com>
+            org.opencontainers.image.vendor=a5chin <a5chin.origin+contact@gmail.com>
             org.opencontainers.image.title=python-uv
             org.opencontainers.image.description=App for Python development with uv-based dependency management and environment configuration.
             org.opencontainers.image.documentation=https://a5chin.github.io/python-uv/
-            org.opencontainers.image.authors=a5chin <a5chin.origin+contact@gmain.com>
+            org.opencontainers.image.authors=a5chin <a5chin.origin+contact@gmail.com>
             org.opencontainers.image.licenses=MIT
 
       - name: Build and Push App Image
diff --git a/.github/workflows/publish-devcontainer.yml b/.github/workflows/publish-devcontainer.yml
@@ -49,14 +49,14 @@ jobs:
             type=sha,prefix={{branch}}-
             type=raw,value=latest,enable={{is_default_branch}}
           labels: |
-            maintainer=a5chin <a5chin.origin+contact@gmain.com>
+            maintainer=a5chin <a5chin.origin+contact@gmail.com>
             org.opencontainers.image.url=https://github.com/${{ github.repository }}
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.vendor=a5chin <a5chin.origin+contact@gmain.com>
+            org.opencontainers.image.vendor=a5chin <a5chin.origin+contact@gmail.com>
             org.opencontainers.image.title=python-uv
             org.opencontainers.image.description=Dev Container for Python development with uv-based dependency management and environment configuration.
             org.opencontainers.image.documentation=https://a5chin.github.io/python-uv/
-            org.opencontainers.image.authors=a5chin <a5chin.origin+contact@gmain.com>
+            org.opencontainers.image.authors=a5chin <a5chin.origin+contact@gmail.com>
             org.opencontainers.image.licenses=MIT
 
       - name: Build and Push Devcontainer Image
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -62,5 +62,18 @@ repos:
         types: ["dockerfile"]
         entry: hadolint
 
+  - repo: https://github.com/sqlfluff/sqlfluff
+    rev: 3.5.0
+    hooks:
+      - id: sqlfluff-lint
+        name: SQLFluff Lint
+        description: "Lints sql files with `SQLFluff`"
+        types: [sql]
+
+      - id: sqlfluff-fix
+        name: SQLFluff Fix
+        description: "Fixes sql lint errors with `SQLFluff`"
+        types: [sql]
+
 ci:
   autoupdate_schedule: weekly
diff --git a/.sqlfluff b/.sqlfluff
@@ -0,0 +1,14 @@
+[sqlfluff]
+dialect = bigquery
+max_line_length = 80
+
+exclude_rules =
+
+[sqlfluff:indentation]
+tab_space_size = 2
+
+[sqlfluff:rules:ambiguous.join]
+fully_qualify_join_types = both
+
+[sqlfluff:rules:structure.unused_join]
+forbid_unused_join = True
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
@@ -97,9 +97,11 @@
         "spyderproject",
         "spyproject",
         "sqlalchemy",
+        "sqlfluff",
         "stmts",
         "superfences",
         "tamasfe",
+        "templater",
         "testpaths",
         "timemachine",
         "toolsai",
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,6 +3,7 @@
         "astral-sh.ty",
         "charliermarsh.ruff",
         "codezombiech.gitignore",
+        "dorzey.vscode-sqlfluff",
         "eamodio.gitlens",
         "exiasr.hadolint",
         "kevinrose.vsc-python-indent",
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,6 +14,10 @@
         "tests"
     ],
     "python.testing.unittestEnabled": false,
+    "sqlfluff.config": "${workspaceFolder}/.sqlfluff",
+    "sqlfluff.executablePath": "/home/vscode/.venv/bin/sqlfluff",
+    "sqlfluff.format.enabled": true,
+    "sqlfluff.linter.run": "onType",
     "terminal.integrated.defaultProfile.linux": "zsh",
     "terminal.integrated.profiles.linux": {
         "zsh": {
@@ -62,6 +66,11 @@
         "editor.formatOnSave": true,
         "editor.tabSize": 4
     },
+    "[sql]": {
+        "editor.defaultFormatter": "dorzey.vscode-sqlfluff",
+        "editor.formatOnSave": true,
+        "editor.tabSize": 2
+    },
     "[toml]": {
         "editor.defaultFormatter": "tamasfe.even-better-toml",
         "editor.formatOnSave": true,
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -42,22 +42,35 @@ uv run pytest
 
 ### Linting & Formatting
 ```bash
-# Format code
-uv run nox -s fmt
+# Format code with Ruff
+uv run nox -s fmt -- --ruff
 
-# Lint with both ty and Ruff
-uv run nox -s lint -- --ruff --ty
+# Format SQL files with SQLFluff
+uv run nox -s fmt -- --sqlfluff
 
-# Lint with ty only
-uv run nox -s lint -- --ty
+# Format both Python and SQL
+uv run nox -s fmt -- --ruff --sqlfluff
+
+# Lint with all tools (Ruff, SQLFluff, ty)
+uv run nox -s lint -- --pyright --ruff --sqlfluff
 
 # Lint with Ruff only
 uv run nox -s lint -- --ruff
 
+# Lint SQL files only
+uv run nox -s lint -- --sqlfluff
+
+# Lint with ty only
+uv run nox -s lint -- --ty
+
 # Run Ruff directly
 uv run ruff check . --fix
 uv run ruff format .
 
+# Run SQLFluff directly
+uv run sqlfluff lint .
+uv run sqlfluff fix .
+
 # Run ty directly
 uv run ty check
 ```
@@ -163,6 +176,12 @@ Tests in `tests/tools/` mirror the package structure:
 - Reports: HTML + terminal
 - Import mode: importlib
 
+**SQLFluff (.sqlfluff)**:
+- Dialect: BigQuery
+- Max line length: 80
+- Tab space size: 2
+- Custom rules for join qualification and unused joins
+
 ### Nox Task Automation
 
 The `noxfile.py` uses a custom `CLIArgs` parser (Pydantic-based):
@@ -180,6 +199,8 @@ def lint(session: nox.Session) -> None:
         session.run("uv", "run", "ty", "check")
     if args.ruff:
         session.run("uv", "run", "ruff", "check", ".", "--fix")
+    if args.sqlfluff:
+        session.run("uv", "run", "sqlfluff", "lint", ".")
 ```
 
 ## Key Patterns for Development
diff --git a/docs/configurations/index.md b/docs/configurations/index.md
@@ -8,6 +8,7 @@ The development environment includes configuration files for:
 
 - **uv** - Package management and Python version
 - **Ruff** - Linting and formatting rules
+- **SQLFluff** - Linting and formatting rules for SQL
 - **ty** - Type checking strictness
 - **pytest** - Testing and coverage
 - **pre-commit** - Automated quality checks
@@ -21,6 +22,7 @@ Each tool is configured through dedicated configuration files in the repository
 | `pyproject.toml` | uv, Project | Dependencies and project metadata |
 | `ruff.toml` | Ruff | Linting and formatting rules |
 | `ty.toml` | ty | Type checking configuration |
+| `.sqlfluff` | SQLFluff | SQL linting and formatting rules |
 | `pytest.ini` | pytest | Testing and coverage settings |
 | `.pre-commit-config.yaml` | pre-commit | Hook definitions |
 | `noxfile.py` | nox | Task automation |
@@ -51,6 +53,27 @@ Understand Ruff's linting and formatting rules:
 
 [→ Read full Ruff configuration guide](ruff.md)
 
+### SQLFluff Configuration
+Configure SQL linting and formatting:
+- SQL dialect (BigQuery)
+- Line length (80 characters)
+- Indentation (2 spaces)
+- Custom rules for SQL best practices
+
+**Key file**: `.sqlfluff`
+
+**Quick reference:**
+```bash
+# Lint SQL files
+uv run sqlfluff lint .
+
+# Fix SQL files
+uv run sqlfluff fix .
+
+# Use via nox
+uv run nox -s lint -- --sqlfluff
+```
+
 ### [ty Configuration](ty.md)
 Configure type checking behavior:
 - Include/exclude patterns
diff --git a/docs/configurations/pre-commit.md b/docs/configurations/pre-commit.md
@@ -10,16 +10,30 @@
 - [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit)
     - Ruff Lint
     - Ruff Format
+- [https://github.com/sqlfluff/sqlfluff](https://github.com/sqlfluff/sqlfluff)
+    - SQLFluff Lint
+    - SQLFluff Fix
 - [https://github.com/hadolint/hadolint](https://github.com/hadolint/hadolint)
     - Hadolint
 
 ## Overview
-```{.yaml hl_lines=42-57 title=".pre-commit-config.yaml"}
+```{.yaml title=".pre-commit-config.yaml"}
 default_stages: [pre-commit]
 
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: check-json
+      - id: check-toml
+      - id: check-xml
+      - id: check-yaml
+      - id: detect-private-key
+      - id: trailing-whitespace
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.3
+    rev: v0.12.8
     hooks:
       - id: ruff
         name: Ruff check
@@ -40,6 +54,19 @@ repos:
         types: ["dockerfile"]
         entry: hadolint
 
+  - repo: https://github.com/sqlfluff/sqlfluff
+    rev: 3.5.0
+    hooks:
+      - id: sqlfluff-lint
+        name: SQLFluff Lint
+        description: "Lints sql files with `SQLFluff`"
+        types: [sql]
+
+      - id: sqlfluff-fix
+        name: SQLFluff Fix
+        description: "Fixes sql lint errors with `SQLFluff`"
+        types: [sql]
+
 ci:
   autoupdate_schedule: weekly
 ```
diff --git a/docs/guides/index.md b/docs/guides/index.md
@@ -9,6 +9,7 @@ This template includes several modern Python development tools, each serving a s
 - **uv** - Ultra-fast package management (10-100x faster than pip)
 - **Ruff** - Lightning-fast linting and formatting
 - **ty** - Advanced type checking
+- **SQLFluff** - SQL linting and formatting
 - **pytest** - Comprehensive testing framework
 - **nox** - Task automation and workflow management
 - **pre-commit** - Automated code quality checks
@@ -21,13 +22,17 @@ This template includes several modern Python development tools, each serving a s
 ### Available Sessions
 
 ```bash
-# Format code with Ruff
-uv run nox -s fmt
+# Format code
+uv run nox -s fmt -- --ruff             # Format Python code
+uv run nox -s fmt -- --sqlfluff         # Format SQL code
+uv run nox -s fmt -- --ruff --sqlfluff  # Format both
 
 # Run linters (you can specify which ones)
-uv run nox -s lint -- --ruff --ty  # Both
-uv run nox -s lint -- --ruff       # Ruff only
-uv run nox -s lint -- --ty         # ty only
+uv run nox -s lint -- --ruff --sqlfluff --ty  # All linters
+uv run nox -s lint -- --ruff --ty             # Python only
+uv run nox -s lint -- --ruff                  # Ruff only
+uv run nox -s lint -- --sqlfluff              # SQL only
+uv run nox -s lint -- --ty                    # ty only
 
 # Run tests with coverage (75% minimum required)
 uv run nox -s test
diff --git a/docs/index.md b/docs/index.md
diff --git a/docs/usecases/opencv.md b/docs/usecases/opencv.md
diff --git a/noxfile.py b/noxfile.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/uv.lock b/uv.lock
