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

Commit bacbaa8b by Sascha Depold

pg fixes

1 parent 608e5744
Showing with 16 additions and 18 deletions
...@@ -25,6 +25,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -25,6 +25,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
theDate: DataTypes.DATE, theDate: DataTypes.DATE,
aBool: DataTypes.BOOLEAN aBool: DataTypes.BOOLEAN
}) })
this.User.sync({ force: true }).success(function() { this.User.sync({ force: true }).success(function() {
done() done()
}) })
...@@ -364,7 +365,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -364,7 +365,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
expect(user1.isNewRecord).to.be.true expect(user1.isNewRecord).to.be.true
expect(user2.isNewRecord).to.be.false expect(user2.isNewRecord).to.be.false
expect(user3.isNewRecord).to.be.false expect(user3.isNewRecord).to.be.false
t.commit().success(done) t.commit().success(function() { done() })
}) })
}) })
}) })
...@@ -1041,7 +1042,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1041,7 +1042,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
expect(count1).to.equal(0) expect(count1).to.equal(0)
expect(count2).to.equal(2) expect(count2).to.equal(2)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -1266,7 +1267,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1266,7 +1267,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.all({ transaction: t }).success(function(users2) { User.all({ transaction: t }).success(function(users2) {
expect(users1[0].username).to.equal('foo') expect(users1[0].username).to.equal('foo')
expect(users2[0].username).to.equal('bar') expect(users2[0].username).to.equal('bar')
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -1410,7 +1411,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1410,7 +1411,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
expect(count1).to.equal(1) expect(count1).to.equal(1)
expect(count2).to.equal(0) expect(count2).to.equal(0)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -3216,7 +3217,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3216,7 +3217,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.findAndCountAll({ transaction: t }).success(function(info2) { User.findAndCountAll({ transaction: t }).success(function(info2) {
expect(info1.count).to.equal(0) expect(info1.count).to.equal(0)
expect(info2.count).to.equal(1) expect(info2.count).to.equal(1)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -3303,7 +3304,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3303,7 +3304,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.all({ transaction: t }).success(function(users2) { User.all({ transaction: t }).success(function(users2) {
expect(users1.length).to.equal(0) expect(users1.length).to.equal(0)
expect(users2.length).to.equal(1) expect(users2.length).to.equal(1)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -3392,7 +3393,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3392,7 +3393,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
expect(count1).to.equal(0) expect(count1).to.equal(0)
expect(count2).to.equal(1) expect(count2).to.equal(1)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -3470,7 +3471,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3470,7 +3471,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.min('age', { transaction: t }).success(function(min2) { User.min('age', { transaction: t }).success(function(min2) {
expect(min1).to.be.not.ok expect(min1).to.be.not.ok
expect(min2).to.equal(2) expect(min2).to.equal(2)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -3538,7 +3539,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3538,7 +3539,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.max('age', { transaction: t }).success(function(min2) { User.max('age', { transaction: t }).success(function(min2) {
expect(min1).to.be.not.ok expect(min1).to.be.not.ok
expect(min2).to.equal(5) expect(min2).to.equal(5)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
...@@ -4239,13 +4240,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -4239,13 +4240,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
this this
.User .User
.create({ username: "foo" }) .sync({ force: true })
.then(function() { .then(function() { return self.User.create({ username: "foo" }) })
return self.User.create({ username: "bar" }) .then(function() { return self.User.create({ username: "bar" }) })
}) .then(function() { return self.User.create({ username: "baz" }) })
.then(function() {
return self.User.create({ username: "baz" })
})
.then(function() { done() }) .then(function() { done() })
}) })
...@@ -4260,7 +4258,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -4260,7 +4258,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
User.where({ username: "foo" }).exec({ transaction: t }).success(function(users2) { User.where({ username: "foo" }).exec({ transaction: t }).success(function(users2) {
expect(users1).to.have.length(0) expect(users1).to.have.length(0)
expect(users2).to.have.length(1) expect(users2).to.have.length(1)
done() t.rollback().success(function() { done() })
}) })
}) })
}) })
......
...@@ -575,7 +575,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -575,7 +575,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
User.count({ transaction: t }).success(function(count2) { User.count({ transaction: t }).success(function(count2) {
expect(count1).to.equal(0) expect(count1).to.equal(0)
expect(count2).to.equal(1) expect(count2).to.equal(1)
t.rollback().success(done) t.rollback().success(function(){ done() })
}) })
}) })
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!