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

Commit ea479472 by Sascha Depold

always use sequelize.query with fully qualified params

1 parent 0f9e5f30
Showing with 13 additions and 5 deletions
...@@ -148,7 +148,7 @@ module.exports = (function() { ...@@ -148,7 +148,7 @@ module.exports = (function() {
self.QueryGenerator.attributesToSQL(options) self.QueryGenerator.attributesToSQL(options)
) )
self.sequelize.query(sql).success(function() { self.sequelize.query(sql, null, {}).success(function() {
self.emit('renameColumn', null) self.emit('renameColumn', null)
emitter.emit('success', null) emitter.emit('success', null)
}).error(function(err) { }).error(function(err) {
...@@ -237,17 +237,25 @@ module.exports = (function() { ...@@ -237,17 +237,25 @@ module.exports = (function() {
var self = this var self = this
options = Utils._.extend({ options = Utils._.extend({
success: function(obj){}, success: function(){},
error: function(err){} error: function(){}
}, options || {}) }, options || {})
return new Utils.CustomEventEmitter(function(emitter) { return new Utils.CustomEventEmitter(function(emitter) {
var query = null var query = null
if(Array.isArray(sqlOrQueryParams)) { if(Array.isArray(sqlOrQueryParams)) {
if (sqlOrQueryParams.length === 1) {
sqlOrQueryParams.push(null)
}
if (sqlOrQueryParams.length === 2) {
sqlOrQueryParams.push({})
}
query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams) query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
} else { } else {
query = self.sequelize.query(sqlOrQueryParams) query = self.sequelize.query(sqlOrQueryParams, null, {})
} }
// append the query for better testing // append the query for better testing
......
...@@ -35,7 +35,7 @@ describe('Sequelize', function() { ...@@ -35,7 +35,7 @@ describe('Sequelize', function() {
this.User.sync().success(done) this.User.sync().success(done)
}) })
it('=>executes a query the internal way', function(done) { it('executes a query the internal way', function(done) {
var sql = "INSERT INTO " + this.User.tableName + " (username) VALUES ('john')" var sql = "INSERT INTO " + this.User.tableName + " (username) VALUES ('john')"
this.sequelize.query(sql, null, { raw: true }).success(function(result) { this.sequelize.query(sql, null, { raw: true }).success(function(result) {
expect(result).toBeNull() expect(result).toBeNull()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!