Skip to content

test(stack): use unique table name to avoid transient race condition #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auxesis merged 1 commit into from
May 25, 2026
Merged

test(stack): use unique table name to avoid transient race condition #488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
92 changes: 46 additions & 46 deletions packages/stack/__tests__/searchable-json-pg.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (!process.env.DATABASE_URL) {
// Disable prepared statements — required for pooled connections (PgBouncer in transaction mode)
const sql = postgres(process.env.DATABASE_URL, { prepare: false })

const table = encryptedTable('protect-ci-jsonb', {
const table = encryptedTable('protect-ci-jsonb-stack', {
metadata: encryptedColumn('metadata').searchableJson(),
})

Expand All @@ -32,7 +32,7 @@ async function insertRow(plaintext: any) {
if (encrypted.failure) throw new Error(encrypted.failure.message)

const [inserted] = await sql`
INSERT INTO "protect-ci-jsonb" (metadata, test_run_id)
INSERT INTO "protect-ci-jsonb-stack" (metadata, test_run_id)
VALUES (${sql.json(encrypted.data.metadata)}::eql_v2_encrypted, ${TEST_RUN_ID})
RETURNING id
`
Expand Down Expand Up @@ -67,7 +67,7 @@ beforeAll(async () => {
protectClient = await Encryption({ schemas: [table] })

await sql`
CREATE TABLE IF NOT EXISTS "protect-ci-jsonb" (
CREATE TABLE IF NOT EXISTS "protect-ci-jsonb-stack" (
id INTEGER PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
metadata eql_v2_encrypted,
test_run_id TEXT
Expand All @@ -76,7 +76,7 @@ beforeAll(async () => {
}, 30000)

afterAll(async () => {
await sql`DELETE FROM "protect-ci-jsonb" WHERE test_run_id = ${TEST_RUN_ID}`
await sql`DELETE FROM "protect-ci-jsonb-stack" WHERE test_run_id = ${TEST_RUN_ID}`
await sql.end()
}, 30000)

Expand All @@ -89,7 +89,7 @@ describe('searchableJson postgres integration', () => {
const { id } = await insertRow(plaintext)

const rows = await sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb"
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack"
WHERE id = ${id}
`

Expand All @@ -108,7 +108,7 @@ describe('searchableJson postgres integration', () => {
const { id } = await insertRow(plaintext)

const rows = await sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb"
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack"
WHERE id = ${id}
`

Expand All @@ -128,7 +128,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -153,7 +153,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -172,7 +172,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -195,7 +195,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -225,7 +225,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -250,7 +250,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql.unsafe(
`SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, '${selectorTerm}'::eql_v2_encrypted) as result
WHERE t.test_run_id = '${TEST_RUN_ID}'`,
)
Expand All @@ -275,7 +275,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql.unsafe(
`SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, '${selectorTerm}'::eql_v2_encrypted) as result
WHERE t.test_run_id = '${TEST_RUN_ID}'`,
)
Expand All @@ -300,7 +300,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql.unsafe(
`SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, '${selectorTerm}'::eql_v2_encrypted) as result
WHERE t.test_run_id = '${TEST_RUN_ID}'`,
)
Expand All @@ -322,7 +322,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql.unsafe(
`SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, '${selectorTerm}'::eql_v2_encrypted) as result
WHERE t.test_run_id = '${TEST_RUN_ID}'`,
)
Expand All @@ -345,7 +345,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t
FROM "protect-ci-jsonb-stack" t
WHERE t.metadata @> ${containmentTerm}::eql_v2_encrypted
AND t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -370,7 +370,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t
FROM "protect-ci-jsonb-stack" t
WHERE t.metadata @> ${containmentTerm}::eql_v2_encrypted
AND t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -392,7 +392,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t
FROM "protect-ci-jsonb-stack" t
WHERE t.metadata @> ${containmentTerm}::eql_v2_encrypted
AND t.test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -435,7 +435,7 @@ describe('searchableJson postgres integration', () => {
// Selector query: jsonb_path_query
const selectorRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -448,7 +448,7 @@ describe('searchableJson postgres integration', () => {
// Containment query: @>
const containmentRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${containmentTerm}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -475,14 +475,14 @@ describe('searchableJson postgres integration', () => {

const inferredRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${inferredSelectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`

const explicitRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${explicitSelectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -525,14 +525,14 @@ describe('searchableJson postgres integration', () => {

const inferredTermRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${inferredContainmentTerm}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`

const explicitTermRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${explicitContainmentTerm}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -595,7 +595,7 @@ describe('searchableJson postgres integration', () => {
// Use composite-literal form to query PG
const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${compositeData}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -631,7 +631,7 @@ describe('searchableJson postgres integration', () => {
// Use unwrapped composite-literal form to query PG
const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${unwrapped}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -681,7 +681,7 @@ describe('searchableJson postgres integration', () => {
// Selector query
const selectorRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorUnwrapped}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -694,7 +694,7 @@ describe('searchableJson postgres integration', () => {
// Containment query
const containmentRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${containmentUnwrapped}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -725,7 +725,7 @@ describe('searchableJson postgres integration', () => {
if (encrypted.failure) throw new Error(encrypted.failure.message)

const [inserted] = await sql`
INSERT INTO "protect-ci-jsonb" (metadata, test_run_id)
INSERT INTO "protect-ci-jsonb-stack" (metadata, test_run_id)
VALUES (${sql.json(encrypted.data.metadata)}::eql_v2_encrypted, ${TEST_RUN_ID})
RETURNING id
`
Expand All @@ -744,7 +744,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorResult.data}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -773,7 +773,7 @@ describe('searchableJson postgres integration', () => {
if (encrypted.failure) throw new Error(encrypted.failure.message)

const [inserted] = await sql`
INSERT INTO "protect-ci-jsonb" (metadata, test_run_id)
INSERT INTO "protect-ci-jsonb-stack" (metadata, test_run_id)
VALUES (${sql.json(encrypted.data.metadata)}::eql_v2_encrypted, ${TEST_RUN_ID})
RETURNING id
`
Expand All @@ -795,7 +795,7 @@ describe('searchableJson postgres integration', () => {

const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${containmentResult.data}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -828,7 +828,7 @@ describe('searchableJson postgres integration', () => {
if (encrypted.failure) throw new Error(encrypted.failure.message)

const [inserted] = await sql`
INSERT INTO "protect-ci-jsonb" (metadata, test_run_id)
INSERT INTO "protect-ci-jsonb-stack" (metadata, test_run_id)
VALUES (${sql.json(encrypted.data.metadata)}::eql_v2_encrypted, ${TEST_RUN_ID})
RETURNING id
`
Expand Down Expand Up @@ -859,7 +859,7 @@ describe('searchableJson postgres integration', () => {
// Selector query
const selectorRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand All @@ -878,7 +878,7 @@ describe('searchableJson postgres integration', () => {
// Containment query
const containmentRows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${containmentTerm}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -942,17 +942,17 @@ describe('searchableJson postgres integration', () => {
// Execute each against PG
const [rows1, rows2, rows3] = await Promise.all([
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb" t,
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${q1.data}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`,
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb" t,
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${q2.data}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`,
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb" t,
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${q3.data}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`,
Expand Down Expand Up @@ -1031,12 +1031,12 @@ describe('searchableJson postgres integration', () => {

const [rows1, rows2] = await Promise.all([
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb"
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${c1.data}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`,
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb"
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${c2.data}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`,
Expand Down Expand Up @@ -1101,20 +1101,20 @@ describe('searchableJson postgres integration', () => {

// Insert the encrypted doc
const [inserted] = await sql`
INSERT INTO "protect-ci-jsonb" (metadata, test_run_id)
INSERT INTO "protect-ci-jsonb-stack" (metadata, test_run_id)
VALUES (${sql.json(encryptedModel.data.metadata)}::eql_v2_encrypted, ${TEST_RUN_ID})
RETURNING id
`

// Query with both terms
const [selectorRows, containmentRows] = await Promise.all([
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb" t,
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorResult.data}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`,
sql`
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb"
SELECT id, (metadata).data as metadata FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${containmentResult.data}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`,
Expand Down Expand Up @@ -1170,7 +1170,7 @@ describe('searchableJson postgres integration', () => {
// Must use sql.json() to pass raw Encrypted object to PG
const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${sql.json(rawResult)}::eql_v2_encrypted) as result
WHERE t.test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -1200,7 +1200,7 @@ describe('searchableJson postgres integration', () => {
// Must use sql.json() to pass raw Encrypted object to PG
const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb"
FROM "protect-ci-jsonb-stack"
WHERE metadata @> ${sql.json(rawResult)}::eql_v2_encrypted
AND test_run_id = ${TEST_RUN_ID}
`
Expand Down Expand Up @@ -1242,7 +1242,7 @@ describe('searchableJson postgres integration', () => {
// Query PG
const rows = await sql`
SELECT id, (metadata).data as metadata
FROM "protect-ci-jsonb" t,
FROM "protect-ci-jsonb-stack" t,
eql_v2.jsonb_path_query(t.metadata, ${selectorTerm}::eql_v2_encrypted) as result
WHERE t.id = ${insertedIds[i]}
`
Expand Down
Loading