Skip to content
Open
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
20 changes: 17 additions & 3 deletions packages/core/realtime-js/src/RealtimeChannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@ export default class RealtimeChannel {
if (
serverPostgresFilter &&
serverPostgresFilter.event === event &&
serverPostgresFilter.schema === schema &&
serverPostgresFilter.table === table &&
serverPostgresFilter.filter === filter
RealtimeChannel.isFilterValueEqual(serverPostgresFilter.schema, schema) &&
RealtimeChannel.isFilterValueEqual(serverPostgresFilter.table, table) &&
RealtimeChannel.isFilterValueEqual(serverPostgresFilter.filter, filter)
) {
newPostgresBindings.push({
...clientPostgresBinding,
Expand Down Expand Up @@ -949,6 +949,20 @@ export default class RealtimeChannel {
return true
}

/**
* Compares two optional filter values for equality.
* Treats undefined, null, and empty string as equivalent empty values.
* @internal
*/
private static isFilterValueEqual(
serverValue: string | undefined | null,
clientValue: string | undefined
): boolean {
const normalizedServer = serverValue ?? undefined
const normalizedClient = clientValue ?? undefined
return normalizedServer === normalizedClient
}

/** @internal */
private _rejoinUntilConnected() {
this.rejoinTimer.scheduleTimeout()
Expand Down
71 changes: 71 additions & 0 deletions packages/core/realtime-js/test/RealtimeChannel.postgres.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,77 @@ describe('PostgreSQL binding matching behavior', () => {
assert.equal(channel.bindings.postgres_changes[0].id, 'server-id-1')
})

test('should match postgres changes when server returns null for optional fields', () => {
const callbackSpy = vi.fn()

channel.on(
'postgres_changes',
{
event: 'INSERT',
schema: 'public',
table: 'notifications',
},
callbackSpy
)

channel.subscribe()

const mockServerResponse = {
postgres_changes: [
{
event: 'INSERT',
schema: 'public',
table: 'notifications',
filter: null,
id: 'server-id-1',
},
],
}

channel.joinPush._matchReceive({
status: 'ok',
response: mockServerResponse,
})

assert.equal(channel.state, CHANNEL_STATES.joined)
assert.equal(channel.bindings.postgres_changes[0].id, 'server-id-1')
})

test('should match postgres changes when server omits optional filter field', () => {
const callbackSpy = vi.fn()

channel.on(
'postgres_changes',
{
event: '*',
schema: 'public',
table: 'notifications',
},
callbackSpy
)

channel.subscribe()

const mockServerResponse = {
postgres_changes: [
{
event: '*',
schema: 'public',
table: 'notifications',
id: 'server-id-1',
},
],
}

channel.joinPush._matchReceive({
status: 'ok',
response: mockServerResponse,
})

assert.equal(channel.state, CHANNEL_STATES.joined)
assert.equal(channel.bindings.postgres_changes[0].id, 'server-id-1')
})

test.each([
{
description: 'should fail when event differs',
Expand Down
Loading