Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests-bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
- name: Build @cipherstash/stack
run: pnpm exec turbo run build --filter @cipherstash/stack

# Builds the local EQL-enabled Postgres image (local/Dockerfile),
# starts it, and waits for the pg_isready healthcheck to pass.
# Starts the pinned postgres-eql container (PostgreSQL 17 + EQL
# pre-installed) via local/docker-compose.yml; waits for healthcheck.
- name: Start local Postgres (EQL)
working-directory: local
run: docker compose up --wait --wait-timeout 60
Expand Down
17 changes: 0 additions & 17 deletions local/Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions local/create-ci-table.sql

This file was deleted.

6 changes: 3 additions & 3 deletions local/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
services:
postgres: &postgres
build:
context: .
dockerfile: Dockerfile
# PostgreSQL 17 with CipherStash EQL pre-installed (official image).
# Pinned by tag — bump in lockstep with the EQL version the code targets.
image: ghcr.io/cipherstash/postgres-eql:17-2.2.1
environment:
PGPORT: 5432
POSTGRES_DB: "cipherstash"
Expand Down
24 changes: 0 additions & 24 deletions local/postgres-entrypoint.sh

This file was deleted.

7 changes: 5 additions & 2 deletions packages/cli/src/installer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ import { existsSync, readFileSync } from 'node:fs'
import { dirname, join, resolve } from 'node:path'
import pg from 'pg'

// EQL release, pinned to match the EQL payload format this package emits.
// Bump in lockstep with @cipherstash/protect-ffi.
const EQL_VERSION = 'eql-2.2.1'
const EQL_INSTALL_URL =
'https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql'
`https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt.sql`
const EQL_INSTALL_NO_OPERATOR_FAMILY_URL =
'https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt-supabase.sql'
`https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt-supabase.sql`
const EQL_SCHEMA_NAME = 'eql_v2'

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/drizzle/GENERATE_EQL_MIGRATION_CLI.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Or use your custom migration workflow.
### Before (manual):
```bash
npx drizzle-kit generate --custom --name=install-eql
curl -sL https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql > drizzle/0001_install-eql.sql
curl -sL https://github.com/cipherstash/encrypt-query-language/releases/download/eql-2.2.1/cipherstash-encrypt.sql > drizzle/0001_install-eql.sql
npx drizzle-kit migrate
```

Expand Down
2 changes: 1 addition & 1 deletion packages/drizzle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ If you prefer to install EQL manually:

```bash
npx drizzle-kit generate --custom --name=install-eql
curl -sL https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql > drizzle/0001_install-eql.sql
curl -sL https://github.com/cipherstash/encrypt-query-language/releases/download/eql-2.2.1/cipherstash-encrypt.sql > drizzle/0001_install-eql.sql
npx drizzle-kit migrate
```

Expand Down
5 changes: 4 additions & 1 deletion packages/drizzle/src/bin/generate-eql-migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import { readdir } from 'node:fs/promises'
import { join, resolve } from 'node:path'
import { detectRunner } from './runner.js'

// EQL release, pinned to match the EQL payload format this package emits.
// Bump in lockstep with @cipherstash/protect-ffi.
const EQL_VERSION = 'eql-2.2.1'
const EQL_INSTALL_URL =
'https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql'
`https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt.sql`

type CliArgs = {
migrationName: string
Expand Down
8 changes: 4 additions & 4 deletions packages/protect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -814,17 +814,17 @@ CREATE TABLE users (

To enable searchable encryption in PostgreSQL, [install the EQL custom types and functions](https://github.com/cipherstash/encrypt-query-language?tab=readme-ov-file#installation).

1. Download the latest EQL install script:
1. Download the EQL install script. The version is pinned to match this release of Protect.js — install exactly this version:

```sh
curl -sLo cipherstash-encrypt.sql https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql
curl -sLo cipherstash-encrypt.sql https://github.com/cipherstash/encrypt-query-language/releases/download/eql-2.2.1/cipherstash-encrypt.sql
```

Using [Supabase](https://supabase.com/)? We ship an EQL release specifically for Supabase.
Download the latest EQL install script:
Download the matching Supabase EQL install script:

```sh
curl -sLo cipherstash-encrypt-supabase.sql https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt-supabase.sql
curl -sLo cipherstash-encrypt-supabase.sql https://github.com/cipherstash/encrypt-query-language/releases/download/eql-2.2.1/cipherstash-encrypt-supabase.sql
```

2. Run this command to install the custom types and functions:
Expand Down
Loading