Fix retrieving local dates

Author: felixge

lib/protocol/packets/RowDataPacket.js

@@ -56,17 +56,18 @@ RowDataPacket.prototype._typeCast = function(field, parser, timeZone, supportBig
         return null;
       }
 
-      if (timeZone != 'local') {
-        if (field.type === Types.DATE) {
-          dateString += ' 00:00:00 ' + timeZone;
-        } else {
-          dateString += ' ' + timeZone;
-        }
+      var originalString = dateString;
+      if (field.type === Types.DATE) {
+        dateString += ' 00:00:00';
+      }
+
+      if (timeZone !== 'local') {
+        dateString += ' ' + timeZone;
       }
 
       dt = new Date(dateString);
       if (isNaN(dt.getTime())) {
-        return dateString;
+        return originalString;
       }
 
       return dt;

test/integration/connection/test-type-casting.js

@@ -18,7 +18,7 @@ var tests = [
   {type: 'year', insert: 2012},
   {type: 'timestamp', insert: new Date('2012-05-12 11:00:23')},
   {type: 'datetime', insert: new Date('2012-05-12 12:00:23')},
-  {type: 'date', insert: new Date('2012-05-12 00:00:00 Z')},
+  {type: 'date', insert: new Date('2012-05-12 00:00:00')},
   {type: 'time', insert: '13:13:23'},
   {type: 'binary(4)', insert: new Buffer([0, 1, 254, 255])},
   {type: 'varbinary(4)', insert: new Buffer([0, 1, 254, 255])},