Merge branch 'master' into milestones/2.0.0

changelog.md

@@ -64,6 +64,7 @@
 - [FEATURE] We can now define our own custom timestamp columns [#856](https://github.com/sequelize/sequelize/pull/856). thanks to durango
 - [FEATURE] We can now define our own custom timestamp columns [#856](https://github.com/sequelize/sequelize/pull/856). thanks to durango
 - [FEATURE] Scopes. [#748](https://github.com/sequelize/sequelize/pull/748). durango
 - [FEATURE] Scopes. [#748](https://github.com/sequelize/sequelize/pull/748). durango
 - [FEATURE] Model#find() / Model#findAll() is now working with strings. [#855](https://github.com/sequelize/sequelize/pull/855). Thanks to whito. 
 - [FEATURE] Model#find() / Model#findAll() is now working with strings. [#855](https://github.com/sequelize/sequelize/pull/855). Thanks to whito. 
+- [FEATURE] Shortcut method for getting a defined model. [#868](https://github.com/sequelize/sequelize/pull/868). Thanks to jwilm.
 - [REFACTORING] hasMany now uses a single SQL statement when creating and destroying associations, instead of removing each association seperately [690](https://github.com/sequelize/sequelize/pull/690). Inspired by [#104](https://github.com/sequelize/sequelize/issues/104). janmeier
 - [REFACTORING] hasMany now uses a single SQL statement when creating and destroying associations, instead of removing each association seperately [690](https://github.com/sequelize/sequelize/pull/690). Inspired by [#104](https://github.com/sequelize/sequelize/issues/104). janmeier
 - [REFACTORING] Consistent handling of offset across dialects. Offset is now always applied, and limit is set to max table size of not limit is given [#725](https://github.com/sequelize/sequelize/pull/725). janmeier
 - [REFACTORING] Consistent handling of offset across dialects. Offset is now always applied, and limit is set to max table size of not limit is given [#725](https://github.com/sequelize/sequelize/pull/725). janmeier
 - [REFACTORING] Moved Jasmine to Buster and then Buster to Mocha + Chai. sdepold and durango
 - [REFACTORING] Moved Jasmine to Buster and then Buster to Mocha + Chai. sdepold and durango

lib/sequelize.js

@@ -195,6 +195,20 @@ module.exports = (function() {
     return factory
     return factory
   }
   }
 
 
+  /**
+   Fetch a DAO factory
+
+   @param {String} daoName The name of a model defined with Sequelize.define
+   @returns {DAOFactory} The DAOFactory for daoName
+   */
+  Sequelize.prototype.model = function(daoName) {
+    if(!this.isDefined(daoName)) {
+      throw new Error(daoName + ' has not been defined')
+    }
+
+    return this.daoFactoryManager.getDAO(daoName)
+  }
+
   Sequelize.prototype.isDefined = function(daoName) {
   Sequelize.prototype.isDefined = function(daoName) {
     var daos = this.daoFactoryManager.daos
     var daos = this.daoFactoryManager.daos
     return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
     return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)

test/sequelize.test.js

@@ -51,6 +51,23 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
     })
     })
   })
   })
 
 
+  describe('model', function() {
+    it('throws an error if the dao being accessed is undefined', function() {
+      var self = this
+      expect(function() {
+        self.sequelize.model('Project')
+      }).to.throw(/project has not been defined/i)
+    })
+
+    it('returns the dao factory defined by daoName', function() {
+      var project = this.sequelize.define('Project', {
+        name: DataTypes.STRING
+      })
+
+      expect(this.sequelize.model('Project')).to.equal(project)
+    })
+  })
+
   describe('query', function() {
   describe('query', function() {
     afterEach(function(done) {
     afterEach(function(done) {
       this.sequelize.options.quoteIdentifiers = true
       this.sequelize.options.quoteIdentifiers = true