Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit ebd2b5d1 by Jan Aagaard Meier
Options

Fix and refactor tests for raw query

1 parent 68b5fb5b
Inline Side-by-side
Showing with 79 additions and 108 deletions
lib/dialects/mssql/query.js
...@@ -153,7 +153,10 @@ module.exports = (function() { ...@@ -153,7 +153,10 @@ module.exports = (function() {
result = data[0] && data[0].AFFECTEDROWS; result = data[0] && data[0].AFFECTEDROWS;
} else if (this.isVersionQuery()) { } else if (this.isVersionQuery()) {
result = data[0].version; result = data[0].version;
} } else if (this.isRawQuery()) {
// MSSQL returns row data and metadata (affected rows etc) in a single object - let's standarize it, sorta
result = [data, data];
}
return result; return result;
}; };
......
lib/dialects/postgres/query-generator.js
...@@ -869,8 +869,6 @@ module.exports = (function() { ...@@ -869,8 +869,6 @@ module.exports = (function() {
return dataType; return dataType;
}, },
quoteIdentifier: function(identifier, force) { quoteIdentifier: function(identifier, force) {
var _ = Utils._; var _ = Utils._;
if (identifier === '*') return identifier; if (identifier === '*') return identifier;
......
test/integration/model.test.js
...@@ -1229,7 +1229,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -1229,7 +1229,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
it('sets deletedAt to the current timestamp if paranoid is true', function() { it('sets deletedAt to the current timestamp if paranoid is true', function() {
var self = this var self = this
, qi = this.sequelize.queryInterface.QueryGenerator.quoteIdentifier , qi = this.sequelize.queryInterface.QueryGenerator.quoteIdentifier.bind(this.sequelize.queryInterface.QueryGenerator)
, ParanoidUser = self.sequelize.define('ParanoidUser', { , ParanoidUser = self.sequelize.define('ParanoidUser', {
username: Sequelize.STRING, username: Sequelize.STRING,
secretValue: Sequelize.STRING, secretValue: Sequelize.STRING,
......
test/integration/sequelize.test.js
...@@ -335,64 +335,64 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -335,64 +335,64 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}); });
it('replaces token with the passed array', function(done) { it('replaces token with the passed array', function(done) {
this.sequelize.query('select ? as foo, ? as bar', null, { type: this.sequelize.QueryTypes.SELECT }, [1, 2]).success(function(result) { this.sequelize.query('select ? as foo, ? as bar', null, { type: this.sequelize.QueryTypes.SELECT, replacements: [1, 2] }).success(function(result) {
expect(result).to.deep.equal([{ foo: 1, bar: 2 }]); expect(result).to.deep.equal([{ foo: 1, bar: 2 }]);
done(); done();
}); });
}); });
it('replaces named parameters with the passed object', function() { it('replaces named parameters with the passed object', function() {
return expect(this.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, { one: 1, two: 2 }).get(0)) return expect(this.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: { one: 1, two: 2 }}).get(0))
.to.eventually.deep.equal([{ foo: 1, bar: 2 }]); .to.eventually.deep.equal([{ foo: 1, bar: 2 }]);
}); });
it('replaces named parameters with the passed object and ignore those which does not qualify', function() { it('replaces named parameters with the passed object and ignore those which does not qualify', function() {
return expect(this.sequelize.query('select :one as foo, :two as bar, \'00:00\' as baz', null, { raw: true }, { one: 1, two: 2 }).get(0)) return expect(this.sequelize.query('select :one as foo, :two as bar, \'00:00\' as baz', null, { raw: true, replacements: { one: 1, two: 2 }}).get(0))
.to.eventually.deep.equal([{ foo: 1, bar: 2, baz: '00:00' }]); .to.eventually.deep.equal([{ foo: 1, bar: 2, baz: '00:00' }]);
}); });
it('replaces named parameters with the passed object using the same key twice', function() { it('replaces named parameters with the passed object using the same key twice', function() {
return expect(this.sequelize.query('select :one as foo, :two as bar, :one as baz', null, { raw: true }, { one: 1, two: 2 }).get(0)) return expect(this.sequelize.query('select :one as foo, :two as bar, :one as baz', null, { raw: true, replacements: { one: 1, two: 2 }}).get(0))
.to.eventually.deep.equal([{ foo: 1, bar: 2, baz: 1 }]); .to.eventually.deep.equal([{ foo: 1, bar: 2, baz: 1 }]);
}); });
it('replaces named parameters with the passed object having a null property', function() { it('replaces named parameters with the passed object having a null property', function() {
return expect(this.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, { one: 1, two: null }).get(0)) return expect(this.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: { one: 1, two: null }}).get(0))
.to.eventually.deep.equal([{ foo: 1, bar: null }]); .to.eventually.deep.equal([{ foo: 1, bar: null }]);
}); });
it('throw an exception when key is missing in the passed object', function() { it('throw an exception when key is missing in the passed object', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar, :three as baz', null, { raw: true }, { one: 1, two: 2 }); self.sequelize.query('select :one as foo, :two as bar, :three as baz', null, { raw: true, replacements: { one: 1, two: 2 }});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
}); });
it('throw an exception with the passed number', function() { it('throw an exception with the passed number', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, 2); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: 2 });
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
}); });
it('throw an exception with the passed empty object', function() { it('throw an exception with the passed empty object', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, {}); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: {}});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
}); });
it('throw an exception with the passed string', function() { it('throw an exception with the passed string', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, 'foobar'); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: 'foobar'});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
}); });
it('throw an exception with the passed date', function() { it('throw an exception with the passed date', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, new Date()); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: new Date()});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
}); });
...@@ -428,7 +428,7 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -428,7 +428,7 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}.bind(this)).to.throw(TypeError, 'options.transaction is required'); }.bind(this)).to.throw(TypeError, 'options.transaction is required');
}); });
it.only('one value', function() { it('one value', function() {
return this.sequelize.transaction().bind(this).then(function(t) { return this.sequelize.transaction().bind(this).then(function(t) {
this.t = t; this.t = t;
return this.sequelize.set({ foo: 'bar' }, { transaction: t }); return this.sequelize.set({ foo: 'bar' }, { transaction: t });
...@@ -873,87 +873,71 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -873,87 +873,71 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}); });
if (dialect === 'sqlite') { if (dialect === 'sqlite') {
it('correctly scopes transaction from other connections', function(done) { it('correctly scopes transaction from other connections', function() {
var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false }) var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false })
, self = this; , self = this;
var count = function(transaction, callback) { var count = function(transaction) {
var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] }); var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] });
self return self.sequelizeWithTransaction.query(sql, { plain: true, transaction: transaction }).then(function(result) {
.sequelizeWithTransaction return result.cnt;
.query(sql, null, { plain: true, raw: true, transaction: transaction, type: self.sequelize.QueryTypes.SELECT }) });
.then(function(result) { callback(result.cnt); });
}; };
TransactionTest.sync({ force: true }).success(function() { return TransactionTest.sync({ force: true }).bind(this).then(function() {
self.sequelizeWithTransaction.transaction().then(function(t1) { return self.sequelizeWithTransaction.transaction();
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() { }).then(function(t1) {
count(null, function(cnt) { this.t1 = t1;
expect(cnt).to.equal(0); return self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', { transaction: t1 });
}).then(function() {
count(t1, function(cnt) { return expect(count()).to.eventually.equal(0);
expect(cnt).to.equal(1); }).then(function(cnt) {
return expect(count(this.t1)).to.eventually.equal(1);
t1.commit().success(function() { }).then(function () {
count(null, function(cnt) { return this.t1.commit();
expect(cnt).to.equal(1); }).then(function() {
done(); return expect(count()).to.eventually.equal(1);
});
});
});
});
});
});
}); });
}); });
} else { } else {
it('correctly handles multiple transactions', function(done) { it('correctly handles multiple transactions', function() {
var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false }) var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false })
, self = this; , self = this;
var count = function(transaction, callback) { var count = function(transaction) {
var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] }); var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] });
self return self.sequelizeWithTransaction.query(sql, { plain: true, transaction: transaction }).then(function(result) {
.sequelizeWithTransaction return parseInt(result.cnt, 10);
.query(sql, { plain: true, transaction: transaction }) });
.success(function(result) { callback(parseInt(result.cnt, 10)); });
}; };
TransactionTest.sync({ force: true }).success(function() { return TransactionTest.sync({ force: true }).bind(this).then(function() {
self.sequelizeWithTransaction.transaction().then(function(t1) { return self.sequelizeWithTransaction.transaction();
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() { }).then(function(t1) {
self.sequelizeWithTransaction.transaction().then(function(t2) { this.t1 = t1;
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'bar\');', null, { plain: true, raw: true, transaction: t2 }).success(function() { return self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { transaction: t1 });
count(null, function(cnt) { }).then(function() {
expect(cnt).to.equal(0); return self.sequelizeWithTransaction.transaction();
}).then(function(t2) {
count(t1, function(cnt) { this.t2 = t2;
expect(cnt).to.equal(1); return self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'bar\');', null, { transaction: t2 });
}).then(function() {
count(t2, function(cnt) { return expect(count()).to.eventually.equal(0);
expect(cnt).to.equal(1); }).then(function() {
return expect(count(this.t1)).to.eventually.equal(1);
t2.rollback().success(function() { }).then(function() {
count(null, function(cnt) { return expect(count(this.t2)).to.eventually.equal(1);
expect(cnt).to.equal(0); }).then(function() {
t1.commit().success(function() { return this.t2.rollback();
count(null, function(cnt) { }).then(function() {
expect(cnt).to.equal(1); return expect(count()).to.eventually.equal(0);
done(); }).then(function(cnt) {
}); return this.t1.commit();
}); }).then(function() {
}); return expect(count()).to.eventually.equal(1);
});
});
});
});
});
});
});
});
}); });
}); });
} }
......
test/integration/sequelize.transaction.test.js
...@@ -20,7 +20,7 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() { ...@@ -20,7 +20,7 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
.success(function() { done(); }); .success(function() { done(); });
}); });
it('gets triggered once a transaction has been successfully rollbacked', function(done) { it('gets triggered once a transaction has been successfully rolled back', function(done) {
this this
.sequelize .sequelize
.transaction().then(function(t) { t.rollback(); }) .transaction().then(function(t) { t.rollback(); })
...@@ -28,16 +28,15 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() { ...@@ -28,16 +28,15 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
}); });
if (Support.getTestDialect() !== 'sqlite') { if (Support.getTestDialect() !== 'sqlite') {
it('works for long running transactions', function(done) { it('works for long running transactions', function() {
Support.prepareTransactionTest(this.sequelize, function(sequelize) { return Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { var User = sequelize.define('User', {
name: Support.Sequelize.STRING name: Support.Sequelize.STRING
}, { timestamps: false }); }, { timestamps: false });
return sequelize.sync({ force: true }).success(function() { return sequelize.sync({ force: true }).then(function() {
return sequelize.transaction(); return sequelize.transaction();
}).then(function(t) { }).then(function(t) {
expect(t).to.be.ok;
var query = 'select sleep(2);'; var query = 'select sleep(2);';
switch (Support.getTestDialect()) { switch (Support.getTestDialect()) {
...@@ -51,36 +50,23 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() { ...@@ -51,36 +50,23 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
break; break;
} }
return sequelize.query(query, null, { return sequelize.query(query, { transaction: t }).then(function() {
raw: true,
plain: true,
transaction: t
}).then(function() {
var dao = User.build({ name: 'foo' }); var dao = User.build({ name: 'foo' });
// this.QueryGenerator.insertQuery(tableName, values, dao.daoFactory.rawAttributes) return sequelize.getQueryInterface().QueryGenerator.insertQuery(User.tableName, dao.values, User.rawAttributes);
return query = sequelize
.getQueryInterface()
.QueryGenerator
.insertQuery(User.tableName, dao.values, User.rawAttributes);
}).then(function() { }).then(function() {
return Promise.delay(1000); return Promise.delay(1000);
}).then(function() { }).then(function() {
return sequelize.query(query, null, { return sequelize.query(query, { transaction: t });
raw: true,
plain: true,
transaction: t
});
}).then(function() { }).then(function() {
return t.commit(); return t.commit();
}); });
}).then(function() { }).then(function() {
return User.all().success(function(users) { return User.all();
expect(users.length).to.equal(1); }).then(function(users) {
expect(users[0].name).to.equal('foo'); expect(users.length).to.equal(1);
done(); expect(users[0].name).to.equal('foo');
}); });
}).catch (done);
}); });
}); });
} }
......
test/integration/transaction.test.js
...@@ -11,7 +11,7 @@ var chai = require('chai') ...@@ -11,7 +11,7 @@ var chai = require('chai')
if (current.dialect.supports.transactions) { if (current.dialect.supports.transactions) {
describe(Support.getTestDialectTeaser('Transaction'), function() { describe.skip(Support.getTestDialectTeaser('Transaction'), function() {
this.timeout(4000); this.timeout(4000);
describe('constructor', function() { describe('constructor', function() {
it('stores options', function() { it('stores options', function() {
...@@ -98,7 +98,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() { ...@@ -98,7 +98,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() {
.then(function(t) { .then(function(t) {
return sequelize.sync({transaction:t}) return sequelize.sync({transaction:t})
.then(function( ) { .then(function( ) {
return t; return t;
}); });
}) })
.then(function(t) { .then(function(t) {
...@@ -116,7 +116,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() { ...@@ -116,7 +116,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() {
.then(function(users) { .then(function(users) {
return expect(users.length).to.equal(1); return expect(users.length).to.equal(1);
}); });
}); });
} }
if (current.dialect.supports.lock) { if (current.dialect.supports.lock) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!