Please the linter

porsager · porsager · commit fb73e93071ec · 2023-07-02T20:29:07.000+02:00
diff --git a/src/index.js b/src/index.js
@@ -235,7 +235,7 @@ function Postgres(a, b) {
     const queries = Queue()
     let savepoints = 0
       , connection
-    let transactionId = null
+      , prepare = null
 
     try {
       await sql.unsafe('begin ' + options.replace(/[^a-z ]/ig, ''), [], { onexecute }).execute()
@@ -247,7 +247,7 @@ function Postgres(a, b) {
     async function scope(c, fn, name) {
       const sql = Sql(handler)
       sql.savepoint = savepoint
-      sql.prepare = prepare
+      sql.prepare = x => prepare = x.replace(/[^a-z0-9$-_. ]/gi)
       let uncaughtError
         , result
 
@@ -268,11 +268,12 @@ function Postgres(a, b) {
         throw e instanceof PostgresError && e.code === '25P02' && uncaughtError || e
       }
 
-      if (transactionId) {
-        !name && await sql.unsafe(`prepare transaction '${transactionId}'`)
-      }else{
-        !name && await sql`commit`
+      if (!name) {
+        prepare
+          ? await sql`prepare transaction '${ sql.unsafe(prepare) }'`
+          : await sql`commit`
       }
+
       return result
 
       function savepoint(name, fn) {
@@ -291,9 +292,6 @@ function Postgres(a, b) {
       }
     }
 
-    async function prepare(name) {
-      transactionId = name
-    }
     function onexecute(c) {
       connection = c
       move(c, reserved)
@@ -303,7 +301,6 @@ function Postgres(a, b) {
     }
   }
 
-
   function move(c, queue) {
     c.queue.remove(c)
     queue.push(c)
@@ -468,7 +465,7 @@ function parseOptions(a, b) {
     ...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])
+          ? (query[k] === 'disable' || query[k] === 'false' ? false : query[k])
           : env['PG' + k.toUpperCase()] || d
         acc[k] = typeof value === 'string' && ints.includes(k)
           ? +value
diff --git a/tests/index.js b/tests/index.js
@@ -246,7 +246,7 @@ t('Prepared transaction', async() => {
     await sql.prepare('tx1')
   })
 
-  await sql.unsafe("commit prepared 'tx1'")
+  await sql`commit prepared 'tx1'`
 
   return ['1', (await sql`select count(1) from test`)[0].count, await sql`drop table test`]
 })
