Merge branch 'master' of github.com:sequelize/sequelize

changelog.md

@@ -18,6 +18,7 @@
 - [FEATURE] Promises/A support. [#626](https://github.com/sequelize/sequelize/pull/626). Thanks to kevinbeaty
 - [FEATURE] Added Getters/Setters method for DAO. [#538](https://github.com/sequelize/sequelize/pull/538). Thanks to iamjochem
 - [FEATURE] Added model wide validations. [#640](https://github.com/sequelize/sequelize/pull/640). Thanks to tremby
+- [FEATURE] `findOrCreate` now returns an additional flag (`created`), that is true if a model was created, and false if it was found [#648](https://github.com/sequelize/sequelize/pull/648). janmeier
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

lib/dao-factory.js

@@ -342,13 +342,13 @@ module.exports = (function() {
 
           self.create(params)
             .success(function (instance) {
-              emitter.emit('success', instance)
+              emitter.emit('success', instance, true)
             })
             .error( function (error) {
               emitter.emit('error', error)
             })
         } else {
-          emitter.emit('success', instance)
+          emitter.emit('success', instance, false)
         }
       }).error(function (error) {
         emitter.emit('error', error)

spec/dao-factory.spec.js

@@ -216,9 +216,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       this.User.create(data).success(function (user) {
         self.User.findOrCreate({
           username: user.username
-        }).success(function (_user) {
+        }).success(function (_user, created) {
           expect(_user.id).toEqual(user.id)
           expect(_user.username).toEqual('Username')
+          expect(created).toBeFalse()
+
           done()
         })
       })
@@ -232,10 +234,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         };
 
       this.User.create(data).success(function (user) {
-        self.User.findOrCreate(data).success(function (_user) {
+        self.User.findOrCreate(data).success(function (_user, created) {
           expect(_user.id).toEqual(user.id)
           expect(_user.username).toEqual('Username')
           expect(_user.data).toEqual('ThisIsData')
+          expect(created).toBeFalse()
+
           done()
         })
       })
@@ -250,9 +254,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
           data: 'ThisIsData'
         };
 
-      this.User.findOrCreate(data, default_values).success(function (user) {
+      this.User.findOrCreate(data, default_values).success(function (user, created) {
         expect(user.username).toEqual('Username')
         expect(user.data).toEqual('ThisIsData')
+        expect(created).toBeTrue()
+
         done()
       })
     })