Merge 595c31b48f into b152be7951

crates/db_schema/replaceable_schema/triggers.sql

@@ -92,36 +92,47 @@ WITH post_diff AS (
         post_aggregates AS a
     SET
         comments = a.comments + diff.comments,
-        newest_comment_time = GREATEST (a.newest_comment_time, (
-                SELECT
-                    published
-                FROM select_new_rows AS new_comment
-                WHERE
-                    a.post_id = new_comment.post_id ORDER BY published DESC LIMIT 1)),
+        newest_comment_time = GREATEST (a.newest_comment_time, diff.newest_comment_time),
         newest_comment_time_necro = GREATEST (a.newest_comment_time_necro, (
                 SELECT
                     published
-                FROM select_new_rows AS new_comment
+                FROM unnest(diff.comments_array) AS new_comment (creator_id int, published timestamptz)
                 WHERE
-                    a.post_id = new_comment.post_id
                     -- Ignore comments from the post's creator
-                    AND a.creator_id != new_comment.creator_id
+                    a.creator_id != new_comment.creator_id
                     -- Ignore comments on old posts
                     AND a.published > (new_comment.published - '2 days'::interval)
                 ORDER BY published DESC LIMIT 1))
     FROM (
         SELECT
             (comment).post_id,
-            coalesce(sum(count_diff), 0) AS comments
-    FROM
-        select_old_and_new_rows AS old_and_new_rows
-    WHERE
-        r.is_counted (comment)
-    GROUP BY
-        (comment).post_id) AS diff
-    LEFT JOIN post ON post.id = diff.post_id
+            coalesce(sum(count_diff), 0) AS comments,
+            -- Old rows are excluded using `count_diff = 1`
+            max((comment).published) FILTER (WHERE count_diff = 1) AS newest_comment_time,
+            array_agg(((comment).creator_id, (comment).published)) FILTER (WHERE count_diff = 1) AS comments_array
+        FROM
+            select_old_and_new_rows AS old_and_new_rows
+        WHERE
+            r.is_counted (comment)
+        GROUP BY
+            (comment).post_id) AS diff
+        LEFT JOIN post ON post.id = diff.post_id
     WHERE
         a.post_id = diff.post_id
+        AND (diff.comments,
+            GREATEST (a.newest_comment_time, diff.newest_comment_time),
+            GREATEST (a.newest_comment_time_necro, (
+                    SELECT
+                        published
+                    FROM unnest(diff.comments_array) AS new_comment (creator_id int, published timestamptz)
+                    WHERE
+                        -- Ignore comments from the post's creator
+                        a.creator_id != new_comment.creator_id
+                        -- Ignore comments on old posts
+                        AND a.published > (new_comment.published - '2 days'::interval)
+                    ORDER BY published DESC LIMIT 1))) != (0,
+            a.newest_comment_time,
+            a.newest_comment_time_necro)
     RETURNING
         a.community_id,
         diff.comments,
@@ -496,3 +507,24 @@ CREATE TRIGGER delete_follow
     FOR EACH ROW
     EXECUTE FUNCTION r.delete_follow_before_person ();
 
+-- Triggers that change values before insert or update
+CREATE FUNCTION r.comment_change_values ()
+    RETURNS TRIGGER
+    LANGUAGE plpgsql
+    AS $$
+DECLARE
+    id text = NEW.id::text;
+BEGIN
+    -- Make `path` end with `id` if it doesn't already
+    IF NOT (NEW.path ~ ('*.' || id)::lquery) THEN
+        NEW.path = NEW.path || id;
+    END IF;
+    RETURN NEW;
+END
+$$;
+
+CREATE TRIGGER change_values
+    BEFORE INSERT OR UPDATE ON comment
+    FOR EACH ROW
+    EXECUTE FUNCTION r.comment_change_values ();
+

crates/db_schema/src/impls/comment.rs

@@ -72,6 +72,7 @@ impl Comment {
     parent_path: Option<&Ltree>,
   ) -> Result<Comment, Error> {
     let conn = &mut get_conn(pool).await?;
+    let comment_form = (comment_form, parent_path.map(|p| comment::path.eq(p)));
 
     conn
       .build_transaction()
@@ -94,23 +95,6 @@ impl Comment {
               .await?
           };
 
-          let comment_id = inserted_comment.id;
-
-          // You need to update the ltree column
-          let ltree = Ltree(if let Some(parent_path) = parent_path {
-            // The previous parent will already have 0 in it
-            // Append this comment id
-            format!("{}.{}", parent_path.0, comment_id)
-          } else {
-            // '0' is always the first path, append to that
-            format!("{}.{}", 0, comment_id)
-          });
-
-          let updated_comment = diesel::update(comment::table.find(comment_id))
-            .set(comment::path.eq(ltree))
-            .get_result::<Self>(conn)
-            .await?;
-
           // Update the child count for the parent comment_aggregates
           // You could do this with a trigger, but since you have to do this manually anyway,
           // you can just have it here
@@ -143,7 +127,7 @@ where ca.comment_id = c.id"
               sql_query(update_child_count_stmt).execute(conn).await?;
             }
           }
-          Ok(updated_comment)
+          Ok(inserted_comment)
         }) as _
       })
       .await