Merge pull request #588 from shutterstock/fix/mysql2-can-use-other-port

Allow mysql2 to use a non-default port
knex · Apr 22, 2015 · f662bca · f662bca
2 parents cd3e34c + e749fef
commit f662bca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/dialects/mysql2/index.js b/lib/dialects/mysql2/index.js
@@ -8,7 +8,7 @@ var _            = require('lodash');
 var Client_MySQL = require('../mysql');
 var Promise      = require('../../promise');
 
-var configOptions = ['user', 'database', 'host', 'password', 'ssl', 'connection', 'stream'];
+var configOptions = ['user', 'database', 'host', 'password', 'port', 'ssl', 'connection', 'stream'];
 
 var mysql2;
 

diff --git a/test/index.js b/test/index.js
@@ -31,6 +31,11 @@ var clients = {
     name: 'mysql',
     client: knex({client: 'mysql'}).client,
   },
+  mysql2: {
+    name: 'mysql2',
+    client: knex({client: 'mysql2'}).client,
+    alias: 'mysql'
+  },
   sqlite3: {
     name: 'sqlite3',
     client: knex({client: 'sqlite3'}).client