Skip to content

fix(idempotency): use compatible PostgreSQL JSON operations #6510

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
TheodoreSpeaks merged 1 commit into from
Aug 11, 2026
Merged

fix(idempotency): use compatible PostgreSQL JSON operations #6510

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions apps/sim/lib/core/idempotency/service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ describe('IdempotencyService in-progress deadlines', () => {

const conflictOptions = dbChainMockFns.onConflictDoUpdate.mock.calls[0]?.[0]
const setWhere = JSON.stringify(conflictOptions?.setWhere)
expect(setWhere).toContain('json_typeof')
expect(setWhere).not.toContain('jsonb_typeof')
expect(setWhere).toContain('IS DISTINCT FROM')
expect(setWhere).toContain('in-progress')
})
Expand Down Expand Up @@ -229,7 +231,8 @@ describe('IdempotencyService in-progress deadlines', () => {
service.executeWithIdempotency('provider', 'delivery-retry-db', vi.fn())
).resolves.toBe('new-owner-result')

const condition = dbChainMockFns.where.mock.calls.at(-1)?.[0]
expect(JSON.stringify(condition)).toContain('retry me')
const condition = JSON.stringify(dbChainMockFns.where.mock.calls.at(-1)?.[0])
expect(condition).toContain('retry me')
expect(condition.match(/::jsonb/g)).toHaveLength(2)
})
})
4 changes: 2 additions & 2 deletions apps/sim/lib/core/idempotency/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export class IdempotencyService {
const expiredBefore = new Date(now.getTime() - this.config.ttlSeconds * 1000)
const inProgressClaimExpired = sql`COALESCE(
CASE
WHEN jsonb_typeof(${idempotencyKey.result} -> 'inProgressExpiresAt') = 'number'
WHEN json_typeof(${idempotencyKey.result} -> 'inProgressExpiresAt') = 'number'
THEN (${idempotencyKey.result} ->> 'inProgressExpiresAt')::double precision
END,
EXTRACT(EPOCH FROM ${idempotencyKey.createdAt}) * 1000 + ${this.config.inProgressTtlSeconds * 1000}
Expand Down Expand Up @@ -548,7 +548,7 @@ export class IdempotencyService {
: fence?.observedResult
? and(
eq(idempotencyKey.key, normalizedKey),
sql`${idempotencyKey.result} = ${JSON.stringify(fence.observedResult)}::jsonb`
sql`${idempotencyKey.result}::jsonb = ${JSON.stringify(fence.observedResult)}::jsonb`
)
: eq(idempotencyKey.key, normalizedKey)
const deleted = await db
Expand Down
Loading