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

Author: lneves

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() {
 };