Merge pull request sequelize#1849 from hycheung0509/1.7.0

mickhansen · mickhansen · commit c418ab8f8051 · 2014-06-03T08:26:43.000+02:00
[Ref sequelize#1824] Fix TypeError if got empty rows from findAndCountAll() with group
diff --git a/lib/dao-factory.js b/lib/dao-factory.js
@@ -617,7 +617,8 @@ module.exports = (function() {
       options.limit = null
 
       this.find(options, {raw: true, transaction: options.transaction}).proxy(emitter, {events: ['sql', 'error']}).success(function (result) {
-        emitter.emit('success', parseInt(result.count, 10))
+        var count = (result && result.count) ? parseInt(result.count, 10) : 0
+        emitter.emit('success', count)
       })
     }.bind(this)).run()
   }

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,8 @@ module.exports = (function() {`
`617`	`617`	`options.limit = null`
`618`	`618`
`619`	`619`	`this.find(options, {raw: true, transaction: options.transaction}).proxy(emitter, {events: ['sql', 'error']}).success(function (result) {`
`620`		`- emitter.emit('success', parseInt(result.count, 10))`
	`620`	`+ var count = (result && result.count) ? parseInt(result.count, 10) : 0`
	`621`	`+ emitter.emit('success', count)`
`621`	`622`	`})`
`622`	`623`	`}.bind(this)).run()`
`623`	`624`	`}`