Fix up query syntax

Author: ChrisPenner

share-api/src/Share/Web/UCM/HistoryComments/Queries.hs

@@ -8,6 +8,7 @@ module Share.Web.UCM.HistoryComments.Queries
 where
 
 import Control.Lens
+import Data.Foldable qualified as Foldable
 import Data.Set qualified as Set
 import Data.Set.NonEmpty (NESet)
 import Data.Set.NonEmpty qualified as NESet
@@ -71,9 +72,12 @@ insertThumbprints :: (PG.QueryA m) => NESet Text -> m ()
 insertThumbprints thumbprints = do
   PG.execute_
     [PG.sql|
+      WITH thumbprints(thumbprint) AS (
+        SELECT * FROM ^{PG.singleColumnTable $ Foldable.toList thumbprints}
+      )
       INSERT INTO personal_keys (thumbprint)
-      SELECT * FROM ^{PG.singleColumnTable $ toList thumbprints}
-      ON CONFLICT (thumbprint) DO NOTHING
+      SELECT thumbprint FROM thumbprints
+      ON CONFLICT DO NOTHING
     |]
 
 -- Convert milliseconds since epoch to UTCTime _exactly_.
@@ -111,18 +115,19 @@ insertHistoryComments !_authZ projectId chunks = PG.pipelined $ do
       PG.execute_
         [PG.sql|
           WITH new_comments(author, created_at_ms, author_thumbprint, causal_hash, comment_hash) AS (
-            VALUES ^{PG.toTable commentsTable}
+            SELECT * FROM ^{PG.toTable commentsTable}
           )
           INSERT INTO history_comments(causal_id, author, created_at_ms, comment_hash, author_key_id)
             SELECT causal.id, nc.author, nc.created_at_ms, nc.comment_hash, pk.id
             FROM new_comments nc
-            JOIN causal causal
+            JOIN causals causal
               ON causal.hash = nc.causal_hash
             JOIN personal_keys pk
               ON pk.thumbprint = nc.author_thumbprint
-          ON CONFLICT DO NOTHING
+          ON CONFLICT (comment_hash) DO NOTHING
         |]
       where
+        commentsTable :: [(Text, Int64, Text, Hash32, Hash32)]
         commentsTable =
           comments <&> \HistoryComment {..} ->
             ( author,

sql/2025-11-20_history-comments.sql

@@ -7,11 +7,11 @@ CREATE TABLE personal_keys (
   -- The user registered to this key, which is proven by providing a signed 
   -- assertion using the key. 
   -- It may be null if the key is not yet registered to a user.
-  user_id INTEGER NULL REFERENCES users(id) ON DELETE SET NULL,
-  created_at TIMESTAMPTZ NOT NULL,
+  user_id UUID NULL REFERENCES users(id) ON DELETE SET NULL,
+  created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
 
   -- Ensure that public_jwk and user_id are either both null or both non-null.
-  CHECK (public_jwk IS NULL = user_id IS NULL)
+  CHECK ((public_jwk IS NULL) = (user_id IS NULL))
 );
 
 CREATE INDEX idx_personal_keys_user_id ON personal_keys(user_id, created_at)
@@ -59,7 +59,7 @@ CREATE TABLE history_comment_revisions (
   revision_hash TEXT UNIQUE NOT NULL,
 
   --  The signature of the comment's author on the revision hash.
-  author_signature BLOB NOT NULL
+  author_signature BYTEA NOT NULL
 );
 
 CREATE INDEX idx_history_comment_revisions_comment_id ON history_comment_revisions(comment_id, created_at_ms DESC);
@@ -69,7 +69,7 @@ CREATE INDEX idx_history_comment_revisions_comment_id ON history_comment_revisio
 -- on a given project.
 CREATE TABLE history_comment_revisions_project_discovery (
   comment_revision_id INTEGER NOT NULL REFERENCES history_comment_revisions(id),
-  project_id INTEGER NOT NULL REFERENCES projects(id),
+  project_id UUID NOT NULL REFERENCES projects(id),
   discovered_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
   PRIMARY KEY (project_id, comment_revision_id)
 );