@secondlayer/subgraphs 3.14.1 → 3.14.3

package/dist/src/runtime/catchup.js

@@ -520,21 +520,22 @@ class SubgraphContext {
         "_tx_id",
         "_created_at"
       ];
-      const valuesList = Array.from(batch.rows.values()).map((r) => {
-        const vals = [
+      if (this.journal) {
+        statements.push(this.journalCaptureSQL(batch.table, batch.keyCols, Array.from(batch.rows.values()).map((r) => batch.keyCols.map((k) => escapeLiteral(r.keys[k])))));
+      }
+      for (const r of batch.rows.values()) {
+        const keyPred = batch.keyCols.map((k) => `"${k}" = ${escapeLiteral(r.keys[k])}`).join(" AND ");
+        const updSet = batch.deltaCols.map((c) => `"${c}" = COALESCE("${c}", 0) + (${String(r.deltas[c] ?? 0n)})`).join(", ");
+        statements.push(`UPDATE ${qualifiedTable} SET ${updSet} WHERE ${keyPred}`);
+        const insertVals = [
           ...batch.keyCols.map((k) => escapeLiteral(r.keys[k])),
           ...batch.deltaCols.map((c) => String(r.deltas[c] ?? 0n)),
           escapeLiteral(r.meta.blockHeight),
           escapeLiteral(r.meta.txId),
           "NOW()"
         ];
-        return `(${vals.join(", ")})`;
-      }).join(", ");
-      const setClauses = batch.deltaCols.map((c) => `"${c}" = COALESCE("${batch.table}"."${c}", 0) + EXCLUDED."${c}"`);
-      if (this.journal) {
-        statements.push(this.journalCaptureSQL(batch.table, batch.keyCols, Array.from(batch.rows.values()).map((r) => batch.keyCols.map((k) => escapeLiteral(r.keys[k])))));
+        statements.push(`INSERT INTO ${qualifiedTable} (${cols.map((c) => `"${c}"`).join(", ")}) ` + `SELECT ${insertVals.join(", ")} ` + `WHERE NOT EXISTS (SELECT 1 FROM ${qualifiedTable} WHERE ${keyPred})`);
       }
-      statements.push(`INSERT INTO ${qualifiedTable} (${cols.map((c) => `"${c}"`).join(", ")}) VALUES ${valuesList} ` + `ON CONFLICT (${batch.keyCols.map((k) => `"${k}"`).join(", ")}) DO UPDATE SET ${setClauses.join(", ")}`);
       incBatch = null;
       incBatchKey = "";
     };
@@ -1335,6 +1336,7 @@ import { resolveTraitContractIds } from "@secondlayer/shared/db/queries/contract
 import { advanceOperationCursor } from "@secondlayer/shared/db/queries/subgraph-operations";
 import {
   isByoSubgraph,
+  recordLiveProgress,
   recordSubgraphProcessed,
   resolveSubgraphDb,
   updateSubgraphStatus
@@ -2029,7 +2031,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   result.matched = matched.length;
   if (matched.length === 0) {
     if (!opts?.skipProgressUpdate) {
-      await updateSubgraphStatus(targetDb, subgraphName, "active", blockHeight);
+      await recordLiveProgress(targetDb, subgraphName, blockHeight);
     }
     return result;
   }
@@ -2052,8 +2054,11 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   const applyProgress = async (tx, rr) => {
     if (opts?.skipProgressUpdate)
       return;
-    const status = rr.errors > 0 && rr.processed === 0 ? "error" : "active";
-    await updateSubgraphStatus(tx, subgraphName, status, blockHeight);
+    if (rr.errors > 0 && rr.processed === 0) {
+      await updateSubgraphStatus(tx, subgraphName, "error", blockHeight);
+    } else {
+      await recordLiveProgress(tx, subgraphName, blockHeight);
+    }
     if (rr.processed > 0 || rr.errors > 0) {
       const lastError = rr.errors > 0 ? `${rr.errors} error(s) at block ${blockHeight}` : undefined;
       await recordSubgraphProcessed(tx, subgraphName, rr.processed, rr.errors, lastError);
@@ -2427,5 +2432,5 @@ export {
   catchUpSubgraph
 };
 
-//# debugId=8C07C6332915209664756E2164756E21
+//# debugId=055B56DE319F504964756E2164756E21
 //# sourceMappingURL=catchup.js.map