From eb3e534e0f6f08c32145713dbe0a5c0e34440680 Mon Sep 17 00:00:00 2001
From: James Sadler <james@cipherstash.com>
Date: Thu, 2 Jul 2026 13:07:31 +1000
Subject: [PATCH] chore(eql): add mise tasks to install a local EQL v3 build

Add postgres:eql:v3:setup / postgres:eql:v3:teardown / eql:v3:copy to
install a locally built eql_v3 schema (from encrypt-query-language
branch eql_v3, built with 'mise run build' there) into the test
Postgres container, alongside the existing v2 flow.

The install SQL is consumed from $CS_EQL_V3_PATH (a directory
containing cipherstash-encrypt.sql / cipherstash-encrypt-uninstall.sql,
e.g. the EQL repo's release/ dir) and copied to the repo root as
cipherstash-encrypt-v3{,-uninstall}.sql so the v2 artifacts are not
clobbered.

Unlike postgres:setup, the v3 task does NOT apply tests/sql/schema.sql:
that fixture is still v2; a v3 fixture comes later.
---
 .gitignore     |  2 ++
 DEVELOPMENT.md | 17 +++++++++++++++++
 mise.toml      | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/.gitignore b/.gitignore
index e47f41d2..b07c9f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@ rust-toolchain.toml
 /packages/cipherstash-proxy/eql-version-at-build-time.txt
 /cipherstash-encrypt.sql
 /cipherstash-encrypt-uninstall.sql
+/cipherstash-encrypt-v3.sql
+/cipherstash-encrypt-v3-uninstall.sql
 
 # credentials for local dev
 .env.proxy.docker
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index fded1e84..2e34f8a2 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -424,7 +424,24 @@ EQL is a required dependency and the database setup uses the latest release.
 
 To use a different version of EQL, set the path to the desired EQL release file in the `CS_EQL_PATH` environment variable.
 
+#### Installing a local EQL v3 build
 
+To install a locally built EQL v3 schema (the `eql_v3` schema) into the test PostgreSQL container, alongside the existing v2 flow:
+
+```shell
+# Build the v3 artifact in your encrypt-query-language checkout (branch eql_v3)
+cd ../encrypt-query-language
+mise run build
+# writes release/cipherstash-encrypt.sql and release/cipherstash-encrypt-uninstall.sql
+
+# Install it into the running test postgres
+cd ../proxy
+CS_EQL_V3_PATH=../encrypt-query-language/release mise run postgres:eql:v3:setup
+```
+
+`postgres:eql:v3:setup` copies the install/uninstall SQL from `$CS_EQL_V3_PATH` (as `cipherstash-encrypt-v3.sql` / `cipherstash-encrypt-v3-uninstall.sql` in the repo root), drops any existing `eql_v3` schema, and installs the new one.
+
+Note: unlike `postgres:setup`, this does **not** apply `tests/sql/schema.sql` — that fixture is still EQL v2. Use `postgres:eql:v3:teardown` to just uninstall EQL v3.
 
 #### Convention: PostgreSQL ports
 
diff --git a/mise.toml b/mise.toml
index 1827980d..cc4390a9 100644
--- a/mise.toml
+++ b/mise.toml
@@ -593,6 +593,42 @@ else
 fi
 """
 
+[tasks."eql:v3:copy"]
+description = "Copy a locally built EQL v3 install/uninstall SQL (requires CS_EQL_V3_PATH)"
+run = """
+#!/bin/bash
+set -eu
+if [ -z "${CS_EQL_V3_PATH:-}" ]; then
+  echo "error: CS_EQL_V3_PATH is not set"
+  echo "error: Set it to a directory containing a locally built EQL v3 artifact, e.g."
+  echo "error:   (cd ../encrypt-query-language && mise run build)  # writes release/cipherstash-encrypt.sql"
+  echo "error:   CS_EQL_V3_PATH=../encrypt-query-language/release mise run postgres:eql:v3:setup"
+  exit 65
+fi
+echo "Using EQL v3: ${CS_EQL_V3_PATH}/cipherstash-encrypt.sql"
+cp "${CS_EQL_V3_PATH}/cipherstash-encrypt.sql" "{{config_root}}/cipherstash-encrypt-v3.sql"
+echo "Using EQL v3: ${CS_EQL_V3_PATH}/cipherstash-encrypt-uninstall.sql"
+cp "${CS_EQL_V3_PATH}/cipherstash-encrypt-uninstall.sql" "{{config_root}}/cipherstash-encrypt-v3-uninstall.sql"
+"""
+
+[tasks."postgres:eql:v3:teardown"]
+depends = ["eql:v3:copy"]
+description = "Uninstalls EQL v3 (drops the eql_v3 schema) from the database"
+run = """
+#!/bin/bash
+mise run postgres:fail_if_not_running
+cat "{{config_root}}/cipherstash-encrypt-v3-uninstall.sql" | docker exec -i postgres${CONTAINER_SUFFIX:-} psql postgresql://${CS_DATABASE__USERNAME}:${CS_DATABASE__PASSWORD_ESCAPED_FOR_TESTS}@${CS_DATABASE__HOST}:${CS_DATABASE__PORT}/${CS_DATABASE__NAME} -f-
+"""
+
+[tasks."postgres:eql:v3:setup"]
+depends = ["postgres:eql:v3:teardown"]
+description = "Installs a locally built EQL v3 into the database (no tests/sql/schema.sql; that fixture is still v2)"
+run = """
+#!/bin/bash
+mise run postgres:fail_if_not_running
+cat "{{config_root}}/cipherstash-encrypt-v3.sql" | docker exec -i postgres${CONTAINER_SUFFIX:-} psql postgresql://${CS_DATABASE__USERNAME}:${CS_DATABASE__PASSWORD_ESCAPED_FOR_TESTS}@${CS_DATABASE__HOST}:${CS_DATABASE__PORT}/${CS_DATABASE__NAME} -f-
+"""
+
 [tasks."test:integration:lang:python"]
 dir = "{{config_root}}/tests"
 description = "Runs python tests"