build

porsager · Apr 9, 2024 · 122fdb2 · 122fdb2
1 parent 34e9f7e
commit 122fdb2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/cf/src/connection.js b/cf/src/connection.js
@@ -213,8 +213,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function unnamed(q) {
     return Buffer.concat([
       Parse(q.statement.string, q.parameters, q.statement.types),
+      Bind(q.parameters, q.statement.types, q.statement.name, q.cursorName),
       DescribeUnnamed,
-      prepared(q)
+      q.cursorFn
+        ? Execute('', q.cursorRows)
+        : ExecuteUnnamed
     ])
   }
 
@@ -232,7 +235,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     q.onlyDescribe && (delete statements[q.signature])
     q.parameters = q.parameters || parameters
     q.prepared = q.prepare && q.signature in statements
-    q.describeFirst = q.onlyDescribe || (parameters.length && !q.prepared)
+    q.describeFirst = options.describe !== false && (q.onlyDescribe || (parameters.length && !q.prepared))
     q.statement = q.prepared
       ? statements[q.signature]
       : { string, types, name: q.prepare ? statementId + statementCount++ : '' }

diff --git a/cf/src/index.js b/cf/src/index.js
@@ -455,6 +455,7 @@ function parseOptions(a, b) {
     backoff         : backoff,
     keep_alive      : 60,
     prepare         : true,
+    describe        : true,
     debug           : false,
     fetch_types     : true,
     publications    : 'alltables',

diff --git a/cjs/src/connection.js b/cjs/src/connection.js
@@ -211,8 +211,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function unnamed(q) {
     return Buffer.concat([
       Parse(q.statement.string, q.parameters, q.statement.types),
+      Bind(q.parameters, q.statement.types, q.statement.name, q.cursorName),
       DescribeUnnamed,
-      prepared(q)
+      q.cursorFn
+        ? Execute('', q.cursorRows)
+        : ExecuteUnnamed
     ])
   }
 
@@ -230,7 +233,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     q.onlyDescribe && (delete statements[q.signature])
     q.parameters = q.parameters || parameters
     q.prepared = q.prepare && q.signature in statements
-    q.describeFirst = q.onlyDescribe || (parameters.length && !q.prepared)
+    q.describeFirst = options.describe !== false && (q.onlyDescribe || (parameters.length && !q.prepared))
     q.statement = q.prepared
       ? statements[q.signature]
       : { string, types, name: q.prepare ? statementId + statementCount++ : '' }

diff --git a/cjs/src/index.js b/cjs/src/index.js
@@ -454,6 +454,7 @@ function parseOptions(a, b) {
     backoff         : backoff,
     keep_alive      : 60,
     prepare         : true,
+    describe        : true,
     debug           : false,
     fetch_types     : true,
     publications    : 'alltables',

diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -214,8 +214,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function unnamed(q) {
     return Buffer.concat([
       Parse(q.statement.string, q.parameters, q.statement.types),
+      Bind(q.parameters, q.statement.types, q.statement.name, q.cursorName),
       DescribeUnnamed,
-      prepared(q)
+      q.cursorFn
+        ? Execute('', q.cursorRows)
+        : ExecuteUnnamed
     ])
   }
 
@@ -233,7 +236,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     q.onlyDescribe && (delete statements[q.signature])
     q.parameters = q.parameters || parameters
     q.prepared = q.prepare && q.signature in statements
-    q.describeFirst = q.onlyDescribe || (parameters.length && !q.prepared)
+    q.describeFirst = options.describe !== false && (q.onlyDescribe || (parameters.length && !q.prepared))
     q.statement = q.prepared
       ? statements[q.signature]
       : { string, types, name: q.prepare ? statementId + statementCount++ : '' }

diff --git a/deno/src/index.js b/deno/src/index.js
@@ -455,6 +455,7 @@ function parseOptions(a, b) {
     backoff         : backoff,
     keep_alive      : 60,
     prepare         : true,
+    describe        : true,
     debug           : false,
     fetch_types     : true,
     publications    : 'alltables',