build

porsager · Jul 1, 2023 · e546ac0 · e546ac0
1 parent 7f6e0cc
commit e546ac0
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/cjs/src/connection.js b/cjs/src/connection.js
@@ -571,7 +571,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     final && (final(), final = null)
 
     if (result.command === 'BEGIN' && max !== 1 && !connection.reserved)
-      return errored(Errors.generic('UNSAFE_TRANSACTION', 'Only use sql.begin or max: 1'))
+      return errored(Errors.generic('UNSAFE_TRANSACTION', 'Only use sql.begin, sql.reserved or max: 1'))
 
     if (query.options.simple)
       return BindComplete()

diff --git a/cjs/src/index.js b/cjs/src/index.js
@@ -431,6 +431,7 @@ function parseOptions(a, b) {
   query.sslmode && (query.ssl = query.sslmode, delete query.sslmode)
   'timeout' in o && (console.log('The timeout option is deprecated, use idle_timeout instead'), o.idle_timeout = o.timeout) // eslint-disable-line
 
+  const ints = ['idle_timeout', 'connect_timeout', 'max_lifetime', 'max_pipeline', 'backoff', 'keep_alive']
   const defaults = {
     max             : 10,
     ssl             : false,
@@ -454,12 +455,16 @@ function parseOptions(a, b) {
     database        : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
     user            : user,
     pass            : o.pass || o.password || url.password || env.PGPASSWORD || '',
-    ...Object.entries(defaults).reduce((acc, [k, d]) =>
-      (acc[k] = k in o ? o[k] : k in query
+    ...Object.entries(defaults).reduce(
+      (acc, [k, d]) => {
+        const value = k in o ? o[k] : k in query
         ? (query[k] === 'disable' || query[k] === 'false' ? false : query[k])
-        : env['PG' + k.toUpperCase()] || d,
-      acc
-      ),
+          : env['PG' + k.toUpperCase()] || d
+        acc[k] = typeof value === 'string' && ints.includes(k)
+          ? +value
+          : value
+        return acc
+      },
       {}
     ),
     connection      : {

diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -2503,7 +2503,7 @@ t('concurrent cursors multiple connections', async() => {
 t('reserve connection', async() => {
   const reserved = await sql.reserve()
 
-  setTimeout(() => reserved.release(), 500)
+  setTimeout(() => reserved.release(), 510)
 
   const xs = await Promise.all([
     reserved`select 1 as x`.then(([{ x }]) => ({ time: Date.now(), x })),

diff --git a/deno/README.md b/deno/README.md
@@ -451,9 +451,14 @@ const result = await sql.file('query.sql', ['Murray', 68])
 ```
 
 ### Multiple statements in one query
-#### `await sql`select 1;select 2`.simple()
+#### ```await sql``.simple()```
 
-The postgres wire protocol supports "simple" and "extended" queries. "simple" queries supports multiple statements, but does not support any dynamic parameters. "extended" queries support parameters but only one statement. To use "simple" queries you can use sql``.simple(). That will create it as a simple query.
+The postgres wire protocol supports ["simple"](https://www.postgresql.org/docs/current/protocol-flow.html#id-1.10.6.7.4) and ["extended"](https://www.postgresql.org/docs/current/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY) queries. "simple" queries supports multiple statements, but does not support any dynamic parameters. "extended" queries support parameters but only one statement. To use "simple" queries you can use 
+```sql``.simple()```. That will create it as a simple query.
+
+```js
+await sql`select 1; select 2;`.simple()
+```
 
 ### Copy to/from as Streams
 

diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -575,7 +575,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     final && (final(), final = null)
 
     if (result.command === 'BEGIN' && max !== 1 && !connection.reserved)
-      return errored(Errors.generic('UNSAFE_TRANSACTION', 'Only use sql.begin or max: 1'))
+      return errored(Errors.generic('UNSAFE_TRANSACTION', 'Only use sql.begin, sql.reserved or max: 1'))
 
     if (query.options.simple)
       return BindComplete()

diff --git a/deno/src/index.js b/deno/src/index.js
@@ -432,6 +432,7 @@ function parseOptions(a, b) {
   query.sslmode && (query.ssl = query.sslmode, delete query.sslmode)
   'timeout' in o && (console.log('The timeout option is deprecated, use idle_timeout instead'), o.idle_timeout = o.timeout) // eslint-disable-line
 
+  const ints = ['idle_timeout', 'connect_timeout', 'max_lifetime', 'max_pipeline', 'backoff', 'keep_alive']
   const defaults = {
     max             : 10,
     ssl             : false,
@@ -455,12 +456,16 @@ function parseOptions(a, b) {
     database        : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
     user            : user,
     pass            : o.pass || o.password || url.password || env.PGPASSWORD || '',
-    ...Object.entries(defaults).reduce((acc, [k, d]) =>
-      (acc[k] = k in o ? o[k] : k in query
+    ...Object.entries(defaults).reduce(
+      (acc, [k, d]) => {
+        const value = k in o ? o[k] : k in query
         ? (query[k] === 'disable' || query[k] === 'false' ? false : query[k])
-        : env['PG' + k.toUpperCase()] || d,
-      acc
-      ),
+          : env['PG' + k.toUpperCase()] || d
+        acc[k] = typeof value === 'string' && ints.includes(k)
+          ? +value
+          : value
+        return acc
+      },
       {}
     ),
     connection      : {

diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -2505,7 +2505,7 @@ t('concurrent cursors multiple connections', async() => {
 t('reserve connection', async() => {
   const reserved = await sql.reserve()
 
-  setTimeout(() => reserved.release(), 500)
+  setTimeout(() => reserved.release(), 510)
 
   const xs = await Promise.all([
     reserved`select 1 as x`.then(([{ x }]) => ({ time: Date.now(), x })),