Merge branch 'main' into fix/packaging

Author: jakob1379

.github/workflows/ci.yml

@@ -33,6 +33,17 @@ jobs:
       - name: Verify CLI entry point
         run: uv run python -c "from sqlit.cli import main; print('CLI import OK')"
 
+  nix-flake:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v26
+
+      - name: Build flake package
+        run: nix build .#sqlit
+
   test-unit:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/release.yml

@@ -74,8 +74,14 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Extract version
-        id: version
+      - name: Download dist artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+      - name: Extract version and checksum
+        id: info
         run: |
           if [ -n "${{ github.event.inputs.version }}" ]; then
             echo "VERSION=${{ github.event.inputs.version }}" >> "$GITHUB_OUTPUT"
@@ -110,8 +116,8 @@ jobs:
 
       - name: Update PKGBUILD
         run: |
-          VERSION=${{ steps.version.outputs.VERSION }}
-          CHECKSUM=${{ steps.pypi.outputs.CHECKSUM }}
+          VERSION=${{ steps.info.outputs.VERSION }}
+          CHECKSUM=${{ steps.info.outputs.CHECKSUM }}
 
           cd aur
           sed -i "s/^pkgver=.*/pkgver=${VERSION}/" PKGBUILD
@@ -121,9 +127,9 @@ jobs:
       - name: Publish to AUR
         uses: KSXGitHub/github-actions-deploy-aur@v4
         with:
-          pkgname: python-sqlit-tui
+          pkgname: sqlit
           pkgbuild: ./aur/PKGBUILD
           commit_username: Peter
           commit_email: [email protected]
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to v${{ steps.version.outputs.VERSION }}"
+          commit_message: "Update to v${{ steps.info.outputs.VERSION }}"

.gitignore

@@ -18,21 +18,26 @@ venv/
 .vscode/
 *.swp
 *.swo
+.claude/
 
 # Local caches
 .cache/
+.benchmarks/
+.mypy_cache/
+.pytest_cache/
 .ruff_cache/
 .sqlit/
+.sqlit-config/
 
 # OS
 .DS_Store
 
 # Demo files
-docker-compose.yml
-init.sql
 *.tape
 .tmp/
-demos/drafts/
+docs/demos/drafts/
+infra/docker/docker-compose.yml
+infra/sql/init.sql
 
 # Database files
 *.db
@@ -63,4 +68,5 @@ tests/.env
 
 # Test artifacts
 tests/integration/drivers/artifacts/
+tests/integration/drivers/
 __pycache__/

CONTRIBUTING.md

@@ -15,8 +15,21 @@ Thank you for considering a contribution to sqlit! This guide walks you through
    pip install -e ".[dev]"
    ```
 
+   For the full integration suite (all database drivers):
+   ```bash
+   pip install -e ".[dev,all]"
+   ```
+
 ## Running Tests
 
+### CLI E2E Tests
+
+CLI end-to-end tests run the entrypoint in a subprocess:
+
+```bash
+pytest tests/cli/ -v
+```
+
 ### SQLite Tests (No Docker Required)
 
 SQLite tests can run without any external dependencies:
@@ -27,33 +40,43 @@ pytest tests/ -v -k sqlite
 
 ### Full Test Suite (Requires Docker)
 
-To run the complete test suite including SQL Server, PostgreSQL, MySQL, MariaDB, FirebirdSQL, Oracle, DuckDB, and CockroachDB tests:
+To run the complete test suite including SQL Server, PostgreSQL, MySQL, MariaDB, FirebirdSQL, Oracle, ClickHouse, Turso (libsql), D1 (miniflare), SSH tunnel, DuckDB, CockroachDB, and Flight SQL tests:
 
 1. Start the test database containers:
    ```bash
-   docker compose -f docker-compose.test.yml up -d
+   docker compose -f infra/docker/docker-compose.test.yml up -d
+   ```
+   To include the enterprise test containers (Db2, Trino, Presto, Oracle 11g):
+   ```bash
+   docker compose -f infra/docker/docker-compose.test.yml --profile enterprise up -d
    ```
 
 2. Wait for the databases to be ready (about 30-45 seconds), then run tests:
    ```bash
    pytest tests/ -v
    ```
 
+   To include Docker detection tests that spin up temporary containers:
+   ```bash
+   pytest tests/integration/docker_detect/ -v --run-docker-container
+   ```
+
 You can leave the containers running between test runs - the test fixtures handle database setup/teardown automatically. Stop them when you're done developing:
 
 ```bash
-docker compose -f docker-compose.test.yml down
+docker compose -f infra/docker/docker-compose.test.yml down
 ```
 
 ### Running Tests for Specific Databases
 
 ```bash
-pytest tests/ -v -k sqlite      # SQLite only
-pytest tests/ -v -k mssql       # SQL Server only
-pytest tests/ -v -k PostgreSQL  # PostgreSQL only
-pytest tests/ -v -k MySQL       # MySQL only
-pytest tests/ -v -k cockroach   # CockroachDB only
-pytest tests/ -v -k firebird    # FirebirdSQL only
+pytest tests/ -v -k sqlite
+pytest tests/ -v -k mssql
+pytest tests/ -v -k PostgreSQL
+pytest tests/ -v -k MySQL
+pytest tests/ -v -k cockroach
+pytest tests/ -v -k firebird
+pytest tests/ -v -k flight
 ```
 
 ### Environment Variables
@@ -110,35 +133,57 @@ The database tests can be configured with these environment variables:
 | `AWS_PROFILE` | `default` | AWS CLI profile to use (must be configured in `~/.aws/credentials`) |
 | `AWS_REGION` | `us-east-1` | AWS Region |
 
-### CockroachDB Quickstart (Docker)
-
-1. Start the included CockroachDB container:
-   ```bash
-   docker compose -f docker-compose.test.yml up -d cockroachdb
-   ```
-2. Create a connection (default container runs insecure mode on port `26257` with `root` user):
-   ```bash
-   sqlit connection create \
-     --name "LocalCockroach" \
-     --db-type cockroachdb \
-     --server "localhost" \
-     --port "26257" \
-     --database "defaultdb" \
-     --username "root"
-   ```
-3. Launch sqlit and connect:
-   ```bash
-   sqlit
-   ```
-
-## CI/CD
-
-The project uses GitHub Actions for continuous integration:
+**IBM Db2:**
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `DB2_HOST` | `localhost` | Db2 hostname |
+| `DB2_PORT` | `50000` | Db2 port |
+| `DB2_USER` | `db2inst1` | Db2 username |
+| `DB2_PASSWORD` | `TestPassword123!` | Db2 password |
+| `DB2_DATABASE` | `testdb` | Db2 database name |
 
-- **Build**: Verifies the package builds on Python 3.10-3.13
-- **SQLite Tests**: Runs SQLite integration tests (no external dependencies)
-- **SQL Server Tests**: Runs SQL Server integration tests with Docker service
-- 
+**Trino:**
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `TRINO_HOST` | `localhost` | Trino hostname |
+| `TRINO_PORT` | `8082` | Trino port |
+| `TRINO_USER` | `testuser` | Trino username |
+| `TRINO_PASSWORD` | `` | Trino password |
+| `TRINO_CATALOG` | `memory` | Trino catalog |
+| `TRINO_SCHEMA` | `default` | Trino schema |
+| `TRINO_HTTP_SCHEME` | `http` | Trino HTTP scheme |
+
+**Presto:**
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `PRESTO_HOST` | `localhost` | Presto hostname |
+| `PRESTO_PORT` | `8083` | Presto port |
+| `PRESTO_USER` | `testuser` | Presto username |
+| `PRESTO_PASSWORD` | `` | Presto password |
+| `PRESTO_CATALOG` | `memory` | Presto catalog |
+| `PRESTO_SCHEMA` | `default` | Presto schema |
+| `PRESTO_HTTP_SCHEME` | `http` | Presto HTTP scheme |
+
+**Oracle 11g (Legacy):**
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `ORACLE11G_RUN_TESTS` | `` | Enable Oracle 11g tests when set to `1` |
+| `ORACLE11G_HOST` | `localhost` | Oracle 11g hostname |
+| `ORACLE11G_PORT` | `1522` | Oracle 11g port |
+| `ORACLE11G_USER` | `system` | Oracle 11g username |
+| `ORACLE11G_PASSWORD` | `oracle` | Oracle 11g password |
+| `ORACLE11G_SERVICE` | `XE` | Oracle 11g service name |
+| `ORACLE11G_CLIENT_MODE` | `thick` | Oracle client mode |
+| `ORACLE11G_CLIENT_LIB_DIR` | `` | Oracle Instant Client library directory |
+
+**Flight SQL:**
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `FLIGHT_HOST` | `localhost` | Flight SQL server hostname |
+| `FLIGHT_PORT` | `31337` | Flight SQL server port |
+| `FLIGHT_USER` | `` | Flight SQL username (optional) |
+| `FLIGHT_PASSWORD` | `` | Flight SQL password (optional) |
+| `FLIGHT_DATABASE` | `` | Flight SQL database/catalog (optional) |
 
 ### Vision
 
@@ -217,11 +262,3 @@ sqlit should provide fun and a feeling of mastery and satisfaction for those who
 **Example:**
 <e> = explorer pane, <q> = query pane, <r> = results pane.
 Rationale: E;Q;R satisfies both intuitiveness (each binding is the first letter of the pane), harmony (proximity: qwerty speaks for itself)
-
-- **PostgreSQL Tests**: Runs PostgreSQL integration tests with Docker service
-- **MySQL Tests**: Runs MySQL integration tests with Docker service
-- **Firebird Tests**: Runs Firebird integration tests with Docker service
-- **MariaDB/Oracle/DuckDB/CockroachDB Tests**: Runs the remaining database integration tests with Docker service where applicable
-- **Full Test Suite**: Runs all tests across every supported database
-
-Pull requests must pass all CI checks before merging.