Domain partitioning

.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,22 +40,27 @@ 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, and CockroachDB 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
    ```
 
 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
@@ -114,7 +132,7 @@ The database tests can be configured with these environment variables:
 
 1. Start the included CockroachDB container:
    ```bash
-   docker compose -f docker-compose.test.yml up -d cockroachdb
+   docker compose -f infra/docker/docker-compose.test.yml up -d cockroachdb
    ```
 2. Create a connection (default container runs insecure mode on port `26257` with `root` user):
    ```bash
@@ -138,7 +156,7 @@ The project uses GitHub Actions for continuous integration:
 - **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
-- 
+-
 
 ### Vision
 

README.md

@@ -27,22 +27,22 @@
 ### Connect
 Supports all major databases: SQL Server, PostgreSQL, MySQL, SQLite, MariaDB, FirebirdSQL, Oracle, DuckDB, CockroachDB, ClickHouse, Snowflake, Supabase, CloudFlare D1, Turso, Athena, BigQuery and Redshift.
 
-![Database Providers](demos/demo-providers.gif)
+![Database Providers](docs/demos/demo-providers.gif)
 
 ### Query
 Syntax highlighting. History. Vim-style keybindings.
 
-![Query History](demos/demo-history.gif)
+![Query History](docs/demos/demo-history.gif)
 
 ### Results
 Load millions of rows. Inspect data, filter by content, fuzzy search.
 
-![Filter results](demos/demo-filter/demo-filter.gif)
+![Filter results](docs/demos/demo-filter/demo-filter.gif)
 
 ### Docker Discovery
 Automatically finds running database containers. Press 'Enter' to connect, sqlit figures out the details for you.
 
-![Docker Discovery](demos/demo-docker-picker.gif)
+![Docker Discovery](docs/demos/demo-docker-picker.gif)
 
 ---
 

mock-ssh-missing.json → config/mock-ssh-missing.json

@@ -1,5 +1,5 @@
 {
-  "_note": "Run: sqlit --settings mock-ssh-missing.json",
+  "_note": "Run: sqlit --settings config/mock-ssh-missing.json",
   "mock": {
     "enabled": true,
     "profile": "empty",

demos/d1-demo.json → docs/demos/d1-demo.json

@@ -182,4 +182,4 @@
     "conn:My D1 Database",
     "conn:My D1 Database/folder:tables"
   ]
-}
+}

docker-compose.test.yml → infra/docker/docker-compose.test.yml

@@ -51,6 +51,17 @@ services:
     tmpfs:
       - /var/lib/mysql
 
+  clickhouse:
+    image: clickhouse/clickhouse-server:latest
+    container_name: sqlit-test-clickhouse
+    environment:
+      CLICKHOUSE_USER: "default"
+      CLICKHOUSE_PASSWORD: "TestPassword123!"
+    ports:
+      - "8123:8123"
+    tmpfs:
+      - /var/lib/clickhouse
+
   oracle:
     image: gvenzl/oracle-free:23-slim
     container_name: sqlit-test-oracle
@@ -148,7 +159,7 @@ services:
     ports:
       - "2222:2222"
     volumes:
-      - ./tests/fixtures/99-fix-sshd-config.sh:/custom-cont-init.d/99-fix-sshd-config
+      - ../../tests/fixtures/99-fix-sshd-config.sh:/custom-cont-init.d/99-fix-sshd-config
     healthcheck:
       test: ["CMD", "nc", "-z", "localhost", "2222"]
       interval: 5s
@@ -179,14 +190,18 @@ services:
 
   miniflare:
     build:
-      context: ./tests/fixtures/d1
+      context: ../../tests/fixtures/d1
     container_name: sqlit-test-miniflare
     command: ["wrangler", "dev", "--local", "--ip", "0.0.0.0", "--port", "8787"]
+    environment:
+      D1_ACCOUNT_ID: "test-account"
+      D1_API_TOKEN: "test-token"
+      D1_DATABASE: "test-d1"
     ports:
       - "8787:8787"
     volumes:
-      - ./tests/fixtures/d1/wrangler.toml:/app/wrangler.toml
-      - ./tests/fixtures/d1/index.js:/app/index.js
+      - ../../tests/fixtures/d1/wrangler.toml:/app/wrangler.toml
+      - ../../tests/fixtures/d1/index.js:/app/index.js
     working_dir: /app
     healthcheck:
       test: ["CMD", "node", "-e", "fetch('http://localhost:8787/').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"]