Skip to content

Commit e6c87d7

Browse files
committed
build: eslint@4.2.0
1 parent 3132612 commit e6c87d7

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

lib/PoolConnection.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ PoolConnection.prototype.release = function release() {
3939
PoolConnection.prototype._realEnd = Connection.prototype.end;
4040

4141
PoolConnection.prototype.end = function () {
42-
console.warn( 'Calling conn.end() to release a pooled connection is '
43-
+ 'deprecated. In next version calling conn.end() will be '
44-
+ 'restored to default conn.end() behavior. Use '
45-
+ 'conn.release() instead.'
46-
);
42+
console.warn(
43+
'Calling conn.end() to release a pooled connection is ' +
44+
'deprecated. In next version calling conn.end() will be ' +
45+
'restored to default conn.end() behavior. Use ' +
46+
'conn.release() instead.'
47+
);
4748
this.release();
4849
};
4950

lib/protocol/sequences/Handshake.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ Handshake.prototype._sendCredentials = function() {
7575
database : this._config.database,
7676
protocol41 : packet.protocol41,
7777
scrambleBuff : (packet.protocol41)
78-
? Auth.token(this._config.password, packet.scrambleBuff())
79-
: Auth.scramble323(packet.scrambleBuff(), this._config.password)
78+
? Auth.token(this._config.password, packet.scrambleBuff())
79+
: Auth.scramble323(packet.scrambleBuff(), this._config.password)
8080
}));
8181
};
8282

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"after": "0.8.2",
22-
"eslint": "3.19.0",
22+
"eslint": "4.2.0",
2323
"nyc": "10.3.2",
2424
"seedrandom": "2.4.3",
2525
"timezone-mock": "0.0.5",

test/unit/connection/test-exception-safety.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ server.listen(common.fakeServerPort, function(err) {
3030

3131
// Row streaming events
3232
connection.query('SELECT 1')
33-
.on('fields', function() {
34-
throw new Error('3');
35-
})
36-
.on('result', function() {
37-
throw new Error('4');
38-
});
33+
.on('fields', function () {
34+
throw new Error('3');
35+
})
36+
.on('result', function () {
37+
throw new Error('4');
38+
});
3939

4040
// Normal callback with error
4141
connection.query('INVALID SQL', function(err) {
@@ -45,9 +45,9 @@ server.listen(common.fakeServerPort, function(err) {
4545

4646
// Row streaming 'result' event triggered by Ok Packet (special code path)
4747
connection.query('USE test')
48-
.on('result', function() {
49-
throw new Error('6');
50-
});
48+
.on('result', function () {
49+
throw new Error('6');
50+
});
5151

5252
// Normal callback (same code path as connect, but in here should that
5353
// implementation detail change at some point).

tool/generate-error-constants.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ function extractMySqlVersion(srcDir) {
140140

141141
function fixupCode(code) {
142142
return code
143-
// remove obsolete markers
144-
.replace('ER_OBSOLETE_', 'ER_')
145-
// remove unused markers
146-
.replace(/(?:_OLD)?_+UNUSED$/, '');
143+
// remove obsolete markers
144+
.replace('ER_OBSOLETE_', 'ER_')
145+
// remove unused markers
146+
.replace(/(?:_OLD)?_+UNUSED$/, '');
147147
}
148148

149149
function keepUnusedCodes(previousCodes, currentCodes) {

0 commit comments

Comments
 (0)