Skip to content

fix(db): correct channel contact merged_id foreign key #1290

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
clark-cant merged 1 commit into from
Jun 27, 2026
Merged

fix(db): correct channel contact merged_id foreign key #1290

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
2 changes: 1 addition & 1 deletion internal/upgrade/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package upgrade

// RequiredSchemaVersion is the schema migration version this binary requires.
// Bump this whenever adding a new SQL migration file.
const RequiredSchemaVersion uint = 85
const RequiredSchemaVersion uint = 86
8 changes: 8 additions & 0 deletions migrations/000086_fix_channel_contacts_merged_fk.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- Roll back only the corrective FK.
-- Do not recreate the old self-reference FK because it is incompatible with valid data.
BEGIN;

ALTER TABLE channel_contacts
DROP CONSTRAINT IF EXISTS fk_channel_contacts_merged_id;

COMMIT;
14 changes: 14 additions & 0 deletions migrations/000086_fix_channel_contacts_merged_fk.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- Fix channel_contacts.merged_id FK.
-- merged_id stores tenant_users.id, not channel_contacts.id.
BEGIN;

ALTER TABLE channel_contacts
DROP CONSTRAINT IF EXISTS fk_channel_contacts_merged_id;

ALTER TABLE channel_contacts
ADD CONSTRAINT fk_channel_contacts_merged_id
FOREIGN KEY (merged_id)
REFERENCES tenant_users(id)
ON DELETE SET NULL;

COMMIT;
15 changes: 11 additions & 4 deletions migrations/audit_fk_integrity.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,18 @@ FROM webhooks w
LEFT JOIN channel_instances ci ON ci.id = w.channel_id
WHERE w.channel_id IS NOT NULL AND ci.id IS NULL;

-- channel_contacts: merged_id self-ref orphans
SELECT 'channel_contacts.merged_id orphans' AS check_name, COUNT(*) AS violations
-- channel_contacts: merged_id tenant_users orphans
SELECT 'channel_contacts.merged_id tenant_users orphans' AS check_name, COUNT(*) AS violations
FROM channel_contacts cc
LEFT JOIN channel_contacts cc2 ON cc2.id = cc.merged_id
WHERE cc.merged_id IS NOT NULL AND cc2.id IS NULL;
LEFT JOIN tenant_users tu ON tu.id = cc.merged_id
WHERE cc.merged_id IS NOT NULL AND tu.id IS NULL;

-- channel_contacts: merged_id tenant drift
SELECT 'channel_contacts.merged_id tenant drift' AS check_name, COUNT(*) AS violations
FROM channel_contacts cc
JOIN tenant_users tu ON tu.id = cc.merged_id
WHERE cc.merged_id IS NOT NULL
AND cc.tenant_id <> tu.tenant_id;

-- traces: parent_trace_id self-ref orphans
SELECT 'traces.parent_trace_id orphans' AS check_name, COUNT(*) AS violations
Expand Down
Loading