Fix query being executed when using describe on unsafe - fixes porsager#424

porsager · porsager · commit 3e47f0ace168 · 2022-07-22T21:41:10.000+02:00
diff --git a/src/query.js b/src/query.js
@@ -108,7 +108,8 @@ export class Query extends Promise {
   }
 
   describe() {
-    this.onlyDescribe = true
+    this.options.simple = false
+    this.onlyDescribe = this.options.prepare = true
     return this
   }
 
diff --git a/tests/index.js b/tests/index.js
@@ -616,6 +616,18 @@ t('unsafe simple includes columns', async() => {
   return ['x', (await sql.unsafe('select 1 as x').values()).columns[0].name]
 })
 
+t('unsafe describe', async() => {
+  const q = 'insert into test values (1)'
+  await sql`create table test(a int unique)`
+  await sql.unsafe(q).describe()
+  const x = await sql.unsafe(q).describe()
+  return [
+    q,
+    x.string,
+    await sql`drop table test`
+  ]
+})
+
 t('listen and notify', async() => {
   const sql = postgres(options)
   const channel = 'hello'

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ export class Query extends Promise {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`describe() {`
`111`		`- this.onlyDescribe = true`
	`111`	`+ this.options.simple = false`
	`112`	`+ this.onlyDescribe = this.options.prepare = true`
`112`	`113`	`return this`
`113`	`114`	`}`
`114`	`115`