SQLx Test Suite - Consolidated Implementation

.github/workflows/test-eql.yml

@@ -28,7 +28,7 @@ defaults:
 jobs:
   test:
     name: "Test EQL SQL components"
-    runs-on: ubuntu-latest-m
+    runs-on: blacksmith-16vcpu-ubuntu-2204
 
     strategy:
       fail-fast: false
@@ -41,9 +41,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: jdx/mise-action@v2
+      - uses: jdx/mise-action@v3
         with:
-          version: 2025.1.6 # [default: latest] mise version to install
+          version: 2025.11.2 # [default: latest] mise version to install
           install: true # [default: true] run `mise install`
           cache: true # [default: true] cache mise using GitHub's cache
 
@@ -53,4 +53,6 @@ jobs:
 
       - name: Test EQL for Postgres ${{ matrix.postgres-version }}
         run: |
+          export active_rust_toolchain=$(rustup show active-toolchain | cut -d' ' -f1)
+          rustup component add --toolchain ${active_rust_toolchain} rustfmt clippy
           mise run --output prefix test --postgres ${POSTGRES_VERSION}

.gitignore

@@ -2,6 +2,7 @@
 
 .DS_Store
 .mise.*
+.worktrees/
 
 deps.txt
 deps-ordered.txt
@@ -210,3 +211,6 @@ eql--*.sql
 
 # Generated SQLx migration (built from src/, never commit)
 tests/sqlx/migrations/001_install_eql.sql
+
+# Rust build artifacts (using sccache)
+tests/sqlx/target/

mise.toml

@@ -6,15 +6,23 @@
 #     "./tests/mise.tcp.toml",
 #     "./tests/mise.tls.toml",
 # ]
+
+[tools]
+"rust" = { version = "latest", components = "rustc,rust-std,cargo,rustfmt,rust-docs,clippy" }
+"cargo:cargo-binstall" = "latest"
+"cargo:sqlx-cli" = "latest"
+
+
 [task_config]
-includes = ["tasks", "tasks/postgres.toml", "tasks/rust.toml"]
+includes = ["tasks", "tasks/postgres.toml"]
 
 [env]
 POSTGRES_DB = "cipherstash"
 POSTGRES_USER = "cipherstash"
 POSTGRES_PASSWORD = "password"
 POSTGRES_HOST = "localhost"
 POSTGRES_PORT = "7432"
+DATABASE_URL = "postgresql://cipherstash:password@localhost:7432/cipherstash"
 
 [tasks."clean"]
 alias = 'k'
@@ -23,3 +31,27 @@ run = """
   rm -f release/cipherstash-encrypt-uninstall.sql
   rm -f release/cipherstash-encrypt.sql
 """
+
+[tasks."test:sqlx"]
+description = "Run SQLx tests with hybrid migration approach"
+dir = "{{config_root}}"
+run = """
+# Copy built SQL to SQLx migrations (EQL install is generated, not static)
+echo "Updating SQLx migrations with built EQL..."
+cp release/cipherstash-encrypt.sql tests/sqlx/migrations/001_install_eql.sql
+
+# Run SQLx migrations and tests
+echo "Running SQLx migrations..."
+cd tests/sqlx
+sqlx migrate run
+
+echo "Running Rust tests..."
+cargo test
+"""
+
+[tasks."test:sqlx:watch"]
+description = "Run SQLx tests in watch mode (rebuild EQL on changes)"
+dir = "{{config_root}}/tests/sqlx"
+run = """
+cargo watch -x test
+"""

tasks/postgres/check_container.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#MISE description="Check if PostgreSQL container is running"
+#USAGE flag "--postgres <version>" help="PostgreSQL version to check" default="17" {
+#USAGE   choices "14" "15" "16" "17"
+#USAGE }
+
+set -euo pipefail
+
+POSTGRES_VERSION=${usage_postgres}
+container_name=postgres-${POSTGRES_VERSION}
+
+containers=$(docker ps --filter "name=^${container_name}$" --quiet)
+if [ -z "${containers}" ]; then
+  echo "error: Docker container for PostgreSQL is not running"
+  echo "error: Try running 'mise run postgres:up postgres-${POSTGRES_VERSION}' to start the container"
+  exit 65
+fi
+
+echo "✓ PostgreSQL ${POSTGRES_VERSION} container is running"

tasks/test.sh

@@ -1,71 +1,56 @@
 #!/usr/bin/env bash
-#MISE description="Build, reset and run tests"
+#MISE description="Run all tests (legacy SQL + SQLx Rust)"
 #USAGE flag "--test <test>" help="Test to run" default="false"
-#USAGE flag "--postgres <version>" help="Run tests for specified Postgres version" default="17" {
+#USAGE flag "--postgres <version>" help="PostgreSQL version to test against" default="17" {
 #USAGE   choices "14" "15" "16" "17"
 #USAGE }
 
-#!/bin/bash
 
 set -euo pipefail
 
 POSTGRES_VERSION=${usage_postgres}
 
-connection_url=postgresql://${POSTGRES_USER:-$USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-container_name=postgres-${POSTGRES_VERSION}
-
-fail_if_postgres_not_running () {
-  containers=$(docker ps --filter "name=^${container_name}$" --quiet)
-  if [ -z "${containers}" ]; then
-    echo "error: Docker container for PostgreSQL is not running"
-    echo "error: Try running 'mise run postgres:up ${container_name}' to start the container"
-    exit 65
-  fi
-}
-
-run_test () {
-  echo
-  echo '###############################################'
-  echo "# Running Test: ${1}"
-  echo '###############################################'
-  echo
-
-  cat $1 | docker exec -i ${container_name} psql --variable ON_ERROR_STOP=1 $connection_url -f-
-}
-
-# setup
-fail_if_postgres_not_running
-mise run build --force
-mise run reset --force --postgres ${POSTGRES_VERSION}
-
-echo
-echo '###############################################'
-echo '# Installing release/cipherstash-encrypt.sql'
-echo '###############################################'
-echo
-
-# Install
-cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f-
-
-
-cat tests/test_helpers.sql | docker exec -i ${container_name} psql ${connection_url} -f-
-cat tests/ore.sql | docker exec -i ${container_name} psql ${connection_url} -f-
-cat tests/ste_vec.sql | docker exec -i ${container_name} psql ${connection_url} -f-
-
-
-if [ $usage_test = "false" ]; then
-  find src -type f -path "*_test.sql" | while read -r sql_file; do
-    echo $sql_file
-    run_test $sql_file
-  done
-else
-  find src -type f -path "*$usage_test*" | while read -r sql_file; do
-    run_test $sql_file
-  done
-fi
-
-echo
-echo '###############################################'
-echo "# ✅ALL TESTS PASSED "
-echo '###############################################'
-echo
+echo "=========================================="
+echo "Running Complete EQL Test Suite"
+echo "PostgreSQL Version: $POSTGRES_VERSION"
+echo "=========================================="
+echo ""
+
+# Check PostgreSQL is running
+"$(dirname "$0")/postgres/check_container.sh" ${POSTGRES_VERSION}
+
+# Build first
+echo "Building EQL..."
+mise run --output prefix build --force
+
+# Run lints on sqlx tests
+echo ""
+echo "=============================================="
+echo "1/3: Running linting checks on SQLx Rust tests"
+echo "=============================================="
+mise run --output prefix test:lint
+
+# Run legacy SQL tests
+echo ""
+echo "=============================================="
+echo "2/3: Running Legacy SQL Tests"
+echo "=============================================="
+mise run --output prefix test:legacy --postgres ${POSTGRES_VERSION}
+
+# Run SQLx Rust tests
+echo ""
+echo "=============================================="
+echo "3/3: Running SQLx Rust Tests"
+echo "=============================================="
+mise run --output prefix test:sqlx
+
+echo ""
+echo "=============================================="
+echo "✅ ALL TESTS PASSED"
+echo "=============================================="
+echo ""
+echo "Summary:"
+echo "  ✓ SQLx Rust lint checks"
+echo "  ✓ Legacy SQL tests"
+echo "  ✓ SQLx Rust tests"
+echo ""

tasks/test/legacy.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+#MISE description="Run legacy SQL tests (inline test files)"
+#USAGE flag "--test <test>" help="Specific test file pattern to run" default="false"
+#USAGE flag "--postgres <version>" help="PostgreSQL version to test against" default="17" {
+#USAGE   choices "14" "15" "16" "17"
+#USAGE }
+
+set -euo pipefail
+
+POSTGRES_VERSION=${usage_postgres}
+
+connection_url=postgresql://${POSTGRES_USER:-$USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+container_name=postgres-${POSTGRES_VERSION}
+
+# Check postgres is running (script will exit if not)
+source "$(dirname "$0")/../postgres/check_container.sh" ${POSTGRES_VERSION}
+
+run_test () {
+  echo
+  echo '###############################################'
+  echo "# Running Test: ${1}"
+  echo '###############################################'
+  echo
+
+  cat $1 | docker exec -i ${container_name} psql --variable ON_ERROR_STOP=1 $connection_url -f-
+}
+
+# Reset database
+mise run reset --force --postgres ${POSTGRES_VERSION}
+
+echo
+echo '###############################################'
+echo '# Installing release/cipherstash-encrypt.sql'
+echo '###############################################'
+echo
+
+# Install
+cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f-
+
+
+cat tests/test_helpers.sql | docker exec -i ${container_name} psql ${connection_url} -f-
+cat tests/ore.sql | docker exec -i ${container_name} psql ${connection_url} -f-
+cat tests/ste_vec.sql | docker exec -i ${container_name} psql ${connection_url} -f-
+
+
+if [ $usage_test = "false" ]; then
+  find src -type f -path "*_test.sql" | while read -r sql_file; do
+    echo $sql_file
+    run_test $sql_file
+  done
+else
+  find src -type f -path "*$usage_test*" | while read -r sql_file; do
+    run_test $sql_file
+  done
+fi
+
+echo
+echo '###############################################'
+echo "# ✅ALL TESTS PASSED "
+echo '###############################################'
+echo

tasks/test/lint.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#MISE description="Run lint tests"
+
+set -euo pipefail
+
+(
+  cd tests/sqlx/
+  cargo fmt --check -- --files-with-diff
+)