Skip to content

Commit 7f3d84f

Browse files
committed
use object-assign ponyfill
1 parent 6205519 commit 7f3d84f

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

lib/commands/execute.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ var Command = require('./command.js');
44
var Query = require('./query.js');
55
var Packets = require('../packets/index.js');
66

7+
var objectAssign = require('object-assign');
8+
79
var compileParser = require('../compile_binary_parser.js');
810

911
function Execute (options, callback)
@@ -40,7 +42,7 @@ Execute.prototype.buildParserFromFields = function (fields, connection) {
4042
};
4143

4244
Execute.prototype.start = function (packet, connection) {
43-
this.options = Object.assign({}, connection.config, this._executeOptions);
45+
this.options = objectAssign({}, connection.config, this._executeOptions);
4446
var executePacket = new Packets.Execute(this.statement.id, this.parameters, connection.config.charsetNumber);
4547
connection.writePacket(executePacket.toPacket(1));
4648
return Execute.prototype.resultsetHeader;

lib/commands/query.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var util = require('util');
33
var Buffer = require('safe-buffer').Buffer;
44

55
var Readable = require('readable-stream');
6+
var objectAssign = require('object-assign');
67

78
var Command = require('./command.js');
89
var Packets = require('../packets/index.js');
@@ -36,7 +37,7 @@ Query.prototype.start = function (packet, connection) {
3637
console.log(' Sending query command: %s', this.sql);
3738
}
3839
this._connection = connection;
39-
this.options = Object.assign({}, connection.config, this._queryOptions);
40+
this.options = objectAssign({}, connection.config, this._queryOptions);
4041
var cmdPacket = new Packets.Query(this.sql, connection.config.charsetNumber);
4142
connection.writePacket(cmdPacket.toPacket(1));
4243
return Query.prototype.resultsetHeader;

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"iconv-lite": "^0.4.13",
3434
"long": "^3.2.0",
3535
"named-placeholders": "1.1.1",
36+
"object-assign": "^4.1.0",
3637
"readable-stream": "2.1.5",
3738
"safe-buffer": "^5.0.1",
3839
"seq-queue": "0.0.5",

0 commit comments

Comments
 (0)