azcomputerguru/guru-connect
1
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix(server): bind machine_uid upsert ON CONFLICT to the partial index (WHERE machine_uid IS NOT NULL)
Some checks failed
Build and Test / Build Agent (Windows) (push) Successful in 8m16s
Details
Build and Test / Build Server (Linux) (push) Successful in 11m58s
Details
Build and Test / Security Audit (push) Has started running
Details
Build and Test / Build Summary (push) Has been cancelled
Details

Browse Source 
Bare ON CONFLICT (machine_uid) could not bind to migration 008's partial unique index, so no connect_machines row was persisted for any agent reporting a machine_uid. Confirmed live on 172.16.3.30 with a signed 0.3.0 test agent.
This commit is contained in:
Mike Swanson
2026-06-01 09:50:34 -07:00
parent 16017456aa
commit f950511e3e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/migrations/008_machine_uid.sql
View File

@@ -34,8 +34,12 @@ ALTER TABLE connect_machines ADD COLUMN IF NOT EXISTS machine_uid TEXT;
-- 2. Enforce one row per machine_uid, but ONLY for rows that actually have one. -- 2. Enforce one row per machine_uid, but ONLY for rows that actually have one.
-- A partial UNIQUE index (WHERE machine_uid IS NOT NULL) lets unlimited legacy -- A partial UNIQUE index (WHERE machine_uid IS NOT NULL) lets unlimited legacy
-- NULL rows coexist while making a non-null machine_uid a true dedup key — this -- NULL rows coexist while making a non-null machine_uid a true dedup key. Because
-- is what upsert_machine's `ON CONFLICT (machine_uid)` arbiter binds to. -- this index is PARTIAL, Postgres only binds an ON CONFLICT inference clause to it
-- when the clause REPEATS the same predicate: upsert_machine's arbiter must be
-- `ON CONFLICT (machine_uid) WHERE machine_uid IS NOT NULL` (a bare
-- `ON CONFLICT (machine_uid)` raises "no unique or exclusion constraint matching
-- the ON CONFLICT specification" at runtime and persists no row).
CREATE UNIQUE INDEX IF NOT EXISTS idx_connect_machines_machine_uid CREATE UNIQUE INDEX IF NOT EXISTS idx_connect_machines_machine_uid
ON connect_machines (machine_uid) ON connect_machines (machine_uid)
WHERE machine_uid IS NOT NULL; WHERE machine_uid IS NOT NULL;

2
server/src/db/machines.rs
View File

@@ -166,7 +166,7 @@ pub async fn upsert_machine(
r#" r#"
INSERT INTO connect_machines (agent_id, hostname, is_persistent, status, last_seen, machine_uid) INSERT INTO connect_machines (agent_id, hostname, is_persistent, status, last_seen, machine_uid)
VALUES ($1, $2, $3, 'online', NOW(), $4) VALUES ($1, $2, $3, 'online', NOW(), $4)
ON CONFLICT (machine_uid) DO UPDATE SET ON CONFLICT (machine_uid) WHERE machine_uid IS NOT NULL DO UPDATE SET
agent_id = EXCLUDED.agent_id, agent_id = EXCLUDED.agent_id,
hostname = EXCLUDED.hostname, hostname = EXCLUDED.hostname,
status = 'online', status = 'online',