Skip to content

public / sequelize

Go to a project

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

Commit 3831191b by Nuno Sousa
Options

Remove callback from transaction API in favor of promises

1 parent 0e53c4b7
Inline Side-by-side
Showing with 83 additions and 86 deletions
lib/sequelize.js
...@@ -759,23 +759,19 @@ module.exports = (function() { ...@@ -759,23 +759,19 @@ module.exports = (function() {
* @param {Object} [options= {}] * @param {Object} [options= {}]
* @param {Boolean} [options.autocommit=true] * @param {Boolean} [options.autocommit=true]
* @param {String} [options.isolationLevel='REPEATABLE READ'] See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options * @param {String} [options.isolationLevel='REPEATABLE READ'] See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options
* @param {Function} callback Called when the transaction has been set up and is ready for use. If the callback takes two arguments it will be called with err, transaction, otherwise it will be called with transaction. * @return {Promise}
* @return {Transaction}
* @fires error If there is an uncaught error during the transaction * @fires error If there is an uncaught error during the transaction
* @fires success When the transaction has ended (either comitted or rolled back) * @fires success When the transaction has ended (either comitted or rolled back)
*/ */
Sequelize.prototype.transaction = function(_options, _callback) { Sequelize.prototype.transaction = function(options) {
var options = (typeof _options === 'function') ? {} : _options if (Utils._.any(arguments, Utils._.isFunction)) {
, callback = (typeof _options === 'function') ? _options : _callback throw new Error('DEPRECATION WARNING: This function no longer accepts callbacks. Use sequelize.transaction().then(function (t) {}) instead.');
, wantsError = callback && callback.length === 2 }
, transaction = new Transaction(this, options);
var transaction = new Transaction(this, options);
return transaction.prepareEnvironment().then(function () {
wantsError ? callback(null, transaction) : callback && callback(transaction); return transaction.prepareEnvironment().then(function() {
return transaction; return transaction;
}).catch(function (err) {
if (wantsError) callback(err);
else throw err;
}); });
}; };
......
test/associations/belongs-to.test.js
...@@ -34,7 +34,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() { ...@@ -34,7 +34,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
Group.create({ name: 'bar' }).success(function(group) { Group.create({ name: 'bar' }).success(function(group) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
group.setUser(user, { transaction: t }).success(function() { group.setUser(user, { transaction: t }).success(function() {
Group.all().success(function(groups) { Group.all().success(function(groups) {
groups[0].getUser().success(function(associatedUser) { groups[0].getUser().success(function(associatedUser) {
...@@ -118,7 +118,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() { ...@@ -118,7 +118,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
Group.create({ name: 'bar' }).success(function(group) { Group.create({ name: 'bar' }).success(function(group) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
group.setUser(user, { transaction: t }).success(function() { group.setUser(user, { transaction: t }).success(function() {
Group.all().success(function(groups) { Group.all().success(function(groups) {
groups[0].getUser().success(function(associatedUser) { groups[0].getUser().success(function(associatedUser) {
...@@ -268,7 +268,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() { ...@@ -268,7 +268,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
Group.create({ name: 'bar' }).success(function(group) { Group.create({ name: 'bar' }).success(function(group) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
group.createUser({ username: 'foo' }, { transaction: t }).success(function() { group.createUser({ username: 'foo' }, { transaction: t }).success(function() {
group.getUser().success(function(user) { group.getUser().success(function(user) {
expect(user).to.be.null expect(user).to.be.null
......
test/associations/has-many.test.js
...@@ -58,7 +58,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -58,7 +58,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
expect(err).not.to.be.ok expect(err).not.to.be.ok
Article.create({ title: 'foo' }).success(function(article) { Article.create({ title: 'foo' }).success(function(article) {
Label.create({ text: 'bar' }).success(function(label) { Label.create({ text: 'bar' }).success(function(label) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
article.setLabels([ label ], { transaction: t }).success(function() { article.setLabels([ label ], { transaction: t }).success(function() {
Article.all({ transaction: t }).success(function(articles) { Article.all({ transaction: t }).success(function(articles) {
articles[0].hasLabel(label).success(function(hasLabel) { articles[0].hasLabel(label).success(function(hasLabel) {
...@@ -172,7 +172,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -172,7 +172,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
expect(err).not.to.be.ok expect(err).not.to.be.ok
Article.create({ title: 'foo' }).success(function(article) { Article.create({ title: 'foo' }).success(function(article) {
Label.create({ text: 'bar' }).success(function(label) { Label.create({ text: 'bar' }).success(function(label) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
article.setLabels([ label ], { transaction: t }).success(function() { article.setLabels([ label ], { transaction: t }).success(function() {
Article.all({ transaction: t }).success(function(articles) { Article.all({ transaction: t }).success(function(articles) {
articles[0].hasLabels([ label ]).success(function(hasLabel) { articles[0].hasLabels([ label ]).success(function(hasLabel) {
...@@ -267,7 +267,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -267,7 +267,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
Article.create({ title: 'foo' }).success(function(article) { Article.create({ title: 'foo' }).success(function(article) {
Label.create({ text: 'bar' }).success(function(label) { Label.create({ text: 'bar' }).success(function(label) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
article.setLabels([ label ], { transaction: t }).success(function() { article.setLabels([ label ], { transaction: t }).success(function() {
Label Label
.findAll({ where: { ArticleId: article.id }, transaction: undefined }) .findAll({ where: { ArticleId: article.id }, transaction: undefined })
...@@ -380,7 +380,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -380,7 +380,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
Article.create({ title: 'foo' }).success(function(article) { Article.create({ title: 'foo' }).success(function(article) {
Label.create({ text: 'bar' }).success(function(label) { Label.create({ text: 'bar' }).success(function(label) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
article.addLabel(label, { transaction: t }).success(function() { article.addLabel(label, { transaction: t }).success(function() {
Label Label
.findAll({ where: { ArticleId: article.id }, transaction: undefined }) .findAll({ where: { ArticleId: article.id }, transaction: undefined })
...@@ -543,7 +543,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -543,7 +543,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
Article.sync({ force: true }).success(function() { Article.sync({ force: true }).success(function() {
Label.sync({ force: true }).success(function() { Label.sync({ force: true }).success(function() {
Article.create({ title: 'foo' }).success(function(article) { Article.create({ title: 'foo' }).success(function(article) {
sequelize.transaction(function (t) { sequelize.transaction().then(function (t) {
article.createLabel({ text: 'bar' }, { transaction: t }).success(function() { article.createLabel({ text: 'bar' }, { transaction: t }).success(function() {
Label.findAll().success(function (labels) { Label.findAll().success(function (labels) {
expect(labels.length).to.equal(0); expect(labels.length).to.equal(0);
...@@ -758,7 +758,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -758,7 +758,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
Article.create({ title: 'foo' }).success(function(article) { Article.create({ title: 'foo' }).success(function(article) {
Label.create({ text: 'bar' }).success(function(label) { Label.create({ text: 'bar' }).success(function(label) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
article.setLabels([ label ], { transaction: t }).success(function() { article.setLabels([ label ], { transaction: t }).success(function() {
Article.all({ transaction: t }).success(function(articles) { Article.all({ transaction: t }).success(function(articles) {
articles[0].getLabels().success(function(labels) { articles[0].getLabels().success(function(labels) {
...@@ -1071,7 +1071,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -1071,7 +1071,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
Task.create({ title: 'task' }).success(function(task) { Task.create({ title: 'task' }).success(function(task) {
sequelize.transaction(function (t) { sequelize.transaction().then(function (t) {
task.createUser({ username: 'foo' }, { transaction: t }).success(function() { task.createUser({ username: 'foo' }, { transaction: t }).success(function() {
task.getUsers().success(function(users) { task.getUsers().success(function(users) {
expect(users).to.have.length(0) expect(users).to.have.length(0)
...@@ -1101,7 +1101,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -1101,7 +1101,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
Task.create({ title: 'task' }).success(function(task) { Task.create({ title: 'task' }).success(function(task) {
sequelize.transaction(function(t){ sequelize.transaction().then(function(t){
task.addUser(user, { transaction: t }).success(function() { task.addUser(user, { transaction: t }).success(function() {
task.hasUser(user).success(function(hasUser) { task.hasUser(user).success(function(hasUser) {
expect(hasUser).to.be.false expect(hasUser).to.be.false
......
test/associations/has-one.test.js
...@@ -32,7 +32,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() { ...@@ -32,7 +32,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
User.create({ username: 'foo' }).success(function(fakeUser) { User.create({ username: 'foo' }).success(function(fakeUser) {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
Group.create({ name: 'bar' }).success(function(group) { Group.create({ name: 'bar' }).success(function(group) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
group.setUser(user, { transaction: t }).success(function() { group.setUser(user, { transaction: t }).success(function() {
Group.all().success(function(groups) { Group.all().success(function(groups) {
groups[0].getUser().success(function(associatedUser) { groups[0].getUser().success(function(associatedUser) {
...@@ -89,7 +89,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() { ...@@ -89,7 +89,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
Group.create({ name: 'bar' }).success(function(group) { Group.create({ name: 'bar' }).success(function(group) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
group group
.setUser(user, { transaction: t }) .setUser(user, { transaction: t })
.success(function() { .success(function() {
...@@ -217,7 +217,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() { ...@@ -217,7 +217,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
sequelize.sync({ force: true }).success(function() { sequelize.sync({ force: true }).success(function() {
User.create({ username: 'bob' }).success(function(user) { User.create({ username: 'bob' }).success(function(user) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
user.createGroup({ name: 'testgroup' }, { transaction: t }).success(function() { user.createGroup({ name: 'testgroup' }, { transaction: t }).success(function() {
User.all().success(function (users) { User.all().success(function (users) {
users[0].getGroup().success(function (group) { users[0].getGroup().success(function (group) {
......
test/dao-factory.test.js
...@@ -548,7 +548,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -548,7 +548,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING, foo: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING, foo: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.find({ where: { username: 'foo' }, transaction: t }).success(function(user) { User.find({ where: { username: 'foo' }, transaction: t }).success(function(user) {
expect(user).to.not.be.null expect(user).to.not.be.null
...@@ -567,7 +567,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -567,7 +567,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING, foo: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING, foo: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.findOrInitialize({ username: 'foo' }).spread(function(user1) { User.findOrInitialize({ username: 'foo' }).spread(function(user1) {
User.findOrInitialize({ username: 'foo' }, { transaction: t }).spread(function(user2) { User.findOrInitialize({ username: 'foo' }, { transaction: t }).spread(function(user2) {
...@@ -646,7 +646,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -646,7 +646,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.sync({ force: true }).done(function() { User.sync({ force: true }).done(function() {
User.create({ username: 'foo' }).done(function() { User.create({ username: 'foo' }).done(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.update({ username: 'bar' }, {}, { transaction: t }).done(function(err) { User.update({ username: 'bar' }, {}, { transaction: t }).done(function(err) {
User.all().done(function(err, users1) { User.all().done(function(err, users1) {
User.all({ transaction: t }).done(function(err, users2) { User.all({ transaction: t }).done(function(err, users2) {
...@@ -856,7 +856,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -856,7 +856,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function() { User.create({ username: 'foo' }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.destroy({}, { transaction: t }).success(function() { User.destroy({}, { transaction: t }).success(function() {
User.count().success(function(count1) { User.count().success(function(count1) {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
...@@ -1121,7 +1121,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1121,7 +1121,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.count().success(function(count1) { User.count().success(function(count1) {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
...@@ -1199,7 +1199,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1199,7 +1199,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { age: Sequelize.INTEGER }) var User = sequelize.define('User', { age: Sequelize.INTEGER })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.bulkCreate([{ age: 2 }, { age: 5 }, { age: 3 }], { transaction: t }).success(function() { User.bulkCreate([{ age: 2 }, { age: 5 }, { age: 3 }], { transaction: t }).success(function() {
User.min('age').success(function(min1) { User.min('age').success(function(min1) {
User.min('age', { transaction: t }).success(function(min2) { User.min('age', { transaction: t }).success(function(min2) {
...@@ -1288,7 +1288,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1288,7 +1288,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { age: Sequelize.INTEGER }) var User = sequelize.define('User', { age: Sequelize.INTEGER })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.bulkCreate([{ age: 2 }, { age: 5 }, { age: 3 }], { transaction: t }).success(function() { User.bulkCreate([{ age: 2 }, { age: 5 }, { age: 3 }], { transaction: t }).success(function() {
User.max('age').success(function(min1) { User.max('age').success(function(min1) {
User.max('age', { transaction: t }).success(function(min2) { User.max('age', { transaction: t }).success(function(min2) {
...@@ -1829,7 +1829,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1829,7 +1829,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.where({ username: "foo" }).exec().success(function(users1) { User.where({ username: "foo" }).exec().success(function(users1) {
User.where({ username: "foo" }).exec({ transaction: t }).success(function(users2) { User.where({ username: "foo" }).exec({ transaction: t }).success(function(users2) {
......
test/dao-factory/create.test.js
...@@ -39,7 +39,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -39,7 +39,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User User
.sync({ force: true }) .sync({ force: true })
.success(function() { .success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.findOrCreate({ username: 'Username' }, { data: 'some data' }, { transaction: t }).complete(function(err) { User.findOrCreate({ username: 'Username' }, { data: 'some data' }, { transaction: t }).complete(function(err) {
expect(err).to.be.null expect(err).to.be.null
...@@ -183,7 +183,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -183,7 +183,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('user_with_transaction', { username: Sequelize.STRING }) var User = sequelize.define('user_with_transaction', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'user' }, { transaction: t }).success(function() { User.create({ username: 'user' }, { transaction: t }).success(function() {
User.count().success(function(count) { User.count().success(function(count) {
expect(count).to.equal(0) expect(count).to.equal(0)
...@@ -880,7 +880,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -880,7 +880,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User User
.bulkCreate([{ username: 'foo' }, { username: 'bar' }], { transaction: t }) .bulkCreate([{ username: 'foo' }, { username: 'bar' }], { transaction: t })
.success(function() { .success(function() {
......
test/dao-factory/find.test.js
...@@ -35,7 +35,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -35,7 +35,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.find({ username: 'foo' }).success(function(user1) { User.find({ username: 'foo' }).success(function(user1) {
User.find({ username: 'foo' }, { transaction: t }).success(function(user2) { User.find({ username: 'foo' }, { transaction: t }).success(function(user2) {
......
test/dao-factory/findAll.test.js
...@@ -38,7 +38,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -38,7 +38,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.findAll({ username: 'foo' }).success(function(users1) { User.findAll({ username: 'foo' }).success(function(users1) {
User.findAll({ transaction: t }).success(function(users2) { User.findAll({ transaction: t }).success(function(users2) {
...@@ -1337,7 +1337,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1337,7 +1337,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.findAndCountAll().success(function(info1) { User.findAndCountAll().success(function(info1) {
...@@ -1476,7 +1476,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1476,7 +1476,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.create({ username: 'foo' }, { transaction: t }).success(function() { User.create({ username: 'foo' }, { transaction: t }).success(function() {
User.all().success(function(users1) { User.all().success(function(users1) {
User.all({ transaction: t }).success(function(users2) { User.all({ transaction: t }).success(function(users2) {
......
test/dao.test.js
...@@ -278,7 +278,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -278,7 +278,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
User.create({ number: 1 }).success(function(user) { User.create({ number: 1 }).success(function(user) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
user.increment('number', { by: 2, transaction: t }).success(function() { user.increment('number', { by: 2, transaction: t }).success(function() {
User.all().success(function(users1) { User.all().success(function(users1) {
User.all({ transaction: t }).success(function(users2) { User.all({ transaction: t }).success(function(users2) {
...@@ -422,7 +422,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -422,7 +422,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
User.create({ number: 3 }).success(function(user) { User.create({ number: 3 }).success(function(user) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
user.decrement('number', { by: 2, transaction: t }).success(function() { user.decrement('number', { by: 2, transaction: t }).success(function() {
User.all().success(function(users1) { User.all().success(function(users1) {
User.all({ transaction: t }).success(function(users2) { User.all({ transaction: t }).success(function(users2) {
...@@ -550,7 +550,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -550,7 +550,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.update({ username: 'bar' }, {}, { transaction: t }).success(function() { User.update({ username: 'bar' }, {}, { transaction: t }).success(function() {
user.reload().success(function(user) { user.reload().success(function(user) {
expect(user.username).to.equal('foo') expect(user.username).to.equal('foo')
...@@ -753,7 +753,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -753,7 +753,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
var User = sequelize.define('User', { username: Support.Sequelize.STRING }) var User = sequelize.define('User', { username: Support.Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
User.build({ username: 'foo' }).save({ transaction: t }).success(function() { User.build({ username: 'foo' }).save({ transaction: t }).success(function() {
User.count().success(function(count1) { User.count().success(function(count1) {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
...@@ -1473,7 +1473,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -1473,7 +1473,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
user.updateAttributes({ username: 'bar' }, { transaction: t }).success(function() { user.updateAttributes({ username: 'bar' }, { transaction: t }).success(function() {
User.all().success(function(users1) { User.all().success(function(users1) {
User.all({ transaction: t }).success(function(users2) { User.all({ transaction: t }).success(function(users2) {
...@@ -1607,7 +1607,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -1607,7 +1607,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
User.create({ username: 'foo' }).success(function(user) { User.create({ username: 'foo' }).success(function(user) {
sequelize.transaction(function(t) { sequelize.transaction().then(function(t) {
user.destroy({ transaction: t }).success(function() { user.destroy({ transaction: t }).success(function() {
User.count().success(function(count1) { User.count().success(function(count1) {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
......
test/sequelize.test.js
...@@ -789,16 +789,32 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -789,16 +789,32 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
}) })
it('passes a transaction object to the callback', function(done) { it('passes a transaction object to the callback', function(done) {
this.sequelizeWithTransaction.transaction(function(t) { this.sequelizeWithTransaction.transaction().then(function(t) {
expect(t).to.be.instanceOf(Transaction) expect(t).to.be.instanceOf(Transaction)
done() done()
}) })
}) })
it('throws an error if a function was passed as the first argument', function() {
var self = this
expect(function() {
self.sequelizeWithTransaction.transaction(function() {})
}).to.throw('DEPRECATION WARNING: This function no longer accepts callbacks. Use sequelize.transaction().then(function (t) {}) instead.')
});
it('throws an error if a function was passed as the second argument', function() {
var self = this
expect(function() {
self.sequelizeWithTransaction.transaction(null, function() {})
}).to.throw('DEPRECATION WARNING: This function no longer accepts callbacks. Use sequelize.transaction().then(function (t) {}) instead.')
});
it('allows me to define a callback on the result', function(done) { it('allows me to define a callback on the result', function(done) {
this this
.sequelizeWithTransaction .sequelizeWithTransaction
.transaction(function(t) { t.commit() }) .transaction().then(function(t) { t.commit() })
.done(done) .done(done)
}) })
...@@ -817,7 +833,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -817,7 +833,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
} }
TransactionTest.sync({ force: true }).success(function() { TransactionTest.sync({ force: true }).success(function() {
self.sequelizeWithTransaction.transaction(function(t1) { self.sequelizeWithTransaction.transaction().then(function(t1) {
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() { self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() {
count(null, function(cnt) { count(null, function(cnt) {
expect(cnt).to.equal(0) expect(cnt).to.equal(0)
...@@ -852,9 +868,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -852,9 +868,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
} }
TransactionTest.sync({ force: true }).success(function() { TransactionTest.sync({ force: true }).success(function() {
self.sequelizeWithTransaction.transaction(function(t1) { self.sequelizeWithTransaction.transaction().then(function(t1) {
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() { self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() {
self.sequelizeWithTransaction.transaction(function(t2) { self.sequelizeWithTransaction.transaction().then(function(t2) {
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'bar\');', null, { plain: true, raw: true, transaction: t2 }).success(function() { self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'bar\');', null, { plain: true, raw: true, transaction: t2 }).success(function() {
count(null, function(cnt) { count(null, function(cnt) {
expect(cnt).to.equal(0) expect(cnt).to.equal(0)
...@@ -893,9 +909,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -893,9 +909,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
var User = this.sequelize.define('Users', { username: DataTypes.STRING }) var User = this.sequelize.define('Users', { username: DataTypes.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
self.sequelizeWithTransaction.transaction(function(t1) { self.sequelizeWithTransaction.transaction().then(function(t1) {
User.create({ username: 'foo' }, { transaction: t1 }).success(function(user) { User.create({ username: 'foo' }, { transaction: t1 }).success(function(user) {
self.sequelizeWithTransaction.transaction({ transaction: t1 }, function(t2) { self.sequelizeWithTransaction.transaction({ transaction: t1 }).then(function(t2) {
user.updateAttributes({ username: 'bar' }, { transaction: t2 }).success(function() { user.updateAttributes({ username: 'bar' }, { transaction: t2 }).success(function() {
t2.commit().then(function() { t2.commit().then(function() {
user.reload({ transaction: t1 }).success(function(newUser) { user.reload({ transaction: t1 }).success(function(newUser) {
...@@ -918,9 +934,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -918,9 +934,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
var User = this.sequelize.define('Users', { username: DataTypes.STRING }) var User = this.sequelize.define('Users', { username: DataTypes.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
self.sequelizeWithTransaction.transaction(function(t1) { self.sequelizeWithTransaction.transaction().then(function(t1) {
User.create({ username: 'foo' }, { transaction: t1 }).success(function(user) { User.create({ username: 'foo' }, { transaction: t1 }).success(function(user) {
self.sequelizeWithTransaction.transaction({ transaction: t1 }, function(t2) { self.sequelizeWithTransaction.transaction({ transaction: t1 }).then(function(t2) {
user.updateAttributes({ username: 'bar' }, { transaction: t2 }).success(function() { user.updateAttributes({ username: 'bar' }, { transaction: t2 }).success(function() {
t2.rollback().then(function() { t2.rollback().then(function() {
user.reload({ transaction: t2 }).success(function(newUser) { user.reload({ transaction: t2 }).success(function(newUser) {
...@@ -943,9 +959,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -943,9 +959,9 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
var User = this.sequelize.define('Users', { username: DataTypes.STRING }) var User = this.sequelize.define('Users', { username: DataTypes.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
self.sequelizeWithTransaction.transaction(function(t1) { self.sequelizeWithTransaction.transaction().then(function(t1) {
User.create({ username: 'foo' }, { transaction: t1 }).success(function(user) { User.create({ username: 'foo' }, { transaction: t1 }).success(function(user) {
self.sequelizeWithTransaction.transaction({ transaction: t1 }, function(t2) { self.sequelizeWithTransaction.transaction({ transaction: t1 }).then(function(t2) {
user.updateAttributes({ username: 'bar' }, { transaction: t2 }).success(function() { user.updateAttributes({ username: 'bar' }, { transaction: t2 }).success(function() {
t1.rollback().then(function() { t1.rollback().then(function() {
User.findAll().success(function(users) { User.findAll().success(function(users) {
......
test/sequelize.transaction.test.js
...@@ -11,14 +11,14 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () { ...@@ -11,14 +11,14 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
it("gets triggered once a transaction has been successfully committed", function(done) { it("gets triggered once a transaction has been successfully committed", function(done) {
this this
.sequelize .sequelize
.transaction(function(t) { t.commit(); }) .transaction().then(function(t) { t.commit(); })
.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 rollbacked", function(done) {
this this
.sequelize .sequelize
.transaction(function(t) { t.rollback(); }) .transaction().then(function(t) { t.rollback(); })
.success(function() { done(); }); .success(function() { done(); });
}); });
...@@ -93,7 +93,7 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () { ...@@ -93,7 +93,7 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
sequelize.config.username = 'foobarbaz'; sequelize.config.username = 'foobarbaz';
sequelize sequelize
.transaction(function() {}) .transaction().then(function() {})
.catch(function(err) { .catch(function(err) {
expect(err).to.not.be.undefined; expect(err).to.not.be.undefined;
done(); done();
...@@ -102,23 +102,6 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () { ...@@ -102,23 +102,6 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
} }
}); });
describe('callback', function() {
it("receives the transaction if only one argument is passed", function(done) {
this.sequelize.transaction(function(t) {
expect(t).to.be.instanceOf(Transaction);
t.commit();
}).done(done);
});
it("receives an error and the transaction if two arguments are passed", function(done) {
this.sequelize.transaction(function(err, t) {
expect(err).to.not.be.instanceOf(Transaction);
expect(t).to.be.instanceOf(Transaction);
t.commit();
}).done(done);
});
});
describe('complex long running example', function() { describe('complex long running example', function() {
it("works with promise syntax", function(done) { it("works with promise syntax", function(done) {
Support.prepareTransactionTest(this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
...@@ -130,7 +113,9 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () { ...@@ -130,7 +113,9 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
sequelize sequelize
.sync({ force: true }) .sync({ force: true })
.then(function() { .then(function() {
sequelize.transaction(function(transaction) { sequelize.transaction().then(function(transaction) {
expect(transaction).to.be.instanceOf(Transaction);
Test Test
.create({ name: 'Peter' }, { transaction: transaction }) .create({ name: 'Peter' }, { transaction: transaction })
.then(function() { .then(function() {
...@@ -173,8 +158,8 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () { ...@@ -173,8 +158,8 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
it("triggers the error event for the second transactions", function(done) { it("triggers the error event for the second transactions", function(done) {
var self = this var self = this
this.sequelize.transaction(function(t1) { this.sequelize.transaction().then(function(t1) {
self.sequelize.transaction(function(t2) { self.sequelize.transaction().then(function(t2) {
self self
.Model .Model
.create({ name: 'omnom' }, { transaction: t1 }) .create({ name: 'omnom' }, { transaction: t1 })
......
test/transaction.test.js
...@@ -47,7 +47,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -47,7 +47,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
this.sequelize.sync({ force: true }).then(function () { this.sequelize.sync({ force: true }).then(function () {
return User.create({ username: 'jan'}) return User.create({ username: 'jan'})
}).then(function () { }).then(function () {
self.sequelize.transaction(function (t1) { self.sequelize.transaction().then(function (t1) {
return User.find({ return User.find({
where: { where: {
username: 'jan' username: 'jan'
...@@ -58,7 +58,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -58,7 +58,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
}).then(function (t1Jan) { }).then(function (t1Jan) {
self.sequelize.transaction({ self.sequelize.transaction({
isolationLevel: Transaction.ISOLATION_LEVELS.READ_COMMITTED isolationLevel: Transaction.ISOLATION_LEVELS.READ_COMMITTED
}, function (t2) { }).then(function (t2) {
User.find({ User.find({
where: { where: {
username: 'jan' username: 'jan'
...@@ -99,7 +99,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -99,7 +99,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
this.sequelize.sync({ force: true }).then(function () { this.sequelize.sync({ force: true }).then(function () {
return User.create({ username: 'jan'}) return User.create({ username: 'jan'})
}).then(function () { }).then(function () {
self.sequelize.transaction(function (t1) { self.sequelize.transaction().then(function (t1) {
return User.find({ return User.find({
where: { where: {
username: 'jan' username: 'jan'
...@@ -110,7 +110,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () { ...@@ -110,7 +110,7 @@ describe(Support.getTestDialectTeaser("Transaction"), function () {
}).then(function (t1Jan) { }).then(function (t1Jan) {
self.sequelize.transaction({ self.sequelize.transaction({
isolationLevel: Transaction.ISOLATION_LEVELS.READ_COMMITTED isolationLevel: Transaction.ISOLATION_LEVELS.READ_COMMITTED
}, function (t2) { }).then(function (t2) {
User.find({ User.find({
where: { where: {
username: 'jan' username: 'jan'
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!