Enabling name-spacing for the req object pg client instance

Resolves #75

Author: Toni Sharpe

index.js

@@ -116,22 +116,38 @@ function fastifyPostgres (fastify, options, next) {
     if (useTransaction) {
       const preHandler = async (req, reply) => {
         const client = await pool.connect()
-        req.pg = client
-        req.pg.query('BEGIN')
+
+        if (name) {
+          if (client[name]) {
+            throw new Error(`pg client '${name}' is a reserved keyword`)
+          } else if (req.pg[name]) {
+            throw new Error(`request client '${name}' has already been registered`)
+          }
+
+          req.pg[name] = client
+        } else {
+          if (req.pg && req.pg.query) {
+            throw new Error('request client has already been registered')
+          } else {
+            req.pg = client
+          }
+        }
+
+        name ? req.pg[name].query('BEGIN') : req.pg.query('BEGIN')
       }
 
       const onError = (req, reply, error, done) => {
         req[transactionFailedSymbol] = true
-        req.pg.query('ROLLBACK', done)
+        name ? req.pg[name].query('ROLLBACK', done) : req.pg.query('ROLLBACK', done)
       }
 
       const onSend = async (req) => {
         try {
           if (!req[transactionFailedSymbol]) {
-            await req.pg.query('COMMIT')
+            await name ? req.pg[name].query('COMMIT') : req.pg.query('COMMIT')
           }
         } finally {
-          req.pg.release()
+          name ? req.pg[name].release() : req.pg.release()
         }
       }
 

test/req-initialization.test.js

@@ -9,78 +9,74 @@ const { connectionString } = require('./helpers')
 const extractUserCount = response => parseInt(JSON.parse(response.payload).rows[0].userCount)
 
 test('fastify postgress useTransaction route option - ', t => {
-  test('set to true - ', t => {
-    test('passing queries provided', async t => {
-      const fastify = Fastify()
-      t.teardown(() => fastify.close())
+  test('queries that succeed provided', async t => {
+    const fastify = Fastify()
+    t.teardown(() => fastify.close())
 
-      await fastify.register(fastifyPostgres, {
-        connectionString
-      })
-
-      await fastify.pg.query('TRUNCATE users')
+    await fastify.register(fastifyPostgres, {
+      connectionString
+    })
 
-      await fastify.get('/count-users', async (req, reply) => {
-        const result = await fastify.pg.query('SELECT COUNT(*) AS "userCount" FROM users WHERE username=\'pass-opt-in\'')
+    await fastify.pg.query('TRUNCATE users')
 
-        reply.send(result)
-      })
+    await fastify.get('/count-users', async (req, reply) => {
+      const result = await fastify.pg.query('SELECT COUNT(*) AS "userCount" FROM users WHERE username=\'pass-opt-in\'')
 
-      await fastify.get('/pass', { pg: { transact: true } }, async (req, reply) => {
-        await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['pass-opt-in'])
-        await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['pass-opt-in'])
-        reply.send('complete')
-      })
+      reply.send(result)
+    })
 
-      await fastify.inject({
-        method: 'GET',
-        url: '/pass'
-      })
+    await fastify.get('/pass', { pg: { transact: true } }, async (req, reply) => {
+      await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['pass-opt-in'])
+      await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['pass-opt-in'])
+      reply.send('complete')
+    })
 
-      const response = await fastify.inject({
-        method: 'GET',
-        url: '/count-users'
-      })
+    await fastify.inject({
+      method: 'GET',
+      url: '/pass'
+    })
 
-      t.is(extractUserCount(response), 2)
+    const response = await fastify.inject({
+      method: 'GET',
+      url: '/count-users'
     })
-    test('failing queries provided', async t => {
-      const fastify = Fastify()
-      t.teardown(() => fastify.close())
 
-      await fastify.register(fastifyPostgres, {
-        connectionString
-      })
+    t.is(extractUserCount(response), 2)
+  })
+  test('queries that fail provided', async t => {
+    const fastify = Fastify()
+    t.teardown(() => fastify.close())
 
-      await fastify.pg.query('TRUNCATE users')
+    await fastify.register(fastifyPostgres, {
+      connectionString
+    })
 
-      await fastify.get('/count-users', async (req, reply) => {
-        const result = await fastify.pg.query('SELECT COUNT(*) AS "userCount" FROM users WHERE username=\'fail-opt-in\'')
+    await fastify.pg.query('TRUNCATE users')
 
-        reply.send(result)
-      })
+    await fastify.get('/count-users', async (req, reply) => {
+      const result = await fastify.pg.query('SELECT COUNT(*) AS "userCount" FROM users WHERE username=\'fail-opt-in\'')
 
-      await fastify.get('/fail', { pg: { transact: true } }, async (req, reply) => {
-        await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['fail-opt-in'])
-        await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['fail-opt-in'])
-        await req.pg.query('INSERT INTO nope(username) VALUES($1) RETURNING id', ['fail-opt-in'])
-        reply.send('complete')
-      })
+      reply.send(result)
+    })
 
-      await fastify.inject({
-        method: 'GET',
-        url: '/fail'
-      })
+    await fastify.get('/fail', { pg: { transact: true } }, async (req, reply) => {
+      await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['fail-opt-in'])
+      await req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', ['fail-opt-in'])
+      await req.pg.query('INSERT INTO nope(username) VALUES($1) RETURNING id', ['fail-opt-in'])
+      reply.send('complete')
+    })
 
-      const response = await fastify.inject({
-        method: 'GET',
-        url: '/count-users'
-      })
+    await fastify.inject({
+      method: 'GET',
+      url: '/fail'
+    })
 
-      t.is(extractUserCount(response), 0)
+    const response = await fastify.inject({
+      method: 'GET',
+      url: '/count-users'
     })
 
-    t.end()
+    t.is(extractUserCount(response), 0)
   })
 
   t.end()