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

Commit 27f93c8b by Jason Valdron

fixes tests

1 parent 68d25d65
Showing with 28 additions and 3 deletions
File mode changed
...@@ -268,7 +268,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -268,7 +268,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
}) })
}) })
it('executes select query and parses dot notation results', function(done) { it('executes select query with dot notation results', function(done) {
var self = this var self = this
self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).complete(function() { self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).complete(function() {
self.sequelize.query(self.insertQuery).success(function() { self.sequelize.query(self.insertQuery).success(function() {
...@@ -276,6 +276,21 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -276,6 +276,21 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
.query("select username as " + qq("user.username") + " from " + qq(self.User.tableName) + "") .query("select username as " + qq("user.username") + " from " + qq(self.User.tableName) + "")
.complete(function(err, users) { .complete(function(err, users) {
expect(err).to.be.null expect(err).to.be.null
expect(users).to.deep.equal([{'user.username':'john'}])
done()
})
})
})
})
it('executes select query with dot notation results and nest it', function(done) {
var self = this
self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).complete(function() {
self.sequelize.query(self.insertQuery).success(function() {
self.sequelize
.query("select username as " + qq("user.username") + " from " + qq(self.User.tableName) + "", null, { raw: true, nest: true })
.complete(function(err, users) {
expect(err).to.be.null
expect(users.map(function(u){ return u.user })).to.deep.equal([{'username':'john'}]) expect(users.map(function(u){ return u.user })).to.deep.equal([{'username':'john'}])
done() done()
}) })
...@@ -313,11 +328,21 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -313,11 +328,21 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
}) })
}) })
it('destructs dot separated attributes when doing a raw query', function(done) { it('dot separated attributes when doing a raw query without nest', function(done) {
var tickChar = (dialect === 'postgres') ? '"' : '`'
, sql = "select 1 as " + Sequelize.Utils.addTicks('foo.bar.baz', tickChar)
this.sequelize.query(sql, null, { raw: true, nest: false }).success(function(result) {
expect(result).to.deep.equal([ { 'foo.bar.baz': 1 } ])
done()
})
})
it('destructs dot separated attributes when doing a raw query using nest', function(done) {
var tickChar = (dialect === 'postgres') ? '"' : '`' var tickChar = (dialect === 'postgres') ? '"' : '`'
, sql = "select 1 as " + Sequelize.Utils.addTicks('foo.bar.baz', tickChar) , sql = "select 1 as " + Sequelize.Utils.addTicks('foo.bar.baz', tickChar)
this.sequelize.query(sql, null, { raw: true }).success(function(result) { this.sequelize.query(sql, null, { raw: true, nest: true }).success(function(result) {
expect(result).to.deep.equal([ { foo: { bar: { baz: 1 } } } ]) expect(result).to.deep.equal([ { foo: { bar: { baz: 1 } } } ])
done() done()
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!