Merge pull request #1903 from LJ1102/migrate-reload

Migrate v2 dao instance "reload" to v1.7 to allow for custom primary keys

lib/dao.js

@@ -450,8 +450,8 @@ module.exports = (function() {
   */
   */
   DAO.prototype.reload = function(options) {
   DAO.prototype.reload = function(options) {
     var where = [
     var where = [
-      this.QueryInterface.quoteIdentifier(this.__factory.tableName) + '.' + this.QueryInterface.quoteIdentifier('id')+'=?',
-      this.id
+      this.QueryInterface.quoteIdentifier(this.Model.getTableName()) + '.' + this.QueryInterface.quoteIdentifier(this.Model.primaryKeyAttributes[0] || 'id') + '=?',
+      this.get(this.Model.primaryKeyAttributes[0] || 'id', {raw: true})
     ]
     ]
 
 
     return new Utils.CustomEventEmitter(function(emitter) {
     return new Utils.CustomEventEmitter(function(emitter) {