diff --git a/lib/client.js b/lib/client.js index 09c60e79..378134a9 100644 --- a/lib/client.js +++ b/lib/client.js @@ -256,15 +256,9 @@ var dateParser = function(isoDate) { throw new Error("Unidentifed tZone part " + type); } } - console.log("tzAdjust " + tzAdjust); var utcOffset = Date.UTC(year, month, day, hour, min, seconds, mili); var date = new Date(utcOffset+(tzAdjust*1000*60)); - - - console.log(isoDate); - console.log(date); - console.log(""); - return isoDate; + return date; }; Client.dataTypeParser = { diff --git a/test/test-helper.js b/test/test-helper.js index 552312ec..b89d7c4d 100644 --- a/test/test-helper.js +++ b/test/test-helper.js @@ -33,7 +33,26 @@ assert.emits = function(item, eventName, callback) { callback.apply(item, arguments); } }); +}; +assert.UTCDate = function(actual, year, month, day, hours, min, sec, milisecond) { + var actualYear = actual.getUTCFullYear(); + assert.equal(actualYear, year, "expected year " + year + " but got " + actualYear); + + var actualDate = actual.getUTCDate(); + assert.equal(actualDate, day, "expected day " + day + " but got " + actualDate); + + var actualHours = actual.getUTCHours(); + assert.equal(actualHours, hours, "expected hours " + hours + " but got " + actualHours); + + var actualMin = actual.getUTCMinutes(); + assert.equal(actualMin, min, "expected min " + min + " but got " + actualMin); + + var actualSec = actual.getUTCSeconds(); + assert.equal(actualSec, sec, "expected sec " + sec + " but got " + actualSec); + + var actualMili = actual.getUTCMilliseconds(); + assert.equal(actualMili, milisecond, "expected milisecond " + milisecond + " but got " + actualMili); }; assert.equalBuffers = function(actual, expected) { diff --git a/test/unit/client/typed-query-results.js b/test/unit/client/typed-query-results.js index 4606a643..c4afd768 100644 --- a/test/unit/client/typed-query-results.js +++ b/test/unit/client/typed-query-results.js @@ -68,28 +68,28 @@ test('typed results', function() { dataTypeID: 1184, actual: '2010-10-31 14:54:13.74-0530', expected: function(val) { - return false; + assert.UTCDate(val, 2010, 9, 31, 9, 24, 13, 74); } },{ name: 'timestampz with huge miliseconds in UTC', dataTypeID: 1184, actual: '2010-10-30 14:11:12.730838Z', expected: function(val) { - return false; + assert.UTCDate(val, 2010, 9, 30, 14, 11, 12, 730); } },{ name: 'timestampz with no miliseconds', dataTypeID: 1184, actual: '2010-10-30 13:10:01+05', expected: function(val) { - return false; + assert.UTCDate(val, 2010, 9, 30, 18, 10, 01, 0); } },{ name: 'timestamp', dataTypeID: 1114, actual: '2010-10-31 00:00:00', expected: function(val) { - return false; + assert.UTCDate(val, 2010, 9, 31, 0, 0, 0, 0); } }];