Config -> ConnectionConfig

felixge · felixge · commit b68c6fff8cce · 2012-07-11T12:18:37.000-05:00
Prepares PoolConfig / ServerConfig
diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
-var Connection = require('./lib/Connection');
+var Connection       = require('./lib/Connection');
+var ConnectionConfig = require('./lib/ConnectionConfig');
 
 exports.createConnection = function(config) {
-  return new Connection({config: config});
+  return new Connection({config: new ConnectionConfig(config)});
 };
diff --git a/lib/Connection.js b/lib/Connection.js
@@ -1,16 +1,16 @@
-var Net          = require('net');
-var Config       = require('./Config');
-var Protocol     = require('./protocol/Protocol');
-var SqlString    = require('./protocol/SqlString');
-var EventEmitter = require('events').EventEmitter;
-var Util         = require('util');
+var Net              = require('net');
+var ConnectionConfig = require('./ConnectionConfig');
+var Protocol         = require('./protocol/Protocol');
+var SqlString        = require('./protocol/SqlString');
+var EventEmitter     = require('events').EventEmitter;
+var Util             = require('util');
 
 module.exports = Connection;
 Util.inherits(Connection, EventEmitter);
 function Connection(options) {
   EventEmitter.call(this);
 
-  this.config = new Config(options.config);
+  this.config = options.config;
 
   this._socket        = options.socket;
   this._protocol      = new Protocol({config: this.config});
diff --git a/lib/ConnectionConfig.js b/lib/ConnectionConfig.js
@@ -2,10 +2,10 @@ var urlParse        = require('url').parse;
 var ClientConstants = require('./protocol/constants/client');
 var Charsets        = require('./protocol/constants/charsets');
 
-module.exports = Config;
-function Config(options) {
+module.exports = ConnectionConfig;
+function ConnectionConfig(options) {
   if (typeof options === 'string') {
-    options = Config.parseUrl(options);
+    options = ConnectionConfig.parseUrl(options);
   }
 
   this.host         = options.host || 'localhost';
@@ -22,7 +22,7 @@ function Config(options) {
 
   this.maxPacketSize = 0;
   this.charsetNumber = (options.charset)
-    ? Config.getCharsetNumber(options.charset)
+    ? ConnectionConfig.getCharsetNumber(options.charset)
     : Charsets.UTF8_GENERAL_CI;
 
   this.clientFlags =
@@ -45,11 +45,11 @@ function Config(options) {
   }
 }
 
-Config.getCharsetNumber = function(charset) {
+ConnectionConfig.getCharsetNumber = function(charset) {
   return Charsets[charset];
 };
 
-Config.parseUrl = function(url) {
+ConnectionConfig.parseUrl = function(url) {
   url = urlParse(url, true);
 
   var options = {
diff --git a/test/unit/test-ConnectionConfig.js b/test/unit/test-ConnectionConfig.js
@@ -1,13 +1,13 @@
-var common   = require('../common');
-var test     = require('utest');
-var assert   = require('assert');
-var Charsets = require(common.lib + '/protocol/constants/charsets');
-var Config   = require(common.lib + '/Config');
+var common           = require('../common');
+var test             = require('utest');
+var assert           = require('assert');
+var Charsets         = require(common.lib + '/protocol/constants/charsets');
+var ConnectionConfig = require(common.lib + '/ConnectionConfig');
 
-test('Config#Constructor', {
+test('ConnectionConfig#Constructor', {
   'takes user,pw,host,port,db from url string': function() {
     var url    = 'mysql://myuser:mypass@myhost:3333/mydb';
-    var config = new Config(url);
+    var config = new ConnectionConfig(url);
 
     assert.equal(config.host, 'myhost');
     assert.equal(config.port, 3333);
@@ -18,7 +18,7 @@ test('Config#Constructor', {
 
   'allows additional options via url query': function() {
     var url    = 'mysql://myhost/mydb?debug=true&charset=BIG5_CHINESE_CI';
-    var config = new Config(url);
+    var config = new ConnectionConfig(url);
 
     assert.equal(config.host, 'myhost');
     assert.equal(config.port, 3306);
