Insert to did cache using excluded column (#1772)

insert to did cache using exclude
bluesky-social · Oct 25, 2023 · ce28725 · ce28725
1 parent ed33f64
commit ce28725
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/bsky/src/did-cache.ts b/packages/bsky/src/did-cache.ts
@@ -1,6 +1,7 @@
 import PQueue from 'p-queue'
 import { CacheResult, DidCache, DidDocument } from '@atproto/identity'
 import { PrimaryDatabase } from './db'
+import { excluded } from './db/util'
 import { dbLogger } from './logger'
 
 export class DidSqlCache implements DidCache {
@@ -21,7 +22,10 @@ export class DidSqlCache implements DidCache {
       .insertInto('did_cache')
       .values({ did, doc, updatedAt: Date.now() })
       .onConflict((oc) =>
-        oc.column('did').doUpdateSet({ doc, updatedAt: Date.now() }),
+        oc.column('did').doUpdateSet({
+          doc: excluded(this.db.db, 'doc'),
+          updatedAt: excluded(this.db.db, 'updatedAt'),
+        }),
       )
       .executeTakeFirst()
   }

diff --git a/packages/pds/src/did-cache.ts b/packages/pds/src/did-cache.ts
@@ -22,7 +22,7 @@ export class DidSqlCache implements DidCache {
       .onConflict((oc) =>
         oc.column('did').doUpdateSet({
           doc: excluded(this.db.db, 'doc'),
-          updatedAt: Date.now(),
+          updatedAt: excluded(this.db.db, 'updatedAt'),
         }),
       )
       .executeTakeFirst()