Skip to content

Add the milliseconds part when converting Date objects. #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2013
+18 −12
Merged

Add the milliseconds part when converting Date objects. #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c012ad
Add milliseconds part when converting Date objects.
Jul 11, 2013
a1cbf33
Fix typos.
Jul 12, 2013
f52e99e
Fix test-SqlString to include the milliseconds for Date objects.
Jul 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions lib/protocol/SqlString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,14 @@ SqlString.dateToString = function(date, timeZone) {
}

var year = dt.getFullYear();
var month = zeroPad(dt.getMonth() + 1);
var day = zeroPad(dt.getDate());
var hour = zeroPad(dt.getHours());
var minute = zeroPad(dt.getMinutes());
var second = zeroPad(dt.getSeconds());

return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
var month = zeroPad(dt.getMonth() + 1, 2);
var day = zeroPad(dt.getDate(), 2);
var hour = zeroPad(dt.getHours(), 2);
var minute = zeroPad(dt.getMinutes(), 2);
var second = zeroPad(dt.getSeconds(), 2);
var millisecond = zeroPad(dt.getMilliseconds(), 3);

return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second + '.' + millisecond;
};

SqlString.bufferToString = function(buffer) {
Expand Down Expand Up @@ -124,8 +125,13 @@ SqlString.objectToValues = function(object, timeZone) {
return values.join(', ');
};

function zeroPad(number) {
return (number < 10) ? '0' + number : number;
function zeroPad(number, length) {
number = number.toString();
while (number.length < length) {
number = '0' + number;
}

return number;
}

function convertTimezone(tz) {
Expand Down
6 changes: 3 additions & 3 deletions test/unit/protocol/test-SqlString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ test('SqlString.escape', {
assert.equal(SqlString.escape('Sup"er'), "'Sup\\\"er'");
},

'dates are converted to YYYY-MM-DD HH:II:SS': function() {
var expected = '2012-05-07 11:42:03';
var date = new Date(Date.UTC(2012, 4, 7, 11, 42, 3));
'dates are converted to YYYY-MM-DD HH:II:SS.sss': function() {
var expected = '2012-05-07 11:42:03.002';
var date = new Date(Date.UTC(2012, 4, 7, 11, 42, 3, 2));
var string = SqlString.escape(date);

assert.strictEqual(string, "'" + expected + "'");
Expand Down