Fix fragments in transactions - fixes porsager#333

porsager · porsager · commit 75914c7c8531 · 2022-04-25T21:41:39.000+02:00
diff --git a/cjs/src/index.js b/cjs/src/index.js
@@ -207,7 +207,7 @@ function Postgres(a, b) {
     }
 
     async function scope(c, fn, name) {
-      const sql = Sql(handler, true)
+      const sql = Sql(handler)
       sql.savepoint = savepoint
       let uncaughtError
       name && await sql`savepoint ${ sql(name) }`
diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -237,19 +237,24 @@ t('Transaction requests are executed implicitly', async() => {
   const sql = postgres({ debug: true, idle_timeout: 1, fetch_types: false })
   return [
     'testing',
-    (await sql.begin(async sql => {
-      sql`select set_config('postgres_js.test', 'testing', true)`
-      return await sql`select current_setting('postgres_js.test') as x`
-    }))[0].x
+    (await sql.begin(sql => [
+      sql`select set_config('postgres_js.test', 'testing', true)`,
+      sql`select current_setting('postgres_js.test') as x`
+    ]))[1][0].x
   ]
 })
 
 t('Uncaught transaction request errors bubbles to transaction', async() => [
   '42703',
-  (await sql.begin(sql => (
+  (await sql.begin(sql => [
     sql`select wat`,
     sql`select current_setting('postgres_js.test') as x, ${ 1 } as a`
-  )).catch(e => e.code))
+  ]).catch(e => e.code))
+])
+
+t('Fragments in transactions', async() => [
+  true,
+  (await sql.begin(sql => sql`select true as x where ${ sql`1=1` }`))[0].x
 ])
 
 t('Transaction rejects with rethrown error', async() => [
diff --git a/deno/src/index.js b/deno/src/index.js
@@ -208,7 +208,7 @@ function Postgres(a, b) {
     }
 
     async function scope(c, fn, name) {
-      const sql = Sql(handler, true)
+      const sql = Sql(handler)
       sql.savepoint = savepoint
       let uncaughtError
       name && await sql`savepoint ${ sql(name) }`
diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -239,19 +239,24 @@ t('Transaction requests are executed implicitly', async() => {
   const sql = postgres({ debug: true, idle_timeout: 1, fetch_types: false })
   return [
     'testing',
-    (await sql.begin(async sql => {
-      sql`select set_config('postgres_js.test', 'testing', true)`
-      return await sql`select current_setting('postgres_js.test') as x`
-    }))[0].x
+    (await sql.begin(sql => [
+      sql`select set_config('postgres_js.test', 'testing', true)`,
+      sql`select current_setting('postgres_js.test') as x`
+    ]))[1][0].x
   ]
 })
 
 t('Uncaught transaction request errors bubbles to transaction', async() => [
   '42703',
-  (await sql.begin(sql => (
+  (await sql.begin(sql => [
     sql`select wat`,
     sql`select current_setting('postgres_js.test') as x, ${ 1 } as a`
-  )).catch(e => e.code))
+  ]).catch(e => e.code))
+])
+
+t('Fragments in transactions', async() => [
+  true,
+  (await sql.begin(sql => sql`select true as x where ${ sql`1=1` }`))[0].x
 ])
 
 t('Transaction rejects with rethrown error', async() => [
diff --git a/src/index.js b/src/index.js
@@ -207,7 +207,7 @@ function Postgres(a, b) {
     }
 
     async function scope(c, fn, name) {
-      const sql = Sql(handler, true)
+      const sql = Sql(handler)
       sql.savepoint = savepoint
       let uncaughtError
       name && await sql`savepoint ${ sql(name) }`
diff --git a/tests/index.js b/tests/index.js
@@ -237,19 +237,24 @@ t('Transaction requests are executed implicitly', async() => {
   const sql = postgres({ debug: true, idle_timeout: 1, fetch_types: false })
   return [
     'testing',
-    (await sql.begin(async sql => {
-      sql`select set_config('postgres_js.test', 'testing', true)`
-      return await sql`select current_setting('postgres_js.test') as x`
-    }))[0].x
+    (await sql.begin(sql => [
+      sql`select set_config('postgres_js.test', 'testing', true)`,
+      sql`select current_setting('postgres_js.test') as x`
+    ]))[1][0].x
   ]
 })
 
 t('Uncaught transaction request errors bubbles to transaction', async() => [
   '42703',
-  (await sql.begin(sql => (
+  (await sql.begin(sql => [
     sql`select wat`,
     sql`select current_setting('postgres_js.test') as x, ${ 1 } as a`
-  )).catch(e => e.code))
+  ]).catch(e => e.code))
+])
+
+t('Fragments in transactions', async() => [
+  true,
+  (await sql.begin(sql => sql`select true as x where ${ sql`1=1` }`))[0].x
 ])
 
 t('Transaction rejects with rethrown error', async() => [

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ function Postgres(a, b) {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`async function scope(c, fn, name) {`
`210`		`- const sql = Sql(handler, true)`
	`210`	`+ const sql = Sql(handler)`
`211`	`211`	`sql.savepoint = savepoint`
`212`	`212`	`let uncaughtError`
`213`	`213`	name && await sql`savepoint ${ sql(name) }`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ function Postgres(a, b) {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`async function scope(c, fn, name) {`
`211`		`- const sql = Sql(handler, true)`
	`211`	`+ const sql = Sql(handler)`
`212`	`212`	`sql.savepoint = savepoint`
`213`	`213`	`let uncaughtError`
`214`	`214`	name && await sql`savepoint ${ sql(name) }`