Merge pull request #11 from wedgwood/features/multi-connections

feature: multiple connections

Author: delvedor

index.js

@@ -13,22 +13,34 @@ function fastifyPostgres (fastify, options, next) {
     }
   }
 
-  const pool = new pg.Pool(options)
+  const name = options.name
+  delete options.name
 
-  fastify.decorate('pg', {
+  const pool = new pg.Pool(options)
+  const db = {
     connect: pool.connect.bind(pool),
     pool: pool,
     Client: pg.Client,
     query: pool.query.bind(pool)
-  })
+  }
 
-  fastify.addHook('onClose', onClose)
+  if (name) {
+    if (!fastify.pg) {
+      fastify.decorate('pg', {})
+    }
 
-  next()
-}
+    fastify.pg[name] = db
+  } else {
+    if (fastify.pg) {
+      next(new Error('fastify-postgres has already registered'))
+    } else {
+      fastify.pg = db
+    }
+  }
 
-function onClose (fastify, done) {
-  fastify.pg.pool.end(done)
+  fastify.addHook('onClose', (fastify, done) => pool.end(done))
+
+  next()
 }
 
 module.exports = fp(fastifyPostgres, '>=0.13.1')

test.js

@@ -116,3 +116,121 @@ test('use native module', t => {
       })
   })
 })
+
+test('fastify.pg.test namespace should exist', t => {
+  t.plan(6)
+
+  const fastify = Fastify()
+
+  fastify.register(fastifyPostgres, {
+    name: 'test',
+    connectionString: 'postgres://postgres@localhost/postgres'
+  })
+
+  fastify.ready(err => {
+    t.error(err)
+    t.ok(fastify.pg)
+    t.ok(fastify.pg.test)
+    t.ok(fastify.pg.test.connect)
+    t.ok(fastify.pg.test.pool)
+    t.ok(fastify.pg.test.Client)
+    fastify.close()
+  })
+})
+
+test('fastify.pg.test should be able to connect and perform a query', t => {
+  t.plan(4)
+
+  const fastify = Fastify()
+
+  fastify.register(fastifyPostgres, {
+    name: 'test',
+    connectionString: 'postgres://postgres@localhost/postgres'
+  })
+
+  fastify.ready(err => {
+    t.error(err)
+    fastify.pg.test.connect(onConnect)
+  })
+
+  function onConnect (err, client, done) {
+    t.error(err)
+    client.query('SELECT NOW()', (err, result) => {
+      done()
+      t.error(err)
+      t.ok(result.rows)
+      fastify.close()
+    })
+  }
+})
+
+test('fastify.pg.test use query util', t => {
+  t.plan(3)
+
+  const fastify = Fastify()
+
+  fastify.register(fastifyPostgres, {
+    name: 'test',
+    connectionString: 'postgres://postgres@localhost/postgres'
+  })
+
+  fastify.ready(err => {
+    t.error(err)
+    fastify.pg.test.query('SELECT NOW()', (err, result) => {
+      t.error(err)
+      t.ok(result.rows)
+      fastify.close()
+    })
+  })
+})
+
+test('fastify.pg.test use query util with promises', t => {
+  t.plan(2)
+
+  const fastify = Fastify()
+
+  fastify.register(fastifyPostgres, {
+    name: 'test',
+    connectionString: 'postgres://postgres@localhost/postgres'
+  })
+
+  fastify.ready(err => {
+    t.error(err)
+    fastify.pg.test
+      .query('SELECT NOW()')
+      .then(result => {
+        t.ok(result.rows)
+        fastify.close()
+      })
+      .catch(err => {
+        t.fail(err)
+        fastify.close()
+      })
+  })
+})
+
+test('fastify.pg.test use native module', t => {
+  t.plan(2)
+
+  const fastify = Fastify()
+
+  fastify.register(fastifyPostgres, {
+    name: 'test',
+    connectionString: 'postgres://postgres@localhost/postgres',
+    native: true
+  })
+
+  fastify.ready(err => {
+    t.error(err)
+    fastify.pg.test
+      .query('SELECT 1 AS one')
+      .then(result => {
+        t.ok(result.rows[0].one === 1)
+        fastify.close()
+      })
+      .catch(err => {
+        t.fail(err)
+        fastify.close()
+      })
+  })
+})