Merge branch 'master' of github.com:sidorares/node-mysql2

doubliez · Apr 26, 2014 · 22caf73 · 22caf73
2 parents ebd30fd + 74f0d19
commit 22caf73
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,9 @@ Backlog:
   - custom typeCast handlers in generated parser             #39
 
 HEAD
+  - bugfix: date as parameter in prepared statement,
+    day of week was used incorrectly
+    instead of day of month                                  #89     ab28dfca839728dfe40d941091902185d7c19b57
 
 0.11.8
 

diff --git a/lib/packets/execute.js b/lib/packets/execute.js
@@ -33,7 +33,7 @@ Execute.prototype.toPacket = function()
         if (toString.call(this.parameters[i]) == '[object Date]') {
           var d = this.parameters[i];
           // TODO: move to asMysqlDateTime()
-          this.parameters[i] = [d.getFullYear(), d.getMonth() + 1, d.getDay()].join('-') +
+          this.parameters[i] = [d.getFullYear(), d.getMonth() + 1, d.getDate()].join('-') +
             ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':');
         }
         if (Buffer.isBuffer(this.parameters[i])) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "directories": {

diff --git a/test/integration/connection/test-custom-date-parameter.js b/test/integration/connection/test-custom-date-parameter.js
@@ -12,7 +12,7 @@ Date = function() {
   return CustomDate;
 }();
 
-connection.execute('SELECT UNIX_TIMESTAMP(?) t', [new Date('1990-01-01 UTC')], function(err, _rows, _fields) {
+connection.execute('SELECT UNIX_TIMESTAMP(?) t', [new Date('1990-08-08 UTC')], function(err, _rows, _fields) {
   if (err) throw err;
   rows = _rows;
   console.log(_rows, _fields);
@@ -21,5 +21,5 @@ connection.execute('SELECT UNIX_TIMESTAMP(?) t', [new Date('1990-01-01 UTC')], f
 connection.end();
 
 process.on('exit', function() {
-  assert.deepEqual(rows, [{t: 631152000}]);
+  assert.deepEqual(rows, [{t: 650073600}]);
 });