@effectstream/db 0.100.24 → 0.100.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/db",
-  "version": "0.100.24",
+  "version": "0.100.25",
   "license": "MIT",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -21,11 +21,11 @@
     "./version": "./migrations/system-version.ts"
   },
   "dependencies": {
-    "@effectstream/coroutine": "0.100.24",
-    "@effectstream/log": "0.100.24",
-    "@effectstream/runtime": "0.100.24",
-    "@effectstream/sync": "0.100.24",
-    "@effectstream/utils": "0.100.24",
+    "@effectstream/coroutine": "0.100.25",
+    "@effectstream/log": "0.100.25",
+    "@effectstream/runtime": "0.100.25",
+    "@effectstream/sync": "0.100.25",
+    "@effectstream/utils": "0.100.25",
     "@electric-sql/pglite": "^0.3.14",
     "@pgtyped/runtime": "2.4.2",
     "@pgtyped/parser": "2.4.2",

package/src/sql/rollup_inputs.queries.ts

@@ -189,7 +189,7 @@ export interface IGetAllScheduledDataQuery {
   result: IGetAllScheduledDataResult;
 }
 
-const getAllScheduledDataIR: any = {"usedParamSet":{"after_id":true,"limit":true},"params":[{"name":"after_id","required":false,"transform":{"type":"scalar"},"locs":[{"a":646,"b":654},{"a":1553,"b":1561}]},{"name":"limit","required":false,"transform":{"type":"scalar"},"locs":[{"a":1664,"b":1669}]}],"statement":"(\nSELECT\n  rollup_inputs.id,\n  NULL AS future_ms_timestamp,\n  rollup_input_future_block.future_block_height,\n  rollup_inputs.input_data,\n  rollup_inputs.from_address,\n  rollup_inputs.from_address_type,\n  rollup_input_origin.primitive_name,\n  rollup_input_origin.contract_address,\n  rollup_input_origin.caip2,\n  rollup_input_origin.tx_hash as \"origin_tx_hash\"\nFROM effectstream.rollup_inputs\nJOIN effectstream.rollup_input_origin ON effectstream.rollup_inputs.id = effectstream.rollup_input_origin.id\nJOIN effectstream.rollup_input_future_block ON effectstream.rollup_input_future_block.id = effectstream.rollup_inputs.id\nWHERE rollup_inputs.id > :after_id::INT\nORDER BY rollup_inputs.id ASC\n)\n\tUNION ALL \n(\nSELECT\n  rollup_inputs.id,\n  rollup_input_future_timestamp.future_ms_timestamp,\n  NULL AS \"future_block_height\",\n  rollup_inputs.input_data,\n  rollup_inputs.from_address,\n  rollup_inputs.from_address_type,\n  rollup_input_origin.primitive_name,\n  rollup_input_origin.contract_address,\n  rollup_input_origin.caip2,\n  rollup_input_origin.tx_hash as \"origin_tx_hash\"\nFROM effectstream.rollup_inputs\nJOIN effectstream.rollup_input_origin ON effectstream.rollup_inputs.id = effectstream.rollup_input_origin.id\nJOIN effectstream.rollup_input_future_timestamp ON effectstream.rollup_inputs.id = effectstream.rollup_input_future_timestamp.id\nLEFT OUTER JOIN effectstream.rollup_input_result\n  ON (effectstream.rollup_input_result.id = effectstream.rollup_inputs.id)\nWHERE \n effectstream.rollup_input_result.id IS NULL AND\n effectstream.rollup_inputs.id > :after_id::INT\nORDER BY rollup_input_future_timestamp.future_ms_timestamp ASC\n)\nORDER BY id ASC\nLIMIT COALESCE(:limit, 999999)"};
+const getAllScheduledDataIR: any = {"usedParamSet":{"after_id":true,"limit":true},"params":[{"name":"after_id","required":false,"transform":{"type":"scalar"},"locs":[{"a":817,"b":826},{"a":1724,"b":1733}]},{"name":"limit","required":false,"transform":{"type":"scalar"},"locs":[{"a":1835,"b":1841}]}],"statement":"(\nSELECT\n  rollup_inputs.id,\n  NULL AS future_ms_timestamp,\n  rollup_input_future_block.future_block_height,\n  rollup_inputs.input_data,\n  rollup_inputs.from_address,\n  rollup_inputs.from_address_type,\n  rollup_input_origin.primitive_name,\n  rollup_input_origin.contract_address,\n  rollup_input_origin.caip2,\n  rollup_input_origin.tx_hash as \"origin_tx_hash\"\nFROM effectstream.rollup_inputs\nJOIN effectstream.rollup_input_origin ON effectstream.rollup_inputs.id = effectstream.rollup_input_origin.id\nJOIN effectstream.rollup_input_future_block ON effectstream.rollup_input_future_block.id = effectstream.rollup_inputs.id\nLEFT OUTER JOIN effectstream.rollup_input_result\n  ON effectstream.rollup_input_result.id = effectstream.rollup_inputs.id\nWHERE effectstream.rollup_input_result.id IS NULL AND\n rollup_inputs.id > :after_id::INT\nORDER BY rollup_inputs.id ASC\n)\n\tUNION ALL \n(\nSELECT\n  rollup_inputs.id,\n  rollup_input_future_timestamp.future_ms_timestamp,\n  NULL AS \"future_block_height\",\n  rollup_inputs.input_data,\n  rollup_inputs.from_address,\n  rollup_inputs.from_address_type,\n  rollup_input_origin.primitive_name,\n  rollup_input_origin.contract_address,\n  rollup_input_origin.caip2,\n  rollup_input_origin.tx_hash as \"origin_tx_hash\"\nFROM effectstream.rollup_inputs\nJOIN effectstream.rollup_input_origin ON effectstream.rollup_inputs.id = effectstream.rollup_input_origin.id\nJOIN effectstream.rollup_input_future_timestamp ON effectstream.rollup_inputs.id = effectstream.rollup_input_future_timestamp.id\nLEFT OUTER JOIN effectstream.rollup_input_result\n  ON (effectstream.rollup_input_result.id = effectstream.rollup_inputs.id)\nWHERE \n effectstream.rollup_input_result.id IS NULL AND\n effectstream.rollup_inputs.id > :after_id::INT\nORDER BY rollup_input_future_timestamp.future_ms_timestamp ASC\n)\nORDER BY id ASC\nLIMIT COALESCE(:limit, 999999)"};
 
 /**
  * Query generated from SQL:
@@ -256,7 +256,7 @@ export interface IGetAllScheduledDataCountQuery {
   result: IGetAllScheduledDataCountResult;
 }
 
-const getAllScheduledDataCountIR: any = {"usedParamSet":{},"params":[],"statement":"SELECT COUNT(*) as total FROM (\n  (\n  SELECT rollup_inputs.id\n  FROM effectstream.rollup_inputs\n  JOIN effectstream.rollup_input_future_block ON effectstream.rollup_input_future_block.id = effectstream.rollup_inputs.id\n  )\n  UNION ALL \n  (\n  SELECT rollup_inputs.id\n  FROM effectstream.rollup_inputs\n  JOIN effectstream.rollup_input_future_timestamp ON effectstream.rollup_inputs.id = effectstream.rollup_input_future_timestamp.id\n  LEFT OUTER JOIN effectstream.rollup_input_result\n    ON (effectstream.rollup_input_result.id = effectstream.rollup_inputs.id)\n  WHERE rollup_input_result.id IS NULL\n  )\n) AS scheduled_data"};
+const getAllScheduledDataCountIR: any = {"usedParamSet":{},"params":[],"statement":"SELECT COUNT(*) as total FROM (\n  (\n  SELECT rollup_inputs.id\n  FROM effectstream.rollup_inputs\n  JOIN effectstream.rollup_input_future_block ON effectstream.rollup_input_future_block.id = effectstream.rollup_inputs.id\n  LEFT OUTER JOIN effectstream.rollup_input_result\n    ON effectstream.rollup_input_result.id = effectstream.rollup_inputs.id\n  WHERE rollup_input_result.id IS NULL\n  )\n  UNION ALL\n  (\n  SELECT rollup_inputs.id\n  FROM effectstream.rollup_inputs\n  JOIN effectstream.rollup_input_future_timestamp ON effectstream.rollup_inputs.id = effectstream.rollup_input_future_timestamp.id\n  LEFT OUTER JOIN effectstream.rollup_input_result\n    ON (effectstream.rollup_input_result.id = effectstream.rollup_inputs.id)\n  WHERE rollup_input_result.id IS NULL\n  )\n) AS scheduled_data"};
 
 /**
  * Query generated from SQL:
@@ -397,13 +397,16 @@ export interface IGetEarliestScheduledBlockHeightQuery {
   result: IGetEarliestScheduledBlockHeightResult;
 }
 
-const getEarliestScheduledBlockHeightIR: any = {"usedParamSet":{},"params":[],"statement":"SELECT MIN(future_block_height) AS min_block_height\nFROM effectstream.rollup_input_future_block"};
+const getEarliestScheduledBlockHeightIR: any = {"usedParamSet":{},"params":[],"statement":"SELECT MIN(rollup_input_future_block.future_block_height) AS min_block_height\nFROM effectstream.rollup_input_future_block\nLEFT OUTER JOIN effectstream.rollup_input_result\n  ON rollup_input_result.id = rollup_input_future_block.id\nWHERE rollup_input_result.id IS NULL"};
 
 /**
  * Query generated from SQL:
  * ```
- * SELECT MIN(future_block_height) AS min_block_height
+ * SELECT MIN(rollup_input_future_block.future_block_height) AS min_block_height
  * FROM effectstream.rollup_input_future_block
+ * LEFT OUTER JOIN effectstream.rollup_input_result
+ *   ON rollup_input_result.id = rollup_input_future_block.id
+ * WHERE rollup_input_result.id IS NULL
  * ```
  */
 export const getEarliestScheduledBlockHeight = new PreparedQuery<IGetEarliestScheduledBlockHeightParams,IGetEarliestScheduledBlockHeightResult>(getEarliestScheduledBlockHeightIR);

package/src/sql/rollup_inputs.sql

@@ -60,7 +60,10 @@ SELECT
 FROM effectstream.rollup_inputs
 JOIN effectstream.rollup_input_origin ON effectstream.rollup_inputs.id = effectstream.rollup_input_origin.id
 JOIN effectstream.rollup_input_future_block ON effectstream.rollup_input_future_block.id = effectstream.rollup_inputs.id
-WHERE rollup_inputs.id > :after_id::INT
+LEFT OUTER JOIN effectstream.rollup_input_result
+  ON effectstream.rollup_input_result.id = effectstream.rollup_inputs.id
+WHERE effectstream.rollup_input_result.id IS NULL AND
+ rollup_inputs.id > :after_id::INT
 ORDER BY rollup_inputs.id ASC
 )
 	UNION ALL 
@@ -95,8 +98,11 @@ SELECT COUNT(*) as total FROM (
   SELECT rollup_inputs.id
   FROM effectstream.rollup_inputs
   JOIN effectstream.rollup_input_future_block ON effectstream.rollup_input_future_block.id = effectstream.rollup_inputs.id
+  LEFT OUTER JOIN effectstream.rollup_input_result
+    ON effectstream.rollup_input_result.id = effectstream.rollup_inputs.id
+  WHERE rollup_input_result.id IS NULL
   )
-  UNION ALL 
+  UNION ALL
   (
   SELECT rollup_inputs.id
   FROM effectstream.rollup_inputs
@@ -145,8 +151,11 @@ WHERE rollup_input_future_timestamp.future_ms_timestamp <= :max_timestamp! AND
 ORDER BY rollup_input_future_timestamp.future_ms_timestamp ASC;
 
 /* @name getEarliestScheduledBlockHeight */
-SELECT MIN(future_block_height) AS min_block_height
-FROM effectstream.rollup_input_future_block;
+SELECT MIN(rollup_input_future_block.future_block_height) AS min_block_height
+FROM effectstream.rollup_input_future_block
+LEFT OUTER JOIN effectstream.rollup_input_result
+  ON rollup_input_result.id = rollup_input_future_block.id
+WHERE rollup_input_result.id IS NULL;
 
 /* @name getEarliestScheduledTimestamp */
 SELECT MIN(rollup_input_future_timestamp.future_ms_timestamp) AS min_timestamp