Merge branch 'master' into refactorings/eager_loading

changelog.md

+# v2.0.0 #
+- [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
+
 # v1.6.0 #
 - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3
+- [DEPENDENCIES] mysql is now an optional dependency. #355 (thanks to clkao)
 - [REFACTORING] separated tests for dialects
-- [REFACTORING] reduced number of sql queries used for adding an element to a N:M association #449 (thanks to innofluence/janmeier)
+- [REFACTORING] reduced number of sql queries used for adding an element to a N:M association. #449 (thanks to innofluence/janmeier)
 - [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango)
 - [OTHERS] Explicitly target ./docs folder for generate-docs script. #444 (thanks to carsondarling)
 - [BUG] fixed wrong version in sequelize binary
@@ -28,7 +32,7 @@
 - [FEATURE] allow definition of a models table name (thanks to slamkajs)
 - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin)
 - [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz)
-- [DEPENDENCIES] mysql is now an optional dependency
+- [FEATURE] timestamps are now stored as UTC. #461 (thanks to innofluence/janmeier)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

lib/dialects/mysql/connector-manager.js

@@ -241,8 +241,10 @@ module.exports = (function() {
       port: config.port,
       user: config.username,
       password: config.password,
-      database: config.database
+      database: config.database,
+      timezone: 'Z'
     })
+    connection.query("SET time_zone = '+0:00'");
     // client.setMaxListeners(self.maxConcurrentQueries)
     this.isConnecting = false
 

lib/dialects/mysql/query.js

@@ -37,3 +37,5 @@ module.exports = (function() {
 
   return Query
 })()
+
+

lib/dialects/postgres/query-generator.js

@@ -51,7 +51,7 @@ function padInt(i) {
 function pgSqlDate(dt) {
   var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
   var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
-  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
+  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000) + 'Z'
 }
 
 function pgDataTypeMapping(tableName, attr, dataType) {
@@ -65,7 +65,7 @@ function pgDataTypeMapping(tableName, attr, dataType) {
   }
 
   if (Utils._.includes(dataType, 'DATETIME')) {
-    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
+    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP WITH TIME ZONE')
   }
 
   if (Utils._.includes(dataType, 'SERIAL')) {
@@ -492,7 +492,7 @@ module.exports = (function() {
           }
 
           if (dataType.type === "DATETIME") {
-            dataType.type = 'TIMESTAMP'
+            dataType.type = 'TIMESTAMP WITH TIME ZONE'
           }
 
           if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {

lib/dialects/sqlite/query.js

@@ -92,7 +92,7 @@ module.exports = (function() {
         results = results.map(function(result) {
           for (var name in result) {
             if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
-              result[name] = new Date(result[name]);
+              result[name] = new Date(result[name]+'Z'); // Z means UTC
             }
           }
           return result

lib/utils.js

@@ -51,15 +51,16 @@ var Utils = module.exports = {
   isHash: function(obj) {
     return Utils._.isObject(obj) && !Array.isArray(obj);
   },
+  pad: function (s) {
+    return s < 10 ? '0' + s : s
+  },
   toSqlDate: function(date) {
-    return [
-      [
-        date.getFullYear(),
-        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
-        ((date.getDate() < 10 ? '0' : '') + date.getDate())
-      ].join("-"),
-      date.toLocaleTimeString()
-    ].join(" ")
+    return date.getUTCFullYear() + '-' +
+      this.pad(date.getUTCMonth()+1) + '-' +
+      this.pad(date.getUTCDate()) + ' ' +
+      this.pad(date.getUTCHours()) + ':' +
+      this.pad(date.getUTCMinutes()) + ':' +
+      this.pad(date.getUTCSeconds())
   },
   argsArePrimaryKeys: function(args, primaryKeys) {
     var result = (args.length == Object.keys(primaryKeys).length)
@@ -171,7 +172,6 @@ var Utils = module.exports = {
 
     return subClass;
   }
-
 }
 
 Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")

package.json

@@ -33,7 +33,7 @@
   "devDependencies": {
     "jasmine-node": "1.0.17",
     "sqlite3": "~2.1.5",
-    "mysql": "~2.0.0-alpha3",
+    "mysql": "~2.0.0-alpha7",
     "pg": "~0.10.2",
     "buster": "~0.6.0",
     "watchr": "~2.2.0",

spec-jasmine/dao.spec.js

@@ -181,7 +181,7 @@ describe('DAO', function() {
               expect(users.length).toEqual(1)
               expect(users[0].username).toEqual(username)
               expect(users[0].birthDate instanceof Date).toBe(true)
-              expect(users[0].birthDate.getTime()).toEqual(new Date(1984, 8, 23).getTime())
+              expect(users[0].birthDate).toEqual(new Date(1984, 8, 23))
               done()
             })
           })

spec-jasmine/mysql/query-generator.spec.js

@@ -105,7 +105,7 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}],
         expectation: "INSERT INTO `myTable` (`name`) VALUES ('foo\\';DROP TABLE myTable;');"
       }, {
-        arguments: ['myTable', {name: 'foo', birthday: new Date(2011, 2, 27, 10, 1, 55)}],
+        arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}],
         expectation: "INSERT INTO `myTable` (`name`,`birthday`) VALUES ('foo','2011-03-27 10:01:55');"
       }, {
         arguments: ['myTable', {name: 'foo', foo: 1}],
@@ -130,10 +130,10 @@ describe('QueryGenerator', function() {
 
     updateQuery: [
       {
-        arguments: ['myTable', {name: 'foo', birthday: new Date(2011, 2, 27, 10, 1, 55)}, {id: 2}],
+        arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
         expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id`=2"
       }, {
-        arguments: ['myTable', {name: 'foo', birthday: new Date(2011, 2, 27, 10, 1, 55)}, 2],
+        arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, 2],
         expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id`=2"
       }, {
         arguments: ['myTable', {bar: 2}, {name: 'foo'}],
@@ -226,7 +226,7 @@ describe('QueryGenerator', function() {
   Sequelize.Utils._.each(suites, function(tests, suiteTitle) {
     describe(suiteTitle, function() {
       tests.forEach(function(test) {
-        var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
+        var title = test.title || 'MySQL correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
         it(title, function() {
           // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly
           var context = test.context || {options: {}};

spec-jasmine/postgres/query-generator.spec.js

@@ -99,7 +99,7 @@ describe('QueryGenerator', function() {
         expectation: "INSERT INTO \"myTable\" (\"name\") VALUES ('foo'';DROP TABLE myTable;') RETURNING *;"
       }, {
         arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}],
-        expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.0') RETURNING *;"
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.0Z') RETURNING *;"
       }, {
         arguments: ['myTable', {name: 'foo', foo: 1}],
         expectation: "INSERT INTO \"myTable\" (\"name\",\"foo\") VALUES ('foo',1) RETURNING *;"
@@ -133,10 +133,10 @@ describe('QueryGenerator', function() {
     updateQuery: [
       {
         arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
-        expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0' WHERE \"id\"=2 RETURNING *"
+        expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0Z' WHERE \"id\"=2 RETURNING *"
       }, {
         arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, 2],
-        expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0' WHERE \"id\"=2 RETURNING *"
+        expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0Z' WHERE \"id\"=2 RETURNING *"
       }, {
         arguments: ['myTable', {bar: 2}, {name: 'foo'}],
         expectation: "UPDATE \"myTable\" SET \"bar\"=2 WHERE \"name\"='foo' RETURNING *"
@@ -160,7 +160,7 @@ describe('QueryGenerator', function() {
         context: {options: {omitNull: true}}
       }, {
         arguments: ['mySchema.myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
-        expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0' WHERE \"id\"=2 RETURNING *"
+        expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0Z' WHERE \"id\"=2 RETURNING *"
       }, {
         arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}, {name: 'foo'}],
         expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo'';DROP TABLE mySchema.myTable;' WHERE \"name\"='foo' RETURNING *"
@@ -251,7 +251,7 @@ describe('QueryGenerator', function() {
   Sequelize.Utils._.each(suites, function(tests, suiteTitle) {
     describe(suiteTitle, function() {
       tests.forEach(function(test) {
-        var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
+        var title = test.title || 'Postgres correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
         it(title, function() {
           // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly
           var context = test.context || {options: {}};

spec-jasmine/sequelize.spec.js

@@ -76,7 +76,7 @@ describe('Sequelize', function() {
       Photo.sync({ force: true }).success(function() {
         sequelize.getQueryInterface().showAllTables().success(function(tableNames) {
           expect(tableNames.indexOf('photos') !== -1).toBeTruthy()
-          done
+          done();
         })
       })
     })

spec-jasmine/sqlite/query-generator.spec.js

@@ -83,7 +83,7 @@ describe('QueryGenerator', function() {
   Sequelize.Utils._.each(suites, function(tests, suiteTitle) {
     describe(suiteTitle, function() {
       tests.forEach(function(test) {
-        var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
+        var title = test.title || 'SQLite correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
         it(title, function() {
           // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly
           var context = test.context || {options: {}};

spec/dao-factory.spec.js

@@ -352,7 +352,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
     })
 
-    ;(dialect.match(/^postgres/) ? itEventually : it)('stores the current date in createdAt', function(done) {
+    it('stores the current date in createdAt', function(done) {
       this.User.create({ username: 'foo' }).success(function(user) {
         expect(parseInt(+user.createdAt/5000)).toEqual(parseInt(+new Date()/5000))
         done()