Comparing version 3.4.4 to 3.4.5
@@ -76,6 +76,15 @@ 'use strict'; | ||
return this.prepareDone(connection); | ||
} | ||
readParameter(packet, connection) { | ||
// there might be scenarios when mysql server reports more parameters than | ||
// are actually present in the array of parameter definitions. | ||
// if EOF packet is received we switch to "read fields" state if there are | ||
// any fields reported by the server, otherwise we finish the command. | ||
if (packet.isEOF()) { | ||
if (this.fieldCount > 0) { | ||
return Prepare.prototype.readField; | ||
} | ||
return this.prepareDone(connection); | ||
} | ||
const def = new Packets.ColumnDefinition(packet, connection.clientEncoding); | ||
@@ -90,2 +99,5 @@ this.parameterDefinitions.push(def); | ||
readField(packet, connection) { | ||
if (packet.isEOF()) { | ||
return this.prepareDone(connection); | ||
} | ||
const def = new Packets.ColumnDefinition(packet, connection.clientEncoding); | ||
@@ -92,0 +104,0 @@ this.fields.push(def); |
@@ -492,10 +492,19 @@ // This file was modified by Oracle on June 1, 2021. | ||
} | ||
const done = this._command.execute(packet, this); | ||
if (done) { | ||
this._command = this._commands.shift(); | ||
if (this._command) { | ||
this.sequenceId = 0; | ||
this.compressedSequenceId = 0; | ||
this.handlePacket(); | ||
try { | ||
if (this._fatalError) { | ||
// skip remaining packets after client is in the error state | ||
return; | ||
} | ||
const done = this._command.execute(packet, this); | ||
if (done) { | ||
this._command = this._commands.shift(); | ||
if (this._command) { | ||
this.sequenceId = 0; | ||
this.compressedSequenceId = 0; | ||
this.handlePacket(); | ||
} | ||
} | ||
} catch (err) { | ||
this._handleFatalError(err); | ||
this.stream.destroy(); | ||
} | ||
@@ -502,0 +511,0 @@ } |
{ | ||
"name": "mysql2", | ||
"version": "3.4.4", | ||
"version": "3.4.5", | ||
"description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS", | ||
@@ -15,2 +15,3 @@ "main": "index.js", | ||
"test": "node ./test/run.js", | ||
"test:builtin-node-runner": "NODE_V8_COVERAGE=./coverage node --test --experimental-test-coverage test/builtin-runner", | ||
"test:tsc-build": "cd \"test/tsc-build\" && npx tsc -p \"tsconfig.json\"", | ||
@@ -17,0 +18,0 @@ "coverage-test": "c8 -r cobertura -r lcov -r text node ./test/run.js", |
@@ -1,2 +0,2 @@ | ||
## Node MySQL 2 | ||
## MySQL 2 | ||
@@ -3,0 +3,0 @@ [![Greenkeeper badge](https://badges.greenkeeper.io/sidorares/node-mysql2.svg)](https://greenkeeper.io/) |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
600622
14924