test(bugfix) Test for issues with sqlite and date parsing. Closes #3611, Closes #2644

lib/data-types.js

@@ -423,10 +423,14 @@ DATE.prototype.validate = function(value) {
 };
 };
 
 
 DATE.prototype.$applyTimezone = function (date, options) {
 DATE.prototype.$applyTimezone = function (date, options) {
-  if (moment.tz.zone(options.timezone)) {
-    date = moment(date).tz(options.timezone);
-  } else {
-    date = moment(date).utcOffset(options.timezone);
+  date = moment(date);
+
+  if (options.timezone) {
+    if (moment.tz.zone(options.timezone)) {
+      date = date.tz(options.timezone);
+    } else {
+      date = date.utcOffset(options.timezone);
+    }
   }
   }
 
 
   return date;
   return date;

test/integration/data-types.test.js

@@ -12,7 +12,7 @@ var chai = require('chai')
   , current = Support.sequelize
   , current = Support.sequelize
   , dialect = Support.getTestDialect();
   , dialect = Support.getTestDialect();
 
 
-describe.only(Support.getTestDialectTeaser('DataTypes'), function() {
+describe(Support.getTestDialectTeaser('DataTypes'), function() {
   it('allows me to return values from a custom parse function', function () {
   it('allows me to return values from a custom parse function', function () {
     var parse = Sequelize.DATE.parse = sinon.spy(function (value) {
     var parse = Sequelize.DATE.parse = sinon.spy(function (value) {
       return moment(value, 'YYYY-MM-DD HH:mm:ss Z');
       return moment(value, 'YYYY-MM-DD HH:mm:ss Z');

test/integration/dialects/sqlite/dao.test.js

@@ -10,9 +10,21 @@ if (dialect === 'sqlite') {
   describe('[SQLITE Specific] DAO', function() {
   describe('[SQLITE Specific] DAO', function() {
     beforeEach(function() {
     beforeEach(function() {
       this.User = this.sequelize.define('User', {
       this.User = this.sequelize.define('User', {
-        username: DataTypes.STRING
+        username: DataTypes.STRING,
+        dateField: {
+          type: DataTypes.DATE,
+          field: 'date_field'
+        }
       });
       });
-      return this.User.sync({ force: true });
+      this.Project = this.sequelize.define('project', {
+        dateField: {
+          type: DataTypes.DATE,
+          field: 'date_field'
+        }
+      });
+
+      this.User.hasMany(this.Project);
+      return this.sequelize.sync({ force: true });
     });
     });
 
 
     describe('findAll', function() {
     describe('findAll', function() {
@@ -25,13 +37,39 @@ if (dialect === 'sqlite') {
         return user.save().then(function() {
         return user.save().then(function() {
           return self.User.create({ username: 'new user' }).then(function() {
           return self.User.create({ username: 'new user' }).then(function() {
             return self.User.findAll({
             return self.User.findAll({
-              where: ['createdAt > ?', new Date(2012, 1, 1)]
+              where: { createdAt: { $gt:  new Date(2012, 1, 1) }}
             }).then(function(users) {
             }).then(function(users) {
               expect(users).to.have.length(1);
               expect(users).to.have.length(1);
             });
             });
           });
           });
         });
         });
       });
       });
+
+      it('handles dates with aliasses correctly #3611', function() {
+        return this.User.create({
+          dateField: new Date(2010, 10, 10)
+        }).bind(this).then(function () {
+          return this.User.findAll().get(0);
+        }).then(function (user) {
+          expect(user.get('dateField')).to.be.an.instanceof(Date);
+          expect(user.get('dateField')).to.equalTime(new Date(2010, 10, 10));
+        });
+      });
+
+      it('handles dates in includes correctly #2644', function() {
+        return this.User.create({
+          projects: [
+            { dateField: new Date(1990, 5, 5) }
+          ]
+        }, { include: [this.Project]}).bind(this).then(function () {
+          return this.User.findAll({
+            include: [this.Project]
+          }).get(0);
+        }).then(function (user) {
+          expect(user.projects[0].get('dateField')).to.be.an.instanceof(Date);
+          expect(user.projects[0].get('dateField')).to.equalTime(new Date(1990, 5, 5));
+        });
+      });
     });
     });
 
 
     describe('regression tests', function() {
     describe('regression tests', function() {
@@ -46,4 +84,4 @@ if (dialect === 'sqlite') {
       });
       });
     });
     });
   });
   });
-}
+}
\ No newline at end of file