build cf

porsager · Jun 26, 2023 · 4f1d670 · 4f1d670
1 parent 8b82418
commit 4f1d670
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/cf/src/index.js b/cf/src/index.js
@@ -83,7 +83,7 @@ function Postgres(a, b) {
 
   return sql
 
-  function Sql(handler, instant) {
+  function Sql(handler) {
     handler.debug = options.debug
 
     Object.entries(options.types).reduce((acc, [name, type]) => {
@@ -112,7 +112,6 @@ function Postgres(a, b) {
         : typeof strings === 'string' && !args.length
           ? new Identifier(options.transform.column.to ? options.transform.column.to(strings) : strings)
           : new Builder(strings, args)
-      instant && query instanceof Query && query.execute()
       return query
     }
 
@@ -123,7 +122,6 @@ function Postgres(a, b) {
         ...options,
         simple: 'simple' in options ? options.simple : args.length === 0
       })
-      instant && query.execute()
       return query
     }
 
@@ -141,7 +139,6 @@ function Postgres(a, b) {
         ...options,
         simple: 'simple' in options ? options.simple : args.length === 0
       })
-      instant && query.execute()
       return query
     }
   }

diff --git a/cf/src/subscribe.js b/cf/src/subscribe.js
@@ -97,11 +97,15 @@ export default function Subscribe(postgres, options) {
     }
 
     stream.on('data', data)
-    stream.on('error', sql.close)
+    stream.on('error', error)
     stream.on('close', sql.close)
 
     return { stream, state: xs.state }
 
+    function error(e) {
+      console.error('Unexpected error during logical streaming - reconnecting', e)
+    }
+
     function data(x) {
       if (x[0] === 0x77)
         parse(x.subarray(25), state, sql.options.parsers, handle, options.transform)
@@ -191,7 +195,7 @@ function parse(x, state, parsers, handle, transform) {
       i += 4
       const key = x[i] === 75
       handle(key || x[i] === 79
-        ? tuples(x, key ? relation.keys : relation.columns, i += 3, transform).row
+        ? tuples(x, relation.columns, i += 3, transform).row
         : null
       , {
         command: 'delete',
@@ -205,7 +209,7 @@ function parse(x, state, parsers, handle, transform) {
       i += 4
       const key = x[i] === 75
       const xs = key || x[i] === 79
-        ? tuples(x, key ? relation.keys : relation.columns, i += 3, transform)
+        ? tuples(x, relation.columns, i += 3, transform)
         : null
 
       xs && (i = xs.i)