fix: order of event arguments on the connection class

adonis-typings/database.ts

@@ -424,7 +424,7 @@ declare module '@ioc:Adonis/Lucid/Database' {
     /**
      * When error is received on a given connection
      */
-    on (event: 'error', callback: (connection: ConnectionContract, error: Error) => void): this
+    on (event: 'error', callback: (error: Error, connection: ConnectionContract) => void): this
 
     /**
      * Add a new connection to the list of managed connection. You must call
@@ -504,9 +504,9 @@ declare module '@ioc:Adonis/Lucid/Database' {
      * List of emitted events
      */
     on (event: 'connect', callback: (connection: ConnectionContract) => void): this
-    on (event: 'error', callback: (connection: ConnectionContract, error: Error) => void): this
+    on (event: 'error', callback: (error: Error, connection: ConnectionContract) => void): this
     on (event: 'disconnect', callback: (connection: ConnectionContract) => void): this
-    on (event: 'disconnect:error', callback: (connection: ConnectionContract, error: Error) => void): this
+    on (event: 'disconnect:error', callback: (error: Error, connection: ConnectionContract) => void): this
 
     /**
      * Make knex connection

src/Connection/Manager.ts

@@ -75,8 +75,8 @@ export class ConnectionManager extends EventEmitter implements ConnectionManager
     /**
      * Listens for error event to proxy it to the client
      */
-    connection.on('error', ($connection, error) => {
-      this.emit('error', $connection, error)
+    connection.on('error', (error, $connection) => {
+      this.emit('error', error, $connection)
     })
   }
 

test/connection/connection-manager.spec.ts

@@ -11,6 +11,7 @@
 
 import test from 'japa'
 
+import { Connection } from '../../src/Connection'
 import { ConnectionManager } from '../../src/Connection/Manager'
 import { getConfig, setup, cleanup, getLogger } from '../../test-helpers'
 
@@ -96,4 +97,53 @@ test.group('ConnectionManager', (group) => {
     await manager.release('primary')
     assert.isFalse(manager.has('primary'))
   })
+
+  test('proxy connect event', (assert, done) => {
+    assert.plan(1)
+
+    const manager = new ConnectionManager(getLogger())
+    manager.add('primary', getConfig())
+
+    manager.on('connect', (connection) => {
+      assert.instanceOf(connection, Connection)
+      done()
+    })
+
+    manager.connect('primary')
+  })
+
+  test('proxy disconnect event', async (assert, done) => {
+    assert.plan(1)
+
+    const manager = new ConnectionManager(getLogger())
+    manager.add('primary', getConfig())
+
+    manager.on('disconnect', (connection) => {
+      assert.instanceOf(connection, Connection)
+      done()
+    })
+
+    manager.connect('primary')
+    await manager.close('primary')
+  })
+
+  test('proxy error event', async (assert, done) => {
+    assert.plan(3)
+
+    const manager = new ConnectionManager(getLogger())
+    manager.add('primary', Object.assign({}, getConfig(), { client: null }))
+
+    manager.on('error', ({ message }, connection) => {
+      try {
+        assert.equal(message, 'knex: Required configuration option \'client\' is missing.')
+        assert.instanceOf(connection, Connection)
+        done()
+      } catch (error) {
+        done(error)
+      }
+    })
+
+    const fn = () => manager.connect('primary')
+    assert.throw(fn, /knex: Required configuration option/)
+  })
 })

test/connection/connection.spec.ts

@@ -121,13 +121,24 @@ test.group('Connection | setup', (group) => {
     await connection.disconnect()
   })
 
-  test('raise error when unable to make connection', (assert) => {
+  test('raise error when unable to make connection', (assert, done) => {
+    assert.plan(2)
+
     const connection = new Connection(
       'primary',
       Object.assign({}, getConfig(), { client: null }),
       getLogger(),
     )
 
+    connection.on('error', ({ message }) => {
+      try {
+        assert.equal(message, 'knex: Required configuration option \'client\' is missing.')
+        done()
+      } catch (error) {
+        done(error)
+      }
+    })
+
     const fn = () => connection.connect()
     assert.throw(fn, /knex: Required configuration option/)
   })