execsql2 2.29.0__tar.gz → 2.31.1__tar.gz

execsql2-2.31.1/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,57 @@
+name: Bug report
+description: Something execsql does wrong, from the command line, the library, or an editor.
+labels: [bug]
+body:
+  - type: textarea
+    id: what
+    attributes:
+      label: What happened
+      description: What you ran, what you expected, and what happened instead.
+      placeholder: |
+        `execsql run load.sql prod.db -t l` stopped at line 12 with ...
+        I expected ...
+    validations:
+      required: true
+  - type: textarea
+    id: script
+    attributes:
+      label: A script that shows it
+      description: The smallest script that reproduces the problem, if you can share one. Leave out data and credentials.
+      render: sql
+  - type: textarea
+    id: output
+    attributes:
+      label: Error output
+      description: The full message or traceback, and the end of `execsql.log` if the run wrote one.
+      render: text
+  - type: input
+    id: version
+    attributes:
+      label: execsql version
+      description: The output of `execsql --version`.
+      placeholder: execsql 2.30.0
+    validations:
+      required: true
+  - type: input
+    id: install
+    attributes:
+      label: How execsql is installed
+      description: The command, with its extras.
+      placeholder: uv tool install "execsql2[postgres,lsp]"
+    validations:
+      required: true
+  - type: input
+    id: environment
+    attributes:
+      label: Operating system, Python and database
+      placeholder: macOS 15, Python 3.12, PostgreSQL 16
+    validations:
+      required: true
+  - type: textarea
+    id: editor
+    attributes:
+      label: Editor and language server (only for a problem in an editor)
+      description: |
+        The editor and the execsql extension's version, the output of `execsql lsp --check`, and the server's log
+        at `info` (VS Code: View → Output → execsql). See https://execsql2.readthedocs.io/en/stable/guides/editors/#troubleshooting
+      render: text

execsql2-2.31.1/.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,28 @@
+name: Feature request
+description: A new feature, metacommand or option, or a change to how something works.
+labels: [enhancement]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: The problem
+      description: What you are trying to do, and what gets in the way today.
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: What you would like
+      description: For a new metacommand or CLI option, the syntax you would expect.
+      placeholder: "-- !x! NEW_METACOMMAND ..."
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives and workarounds
+      description: What you tried instead, if anything.
+  - type: textarea
+    id: context
+    attributes:
+      label: Anything else

{execsql2-2.29.0 → execsql2-2.31.1}/.github/workflows/ci-cd.yml

@@ -44,32 +44,13 @@ jobs:
             - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
               with:
                   python-version: "3.13"
-            - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7  # v10.2.0
+            - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884  # v10.3.0
             # The environment `just setup` builds: mypy and the packages it
             # type-checks against come from uv.lock, so CI and local runs agree.
             # --locked also fails the job when uv.lock is out of date.
             - run: uv sync --locked --all-extras
             - run: uv run --no-sync mypy src/execsql/
 
-    formatter-corpus:
-        name: formatter-corpus
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-        steps:
-            - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
-            - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
-              with:
-                  python-version: "3.13"
-                  cache: "pip"
-            - run: python -m pip install --upgrade pip
-            - run: python -m pip install ".[dev]"
-            # Every formatter bug to date came from real SQL containing a
-            # construct the project's own scripts lack.  This gate runs those
-            # checks under their own name so a corpus failure is legible
-            # without reading a 6,000-test log.
-            - run: pytest tests/test_format.py -k corpus --no-cov -q
-
     typer-floor:
         name: typer-floor
         runs-on: ubuntu-latest
@@ -89,7 +70,7 @@ jobs:
             - run: |
                   floor=$(grep -oP '"typer>=\K[0-9.]+' pyproject.toml)
                   echo "Typer floor: $floor"
-                  python -m pip install ".[dev]" "typer==$floor"
+                  python -m pip install ".[formats,formatter,lsp]" --group dev "typer==$floor"
             - run: pytest tests/cli --no-cov -q
 
     pre-commit:
@@ -104,7 +85,7 @@ jobs:
                   python-version: "3.13"
                   cache: "pip"
             - run: python -m pip install --upgrade pip
-            - run: python -m pip install ".[dev]"
+            - run: python -m pip install ".[formats,formatter,lsp]" --group dev
             # mypy runs in the dedicated typecheck job; the local hook needs uv
             - run: pre-commit run --all-files
               env:
@@ -117,7 +98,7 @@ jobs:
             contents: read
         steps:
             - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
-            - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020  # v7.0.0
+            - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1  # v7.1.0
               with:
                   node-version: "22"
             # Dependencies come from the committed package-lock.json, and no
@@ -125,18 +106,23 @@ jobs:
             - name: Install dependencies
               working-directory: extras/vscode-execsql
               run: npm ci --ignore-scripts --no-audit --no-fund
-            # A release's extension carries the release's version (VS Code
-            # versions are X.Y.Z, so a pre-release suffix is dropped).
-            - name: Set the extension version from the tag
+            # bump-my-version writes the release's version into package.json
+            # (2.31.0rc1 as 2.31.0-rc.1); a tag on a commit where it differs
+            # would attach an extension with another version.
+            - name: Check the extension version matches the tag
               if: startsWith(github.ref, 'refs/tags/v')
               working-directory: extras/vscode-execsql
               run: |
-                  version="$(echo "${GITHUB_REF_NAME#v}" | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+')"
-                  npm pkg set version="$version"
+                  expected="$(echo "${GITHUB_REF_NAME#v}" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+)(a|b|rc)([0-9]+)$/\1-\2.\3/')"
+                  actual="$(node -p "require('./package.json').version")"
+                  if [ "$expected" != "$actual" ]; then
+                      echo "::error::extras/vscode-execsql/package.json has version $actual; the tag $GITHUB_REF_NAME needs $expected"
+                      exit 1
+                  fi
             - name: Package the .vsix
               working-directory: extras/vscode-execsql
               run: ./node_modules/.bin/vsce package --out "../../execsql-syntax.vsix"
-            - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+            - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
               with:
                   name: vscode-extension
                   path: execsql-syntax.vsix
@@ -153,9 +139,10 @@ jobs:
                   python-version: "3.13"
                   cache: "pip"
             - run: python -m pip install --upgrade pip
-            - run: python -m pip install ".[dev]"
+            - run: python -m pip install ".[formats,formatter,lsp]" --group dev
             - run: cp CHANGELOG.md docs/about/change_log.md
-            - run: zensical build
+            # --strict: a warning, such as a link to an #anchor that does not exist, fails the job.
+            - run: zensical build --strict
 
     tests:
         strategy:
@@ -194,7 +181,7 @@ jobs:
               run: |
                   python -m pip install --upgrade pip
                   python -m pip install tox
-                  python -m pip install ".[dev]"
+                  python -m pip install ".[formats,formatter,lsp]" --group dev
             - name: Install tkinter (Ubuntu)
               if: runner.os == 'Linux'
               run: sudo apt-get install -y python3-tk
@@ -254,6 +241,17 @@ jobs:
                 options: >-
                     --health-cmd "mysqladmin ping" --health-interval 10s
                     --health-timeout 5s --health-retries 5
+            mariadb:
+                # The md_ templates were written for MariaDB and differ from
+                # MySQL 8 in what SQL they accept; tests/templates runs on both.
+                image: mariadb:11
+                env:
+                    MARIADB_ROOT_PASSWORD: root
+                ports:
+                    - 3307:3306
+                options: >-
+                    --health-cmd "healthcheck.sh --connect --innodb_initialized"
+                    --health-interval 10s --health-timeout 5s --health-retries 5
             sqlserver:
                 image: mcr.microsoft.com/mssql/server:2022-latest
                 env:
@@ -293,13 +291,16 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
-                  python -m pip install ".[dev,postgres,mysql,mssql,upsert]"
+                  python -m pip install ".[formats,formatter,lsp,postgres,mysql,mssql,upsert]" --group dev
             - name: Run subprocess integration tests
               run: |
                   python -m pytest tests/integration/test_postgres.py tests/integration/test_mysql.py -v --override-ini="addopts="
             - name: Run in-process DB adapter tests with 86% coverage floor
               env:
                   DISPLAY: ""
+                  # The SQL Server tests fail here instead of skipping when the
+                  # adapter cannot connect.
+                  EXECSQL_MSSQL_REQUIRED: "1"
               run: |
                   python -m pytest --cov=execsql --cov-branch --cov-report=xml --cov-fail-under=86
             - name: Upload coverage to Codecov
@@ -354,7 +355,7 @@ jobs:
               if: steps.install_access.outcome == 'success'
               run: |
                   python -m pip install --upgrade pip
-                  python -m pip install ".[dev,odbc]" pywin32
+                  python -m pip install ".[formats,formatter,lsp,odbc]" --group dev pywin32
               shell: pwsh
             - name: Run Access real-driver tests
               # Gating: a real regression in src/execsql/db/access.py blocks
@@ -369,7 +370,7 @@ jobs:
     build:
         name: Build distribution 📦
         runs-on: ubuntu-latest
-        needs: [ lint, typecheck, pre-commit, formatter-corpus, typer-floor, docs, tests, integration-tests, vscode-extension ]
+        needs: [ lint, typecheck, pre-commit, typer-floor, docs, tests, integration-tests, vscode-extension ]
         # Deliberately NOT gated on tags: packaging breaks must surface on a PR,
         # not at release time. Only publish/generate-release below are tag-gated.
         permissions:
@@ -391,6 +392,11 @@ jobs:
                       echo "::error::Tag $GITHUB_REF_NAME does not match project.version $version in pyproject.toml"
                       exit 1
                   fi
+            - name: Check CHANGELOG.md has the release notes
+              # The GitHub Release body is this section; a missing one would
+              # only surface after the PyPI upload.
+              if: startsWith(github.ref, 'refs/tags/v')
+              run: python scripts/release_notes.py "$GITHUB_REF_NAME" > /dev/null
             - name: Build sdist + wheel
               run: |
                   python -m pip install --upgrade pip
@@ -403,7 +409,7 @@ jobs:
                   python -m build --sdist --wheel --outdir dist/
                   python -m twine check dist/*
             - name: Upload dist artifact
-              uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+              uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
               with:
                   name: ${{ github.event.repository.name }}
                   path: dist/
@@ -421,7 +427,7 @@ jobs:
             contents: read
         steps:
             - name: Download dist
-              uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
+              uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
               with:
                   name: ${{ github.event.repository.name }}
                   path: dist/
@@ -443,12 +449,12 @@ jobs:
             - name: Checkout
               uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
             - name: Download dist
-              uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
+              uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
               with:
                   name: ${{ github.event.repository.name }}
                   path: dist/
             - name: Download the VS Code extension
-              uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
+              uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
               with:
                   name: vscode-extension
                   path: dist/
@@ -462,11 +468,13 @@ jobs:
                   else
                       echo "prerelease=false" >> "$GITHUB_OUTPUT"
                   fi
+            - name: Release notes from CHANGELOG.md
+              run: python3 scripts/release_notes.py "$GITHUB_REF_NAME" > release-notes.md
             - name: Create release
               uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64  # v3.0.3
               with:
                   draft: false
                   prerelease: ${{ steps.tag.outputs.prerelease }}
-                  generate_release_notes: true
+                  body_path: release-notes.md
                   files: |
                       dist/*

{execsql2-2.29.0 → execsql2-2.31.1}/.gitignore

@@ -36,6 +36,7 @@ htmlcov/
 execsql.log
 scripts/*
 !scripts/generate_vscode_grammar.py
+!scripts/release_notes.py
 !scripts/benchmarks/
 !tests/scripts
 

{execsql2-2.29.0 → execsql2-2.31.1}/.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: gitleaks
   # uv lockfile management
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.12.23
+    rev: 0.13.0
     hooks:
       - id: uv-lock
   # Base hooks
@@ -64,13 +64,13 @@ repos:
         args: [--disable, MD013]
   # Spell check
   - repo: https://github.com/crate-ci/typos
-    rev: v1.51.0
+    rev: v1.51.1
     hooks:
       - id: typos
         args: [--force-exclude]
   # Lint & format with ruff
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.10
+    rev: v0.17.0
     hooks:
       - id: ruff-check
         args: [--config=pyproject.toml, --exit-non-zero-on-fix]

{execsql2-2.29.0 → execsql2-2.31.1}/.readthedocs.yaml

@@ -9,8 +9,9 @@ build:
     python: "3.13"
   jobs:
     install:
-      - pip install "zensical==0.0.67" mkdocstrings-python
-      - pip install -e .
+      # The `docs` dependency group in pyproject.toml, the same pins CI builds with.
+      - pip install --upgrade pip
+      - pip install -e . --group docs
     pre_build:
       - cp CHANGELOG.md docs/about/change_log.md
     build: