Merge remote-tracking branch 'upstream/master' into update_return

.travis.yml

@@ -21,4 +21,3 @@ node_js:
   - 0.6
   - 0.8
   - 0.9
-

spec/associations/belongs-to.spec.js

@@ -20,20 +20,20 @@ describe("[" + dialect.toUpperCase() + "] BelongsTo", function() {
 
   describe('setAssociation', function() {
     it('clears the association if null is passed', function(done) {
-      var User = this.sequelize.define('User', { username: Sequelize.STRING })
-        , Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , Task = this.sequelize.define('TaskXYZ', { title: Sequelize.STRING })
 
       Task.belongsTo(User)
 
       this.sequelize.sync({ force: true }).success(function() {
         User.create({ username: 'foo' }).success(function(user) {
           Task.create({ title: 'task' }).success(function(task) {
-            task.setUser(user).success(function() {
-              task.getUser().success(function(user) {
+            task.setUserXYZ(user).success(function() {
+              task.getUserXYZ().success(function(user) {
                 expect(user).not.toEqual(null)
 
-                task.setUser(null).success(function() {
-                  task.getUser().success(function(user) {
+                task.setUserXYZ(null).success(function() {
+                  task.getUserXYZ().success(function(user) {
                     expect(user).toEqual(null)
                     done()
                   })

spec/associations/has-one.spec.js

@@ -21,31 +21,29 @@ describe("[" + dialect.toUpperCase() + "] HasOne", function() {
 
   describe('setAssociation', function() {
     it('clears the association if null is passed', function(done) {
-      var User = this.sequelize.define('User', { username: Sequelize.STRING })
-        , Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , Task = this.sequelize.define('TaskXYZ', { title: Sequelize.STRING })
 
       User.hasOne(Task)
 
       this.sequelize.sync({ force: true }).success(function() {
-        setTimeout(function(){
-          User.create({ username: 'foo' }).success(function(user) {
-            Task.create({ title: 'task' }).success(function(task) {
-              user.setTask(task).success(function() {
-                user.getTask().success(function(task) {
-                  expect(task).not.toEqual(null)
-
-                  user.setTask(null).success(function() {
-                    user.getTask().success(function(task) {
-                      expect(task).toEqual(null)
-                      done()
-                    })
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTaskXYZ(task).success(function() {
+              user.getTaskXYZ().success(function(task) {
+                expect(task).not.toEqual(null)
+
+                user.setTaskXYZ(null).success(function() {
+                  user.getTaskXYZ().success(function(task) {
+                    expect(task).toEqual(null)
+                    done()
                   })
-
                 })
+
               })
             })
           })
-        }.bind(this), 500)
+        })
       })
     })
   })

spec/dao-factory.spec.js

@@ -364,13 +364,13 @@ describe("[" + dialect.toUpperCase() + "] DAOFactory", function() {
       })
     })
 
-    it('//returns the selected fields as instance.selectedValues', function(done) {
+    it('returns the selected fields as instance.selectedValues', function(done) {
       this.User.create({
         username: 'JohnXOXOXO'
       }).success(function() {
         this.User.find({
           where: { username: 'JohnXOXOXO' },
-          select: ['username']
+          attributes: ['username']
         }).success(function(user) {
           expect(user.selectedValues).toEqual({ username: 'JohnXOXOXO' })
           done()

spec/sequelize.spec.js

@@ -34,26 +34,39 @@ describe("[" + dialect.toUpperCase() + "] Sequelize", function() {
         username: Helpers.Sequelize.STRING
       })
 
-      this.insertQuery = "INSERT INTO " + this.User.tableName + " (username) VALUES ('john')"
+      this.insertQuery = "INSERT INTO " + this.User.tableName + " (username, createdAt, updatedAt) VALUES ('john', '2012-01-01 10:10:10', '2012-01-01 10:10:10')"
 
-      this.User.sync().success(done)
+      this.User.sync().success(done).error(function(err) {
+        console(err)
+        done()
+      })
     })
 
-    it('//executes a query the internal way', function(done) {
-      this.sequelize.query(this.insertQuery, null, { raw: true }).success(function(result) {
+    it('executes a query the internal way', function(done) {
+      this.sequelize.query(this.insertQuery, null, { raw: true }).success(function(result) {
         expect(result).toBeNull()
         done()
       })
+      .error(function(err) {
+        console.log(err)
+        expect(err).not.toBeDefined()
+        done()
+      })
     })
 
-    it('//executes a query if only the sql is passed', function(done) {
+    it('executes a query if only the sql is passed', function(done) {
       this.sequelize.query(this.insertQuery).success(function(result) {
-        expect(result).toBeNull()
+        expect(result).not.toBeDefined()
+        done()
+      })
+      .error(function(err) {
+        console.log(err)
+        expect(err).not.toBeDefined()
         done()
       })
     })
 
-    it('//executes select queries correctly', function(done) {
+    it('executes select queries correctly', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
         this.sequelize
           .query("select * from " + this.User.tableName)