rename id to _id so it doesn't conflict with RowDataPacket

Author: lneves12

lib/protocol/Protocol.js

@@ -157,7 +157,7 @@ Protocol.prototype._enqueue = function(sequence) {
       self._emitPacket(packet);
     })
     .on('timeout', function() {
-      var err = new Error(sequence.id + ' inactivity timeout');
+      var err = new Error(sequence._id + ' inactivity timeout');
 
       err.code    = 'PROTOCOL_SEQUENCE_TIMEOUT';
       err.fatal   = true;
@@ -206,7 +206,7 @@ Protocol.prototype._enqueue = function(sequence) {
 
 Protocol.prototype._validateEnqueue = function _validateEnqueue(sequence) {
   var err;
-  var prefix = 'Cannot enqueue ' + sequence.id;
+  var prefix = 'Cannot enqueue ' + sequence._id;
 
   if (this._fatalError) {
     err      = new Error(prefix + ' after fatal error.');
@@ -253,7 +253,7 @@ Protocol.prototype._parsePacket = function() {
 
   var Packet     = this._determinePacket(sequence);
   var packet     = new Packet({protocol41: this._config.protocol41});
-  var packetName = packet.id;
+  var packetName = packet._id;
 
   // Special case: Faster dispatch, and parsing done inside sequence
   if (Packet === Packets.RowDataPacket) {
@@ -447,7 +447,7 @@ Protocol.prototype._debugPacket = function(incoming, packet) {
   var direction  = incoming
     ? '<--'
     : '-->';
-  var packetName = packet.id;
+  var packetName = packet._id;
   var threadId   = connection && connection.threadId !== null
     ? ' (' + connection.threadId + ')'
     : '';

lib/protocol/packets/AuthSwitchRequestPacket.js

@@ -7,7 +7,7 @@ function AuthSwitchRequestPacket(options) {
   this.authMethodData = options.authMethodData;
 }
 
-AuthSwitchRequestPacket.prototype.id = 'AuthSwitchRequestPacket';
+AuthSwitchRequestPacket.prototype._id = 'AuthSwitchRequestPacket';
 
 AuthSwitchRequestPacket.prototype.parse = function parse(parser) {
   this.status         = parser.parseUnsignedNumber(1);

lib/protocol/packets/AuthSwitchResponsePacket.js

@@ -5,7 +5,7 @@ function AuthSwitchResponsePacket(options) {
   this.data = options.data;
 }
 
-AuthSwitchResponsePacket.prototype.id = 'AuthSwitchResponsePacket';
+AuthSwitchResponsePacket.prototype._id = 'AuthSwitchResponsePacket';
 
 AuthSwitchResponsePacket.prototype.parse = function parse(parser) {
   this.data = parser.parsePacketTerminatedBuffer();

lib/protocol/packets/ClientAuthenticationPacket.js

@@ -14,7 +14,7 @@ function ClientAuthenticationPacket(options) {
   this.protocol41    = options.protocol41;
 }
 
-ClientAuthenticationPacket.prototype.id = 'ClientAuthenticationPacket';
+ClientAuthenticationPacket.prototype._id = 'ClientAuthenticationPacket';
 
 ClientAuthenticationPacket.prototype.parse = function(parser) {
   if (this.protocol41) {

lib/protocol/packets/ComChangeUserPacket.js

@@ -9,7 +9,7 @@ function ComChangeUserPacket(options) {
   this.charsetNumber = options.charsetNumber;
 }
 
-ComChangeUserPacket.prototype.id = 'ComChangeUserPacket';
+ComChangeUserPacket.prototype._id = 'ComChangeUserPacket';
 
 ComChangeUserPacket.prototype.parse = function(parser) {
   this.command       = parser.parseUnsignedNumber(1);

lib/protocol/packets/ComPingPacket.js

@@ -3,7 +3,7 @@ function ComPingPacket() {
   this.command = 0x0e;
 }
 
-ComPingPacket.prototype.id = 'ComPingPacket';
+ComPingPacket.prototype._id = 'ComPingPacket';
 
 ComPingPacket.prototype.write = function(writer) {
   writer.writeUnsignedNumber(1, this.command);

lib/protocol/packets/ComQueryPacket.js

@@ -4,7 +4,7 @@ function ComQueryPacket(sql) {
   this.sql     = sql;
 }
 
-ComQueryPacket.prototype.id = 'ComQueryPacket';
+ComQueryPacket.prototype._id = 'ComQueryPacket';
 
 ComQueryPacket.prototype.write = function(writer) {
   writer.writeUnsignedNumber(1, this.command);

lib/protocol/packets/ComQuitPacket.js

@@ -3,7 +3,7 @@ function ComQuitPacket() {
   this.command = 0x01;
 }
 
-ComQuitPacket.prototype.id = 'ComQuitPacket';
+ComQuitPacket.prototype._id = 'ComQuitPacket';
 
 ComQuitPacket.prototype.parse = function parse(parser) {
   this.command = parser.parseUnsignedNumber(1);

lib/protocol/packets/ComStatisticsPacket.js

@@ -3,7 +3,7 @@ function ComStatisticsPacket() {
   this.command = 0x09;
 }
 
-ComStatisticsPacket.prototype.id = 'ComStatisticsPacket';
+ComStatisticsPacket.prototype._id = 'ComStatisticsPacket';
 
 ComStatisticsPacket.prototype.write = function(writer) {
   writer.writeUnsignedNumber(1, this.command);

lib/protocol/packets/EmptyPacket.js

@@ -2,7 +2,7 @@ module.exports = EmptyPacket;
 function EmptyPacket() {
 }
 
-EmptyPacket.prototype.id = 'EmptyPacket';
+EmptyPacket.prototype._id = 'EmptyPacket';
 
 EmptyPacket.prototype.parse = function parse() {
 };

lib/protocol/packets/EofPacket.js

@@ -8,7 +8,7 @@ function EofPacket(options) {
   this.protocol41   = options.protocol41;
 }
 
-EofPacket.prototype.id = 'EofPacket';
+EofPacket.prototype._id = 'EofPacket';
 
 EofPacket.prototype.parse = function(parser) {
   this.fieldCount   = parser.parseUnsignedNumber(1);

lib/protocol/packets/ErrorPacket.js

@@ -9,7 +9,7 @@ function ErrorPacket(options) {
   this.message        = options.message;
 }
 
-ErrorPacket.prototype.id = 'ErrorPacket';
+ErrorPacket.prototype._id = 'ErrorPacket';
 
 ErrorPacket.prototype.parse = function(parser) {
   this.fieldCount = parser.parseUnsignedNumber(1);

lib/protocol/packets/Field.js

@@ -13,7 +13,7 @@ function Field(options) {
   this.length = options.packet.length;
 }
 
-Field.prototype.id = 'Field';
+Field.prototype._id = 'Field';
 
 Field.prototype.string = function () {
   return this.parser.parseLengthCodedString();

lib/protocol/packets/FieldPacket.js

@@ -18,7 +18,7 @@ function FieldPacket(options) {
   this.protocol41 = options.protocol41;
 }
 
-FieldPacket.prototype.id = 'FieldPacket';
+FieldPacket.prototype._id = 'FieldPacket';
 
 FieldPacket.prototype.parse = function(parser) {
   if (this.protocol41) {

lib/protocol/packets/HandshakeInitializationPacket.js

@@ -27,7 +27,7 @@ function HandshakeInitializationPacket(options) {
   }
 }
 
-HandshakeInitializationPacket.prototype.id = 'HandshakeInitializationPacket';
+HandshakeInitializationPacket.prototype._id = 'HandshakeInitializationPacket';
 
 HandshakeInitializationPacket.prototype.parse = function(parser) {
   this.protocolVersion     = parser.parseUnsignedNumber(1);

lib/protocol/packets/LocalDataFilePacket.js

@@ -10,7 +10,7 @@ function LocalDataFilePacket(data) {
   this.data = data;
 }
 
-LocalDataFilePacket.prototype.id = 'LocalDataFilePacket';
+LocalDataFilePacket.prototype._id = 'LocalDataFilePacket';
 
 LocalDataFilePacket.prototype.write = function(writer) {
   writer.writeBuffer(this.data);

lib/protocol/packets/LocalInfileRequestPacket.js

@@ -5,7 +5,7 @@ function LocalInfileRequestPacket(options) {
   this.filename = options.filename;
 }
 
-LocalInfileRequestPacket.prototype.id = 'LocalInfileRequestPacket';
+LocalInfileRequestPacket.prototype._id = 'LocalInfileRequestPacket';
 
 LocalInfileRequestPacket.prototype.parse = function parse(parser) {
   if (parser.parseLengthCodedNumber() !== null) {

lib/protocol/packets/OkPacket.js

@@ -15,7 +15,7 @@ function OkPacket(options) {
   this.protocol41   = options.protocol41;
 }
 
-OkPacket.prototype.id = 'OkPacket';
+OkPacket.prototype._id = 'OkPacket';
 
 OkPacket.prototype.parse = function(parser) {
   this.fieldCount   = parser.parseUnsignedNumber(1);

lib/protocol/packets/OldPasswordPacket.js

@@ -5,7 +5,7 @@ function OldPasswordPacket(options) {
   this.scrambleBuff = options.scrambleBuff;
 }
 
-OldPasswordPacket.prototype.id = 'OldPasswordPacket';
+OldPasswordPacket.prototype._id = 'OldPasswordPacket';
 
 OldPasswordPacket.prototype.parse = function(parser) {
   this.scrambleBuff = parser.parsePacketTerminatedBuffer();

lib/protocol/packets/ResultSetHeaderPacket.js

@@ -5,7 +5,7 @@ function ResultSetHeaderPacket(options) {
   this.fieldCount = options.fieldCount;
 }
 
-ResultSetHeaderPacket.prototype.id = 'ResultSetHeaderPacket';
+ResultSetHeaderPacket.prototype._id = 'ResultSetHeaderPacket';
 
 ResultSetHeaderPacket.prototype.parse = function(parser) {
   this.fieldCount = parser.parseLengthCodedNumber();

lib/protocol/packets/RowDataPacket.js

@@ -19,7 +19,7 @@ Object.defineProperty(RowDataPacket.prototype, '_typeCast', {
   value        : typeCast
 });
 
-Object.defineProperty(RowDataPacket.prototype, 'id', {
+Object.defineProperty(RowDataPacket.prototype, '_id', {
   configurable : true,
   enumerable   : false,
   value        : 'RowDataPacket'

lib/protocol/packets/SSLRequestPacket.js

@@ -12,7 +12,7 @@ function SSLRequestPacket(options) {
   this.charsetNumber = options.charsetNumber;
 }
 
-SSLRequestPacket.prototype.id = 'SSLRequestPacket';
+SSLRequestPacket.prototype._id = 'SSLRequestPacket';
 
 SSLRequestPacket.prototype.parse = function(parser) {
   // TODO: check SSLRequest packet v41 vs pre v41

lib/protocol/packets/StatisticsPacket.js

@@ -3,7 +3,7 @@ function StatisticsPacket() {
   this.message      = undefined;
 }
 
-StatisticsPacket.prototype.id = 'StatisticsPacket';
+StatisticsPacket.prototype._id = 'StatisticsPacket';
 
 StatisticsPacket.prototype.parse = function(parser) {
   this.message      = parser.parsePacketTerminatedString();

lib/protocol/packets/UseOldPasswordPacket.js

@@ -5,7 +5,7 @@ function UseOldPasswordPacket(options) {
   this.firstByte = options.firstByte || 0xfe;
 }
 
-UseOldPasswordPacket.prototype.id = 'UseOldPasswordPacket';
+UseOldPasswordPacket.prototype._id = 'UseOldPasswordPacket';
 
 UseOldPasswordPacket.prototype.parse = function(parser) {
   this.firstByte = parser.parseUnsignedNumber(1);

lib/protocol/sequences/ChangeUser.js

@@ -23,7 +23,7 @@ ChangeUser.prototype.determinePacket = function determinePacket(firstByte) {
   }
 };
 
-ChangeUser.prototype.id = 'ChangeUser';
+ChangeUser.prototype._id = 'ChangeUser';
 
 ChangeUser.prototype.start = function(handshakeInitializationPacket) {
   var scrambleBuff = handshakeInitializationPacket.scrambleBuff();

lib/protocol/sequences/Handshake.js

@@ -33,7 +33,7 @@ Handshake.prototype.determinePacket = function determinePacket(firstByte, parser
   return undefined;
 };
 
-Handshake.prototype.id = 'Handshake';
+Handshake.prototype._id = 'Handshake';
 
 Handshake.prototype['AuthSwitchRequestPacket'] = function (packet) {
   var name = packet.authMethodName;

lib/protocol/sequences/Ping.js

@@ -14,7 +14,7 @@ function Ping(options, callback) {
   Sequence.call(this, options, callback);
 }
 
-Ping.prototype.id = 'Ping';
+Ping.prototype._id = 'Ping';
 
 Ping.prototype.start = function() {
   this.emit('packet', new Packets.ComPingPacket());

lib/protocol/sequences/Query.js

@@ -26,7 +26,7 @@ function Query(options, callback) {
   this._loadError = null;
 }
 
-Query.prototype.id = 'Query';
+Query.prototype._id = 'Query';
 
 Query.prototype.start = function() {
   this.emit('packet', new Packets.ComQueryPacket(this.sql));

lib/protocol/sequences/Quit.js

@@ -15,7 +15,7 @@ function Quit(options, callback) {
   this._started = false;
 }
 
-Quit.prototype.id = 'Quit';
+Quit.prototype._id = 'Quit';
 
 Quit.prototype.end = function end(err) {
   if (this._ended) {

lib/protocol/sequences/Sequence.js

@@ -38,7 +38,7 @@ Sequence.determinePacket = function(byte) {
   }
 };
 
-Sequence.prototype.id = 'Sequence';
+Sequence.prototype._id = 'Sequence';
 
 Sequence.prototype.hasErrorHandler = function() {
   return Boolean(this._callback) || listenerCount(this, 'error') > 1;

lib/protocol/sequences/Statistics.js

@@ -13,7 +13,7 @@ function Statistics(options, callback) {
   Sequence.call(this, options, callback);
 }
 
-Statistics.prototype.id = 'Statistics';
+Statistics.prototype._id = 'Statistics';
 
 Statistics.prototype.start = function() {
   this.emit('packet', new Packets.ComStatisticsPacket());

test/FakeServer.js

@@ -332,8 +332,8 @@ FakeConnection.prototype._parsePacket = function _parsePacket(packetHeader) {
       }
       break;
     default:
-      if (!this.emit(packet.id, packet)) {
-        throw new Error('Unexpected packet: ' + packet.id);
+      if (!this.emit(packet._id, packet)) {
+        throw new Error('Unexpected packet: ' + packet._id);
       }
   }
 };