Skip to content

Commit 6841178

Browse files
committed
modified tests to correctly check for adjusted utc values
1 parent 0c777fa commit 6841178

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

lib/client.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@ var dateParser = function(isoDate) {
256256
throw new Error("Unidentifed tZone part " + type);
257257
}
258258
}
259+
259260
var utcOffset = Date.UTC(year, month, day, hour, min, seconds, mili);
260-
var date = new Date(utcOffset+(tzAdjust*1000*60));
261+
262+
var date = new Date(utcOffset - (tzAdjust * 60* 1000));
261263
return date;
262264
};
263265

test/integration/client/type-coercion-tests.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,18 @@ var types = [{
6161
},{
6262
name: 'double precision',
6363
values: [-1.2, 0, 1.2, null]
64+
},{
65+
name: 'timestamptz',
66+
values: [null]
67+
},{
68+
name: 'timestamp',
69+
values: [null]
70+
},{
71+
name: 'timetz',
72+
values: ['13:11:12.1234-05:30',null]
73+
},{
74+
name: 'time',
75+
values: ['13:12:12.321', null]
6476
}];
6577

6678
types.forEach(testForTypeCoercion);

test/unit/client/typed-query-results.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ test('typed results', function() {
6868
dataTypeID: 1184,
6969
actual: '2010-10-31 14:54:13.74-0530',
7070
expected: function(val) {
71-
assert.UTCDate(val, 2010, 9, 31, 9, 24, 13, 74);
71+
assert.UTCDate(val, 2010, 9, 31, 20, 24, 13, 74);
7272
}
7373
},{
7474
name: 'timestampz with huge miliseconds in UTC',
@@ -82,7 +82,7 @@ test('typed results', function() {
8282
dataTypeID: 1184,
8383
actual: '2010-10-30 13:10:01+05',
8484
expected: function(val) {
85-
assert.UTCDate(val, 2010, 9, 30, 18, 10, 01, 0);
85+
assert.UTCDate(val, 2010, 9, 30, 8, 10, 01, 0);
8686
}
8787
},{
8888
name: 'timestamp',
@@ -107,7 +107,6 @@ test('typed results', function() {
107107
return expected(row.fields[i]);
108108
}
109109
assert.strictEqual(row.fields[i], expected);
110-
111110
});
112111
}
113112
});

0 commit comments

Comments
 (0)