fix: unlisten channel names with period (porsager#550)

sk-shishi · web-flow · commit df0343d25e01 · 2023-02-02T07:04:15.000+01:00
Similar to porsager/postgres@a12108a
diff --git a/cjs/src/index.js b/cjs/src/index.js
@@ -192,7 +192,9 @@ function Postgres(a, b) {
         return
 
       delete channels[name]
-      return sql`unlisten ${ sql(name) }`
+      return sql`unlisten ${
+        sql.unsafe('"' + name.replace(/"/g, '""') + '"')
+      }`
     }
   }
 
diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -785,8 +785,10 @@ t('listen and notify with weird name', async() => {
   const sql = postgres(options)
   const channel = 'wat-;.ø.§'
   const result = await new Promise(async r => {
-    await sql.listen(channel, r)
+    const { unlisten } = await sql.listen(channel, r)
     sql.notify(channel, 'works')
+    await delay(50)
+    await unlisten()
   })
 
   return [
diff --git a/deno/src/index.js b/deno/src/index.js
@@ -193,7 +193,9 @@ function Postgres(a, b) {
         return
 
       delete channels[name]
-      return sql`unlisten ${ sql(name) }`
+      return sql`unlisten ${
+        sql.unsafe('"' + name.replace(/"/g, '""') + '"')
+      }`
     }
   }
 
diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -787,8 +787,10 @@ t('listen and notify with weird name', async() => {
   const sql = postgres(options)
   const channel = 'wat-;.ø.§'
   const result = await new Promise(async r => {
-    await sql.listen(channel, r)
+    const { unlisten } = await sql.listen(channel, r)
     sql.notify(channel, 'works')
+    await delay(50)
+    await unlisten()
   })
 
   return [
diff --git a/src/index.js b/src/index.js
@@ -192,7 +192,9 @@ function Postgres(a, b) {
         return
 
       delete channels[name]
-      return sql`unlisten ${ sql(name) }`
+      return sql`unlisten ${
+        sql.unsafe('"' + name.replace(/"/g, '""') + '"')
+      }`
     }
   }
 
diff --git a/tests/index.js b/tests/index.js
@@ -785,8 +785,10 @@ t('listen and notify with weird name', async() => {
   const sql = postgres(options)
   const channel = 'wat-;.ø.§'
   const result = await new Promise(async r => {
-    await sql.listen(channel, r)
+    const { unlisten } = await sql.listen(channel, r)
     sql.notify(channel, 'works')
+    await delay(50)
+    await unlisten()
   })
 
   return [

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,9 @@ function Postgres(a, b) {`
`192`	`192`	`return`
`193`	`193`
`194`	`194`	`delete channels[name]`
`195`		- return sql`unlisten ${ sql(name) }`
	`195`	+ return sql`unlisten ${
	`196`	`+ sql.unsafe('"' + name.replace(/"/g, '""') + '"')`
	`197`	+ }`
`196`	`198`	`}`
`197`	`199`	`}`
`198`	`200`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,9 @@ function Postgres(a, b) {`
`193`	`193`	`return`
`194`	`194`
`195`	`195`	`delete channels[name]`
`196`		- return sql`unlisten ${ sql(name) }`
	`196`	+ return sql`unlisten ${
	`197`	`+ sql.unsafe('"' + name.replace(/"/g, '""') + '"')`
	`198`	+ }`
`197`	`199`	`}`
`198`	`200`	`}`
`199`	`201`