不要怂,就是干,撸起袖子干!

Commit 33ff3eb2 by Sascha Depold

changes for mysql 2.0.0-alpha3

1 parent 62c33c23
var Pooling = require('generic-pool')
var mysql = require("mysql")
, Pooling = require('generic-pool')
, Query = require("./query")
, Utils = require("../../utils")
, without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
......@@ -106,18 +107,17 @@ module.exports = (function() {
}
var connect = function(done) {
var self = this
var client = require("mysql").createClient({
user: self.config.username,
password: self.config.password,
host: self.config.host,
port: self.config.port,
database: self.config.database
var connection = mysql.createConnection({
host: this.config.host,
port: this.config.port,
user: this.config.username,
password: this.config.password,
database: this.config.database
})
client.setMaxListeners(self.maxConcurrentQueries)
self.isConnecting = false
done(null, client)
return
// client.setMaxListeners(self.maxConcurrentQueries)
this.isConnecting = false
done(null, connection)
}
var enqueue = function(queueItem) {
......
var client = new (require("mysql").Client)()
, util = require("util")
, DataTypes = require("./data-types")
var mysql = require("mysql")
, connection = mysql.createConnection({})
, util = require("util")
, DataTypes = require("./data-types")
var Utils = module.exports = {
_: (function() {
......@@ -35,13 +36,13 @@ var Utils = module.exports = {
return s.replace("`", "")
},
escape: function(s) {
return client.escape(s).replace(/\\"/g, '"')
return connection.escape(s).replace(/\\"/g, '"')
},
format: function(arr) {
var query = arr[0]
, replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null}))
return client.format.apply(client, [query, replacements])
return connection.format.apply(connection, [query, replacements])
},
isHash: function(obj) {
return Utils._.isObject(obj) && !Utils._.isArray(obj);
......
......@@ -22,7 +22,7 @@
}
],
"dependencies": {
"mysql": "0.9.x",
"mysql": "~2.0.0-alpha3",
"underscore": "~1.4.0",
"underscore.string": "~2.3.0",
"lingo": "~0.0.5",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!