Merge pull request #364 from sushantdhiman/bn-to-long

Bn.js to Long

Author: sidorares

lib/packets/packet.js

@@ -1,7 +1,7 @@
 // var BigNumber = require("bignumber.js");
 var ErrorCodeToName = require('../constants/errors.js');
 
-var bn = require('bn.js');
+var Long = require('long');
 
 function Packet (id, buffer, start, end)
 {
@@ -106,15 +106,19 @@ Packet.prototype.eofWarningCount = function () {
   return this.buffer.readInt16LE(this.offset + 1);
 };
 
-Packet.prototype.readLengthCodedNumber = function (bigNumberStrings) {
+Packet.prototype.readLengthCodedNumber = function (bigNumberStrings, signed) {
   var byte1 = this.buffer[this.offset++];
   if (byte1 < 251) {
     return byte1;
   }
-  return this.readLengthCodedNumberExt(byte1, bigNumberStrings);
+  return this.readLengthCodedNumberExt(byte1, bigNumberStrings, signed);
 };
 
-Packet.prototype.readLengthCodedNumberExt = function (tag, bigNumberStrings) {
+Packet.prototype.readLengthCodedNumberSigned = function (bigNumberStrings) {
+  return this.readLengthCodedNumber(bigNumberStrings, true);
+};
+
+Packet.prototype.readLengthCodedNumberExt = function (tag, bigNumberStrings, signed) {
   var word0, word1;
   var res;
   if (tag == 0xfb) {
@@ -142,9 +146,16 @@ Packet.prototype.readLengthCodedNumberExt = function (tag, bigNumberStrings) {
       return word1 * 0x100000000 + word0;
     }
 
-    res = (new bn(word1)).ishln(32).iaddn(word0);
+    res = new Long(word0, word1, !signed); // Long need unsigned
+
+    var resNumber = res.toNumber()
+      , resString = res.toString();
+
+    res = resNumber.toString() === resString
+            ? resNumber
+            : resString;
 
-    return bigNumberStrings ? res.toString() : res;
+    return bigNumberStrings ? resString : res;
   }
 
   console.trace();

lib/packets/resultset_header.js

@@ -9,7 +9,7 @@ function ResultSetHeader (packet, bigNumberStrings)
   } else {
     this.fieldCount = packet.readInt8(); // skip OK byte
     this.affectedRows = packet.readLengthCodedNumber(bigNumberStrings);
-    this.insertId = packet.readLengthCodedNumber(bigNumberStrings);
+    this.insertId = packet.readLengthCodedNumberSigned(bigNumberStrings);
     this.serverStatus = packet.readInt16();
     this.warningStatus = packet.readInt16();
   }

package.json

@@ -28,9 +28,9 @@
   "author": "Andrey Sidorov <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "bn.js": "4.11.6",
     "cardinal": "0.7.0",
     "double-ended-queue": "2.1.0-0",
+    "long": "^3.2.0",
     "named-placeholders": "1.1.1",
     "readable-stream": "2.1.4",
     "seq-queue": "0.0.5",

test/integration/connection/test-insert-bigint.js

@@ -1,7 +1,7 @@
 var common = require('../../common');
 var connection = common.createConnection();
 var assert = require('assert');
-var bn = require('bn.js');
+var Long = require('long');
 
 var table = 'insert_test';
 connection.query([
@@ -26,10 +26,10 @@ connection.query('INSERT INTO bigs SET title=\'test1\'', function (err, result)
     // big int
     connection.query('INSERT INTO bigs SET title=\'test\', id=9007199254740992');
     connection.query('INSERT INTO bigs SET title=\'test3\'', function (err, result) {
-      assert.strictEqual((new bn('9007199254740993')).cmp(result.insertId), 0);
+      assert.strictEqual((Long.fromString('9007199254740993')).compare(result.insertId), 0);
       connection.query('INSERT INTO bigs SET title=\'test\', id=90071992547409924');
       connection.query('INSERT INTO bigs SET title=\'test4\'', function (err, result) {
-        assert.strictEqual((new bn('90071992547409925')).cmp(result.insertId), 0);
+        assert.strictEqual((Long.fromString('90071992547409925')).compare(result.insertId), 0);
         connection.query('select * from bigs', function (err, result) {
           assert.strictEqual(result[0].id, 123);
           assert.strictEqual(result[1].id, 124);

test/integration/connection/test-insert-negative-ai.js

@@ -0,0 +1,51 @@
+var common = require('../../common');
+var connection = common.createConnection();
+var assert = require('assert');
+
+var testTable = 'neg-ai-test';
+var testData = 'test negative ai';
+
+var selectResult, insertResult;
+
+var prepareAndTest = function (cb) {
+  connection.query(
+    'CREATE TEMPORARY TABLE `' + testTable + '` (' +
+    '`id` int(11) signed NOT NULL AUTO_INCREMENT,' +
+    '`title` varchar(255),' +
+    'PRIMARY KEY (`id`)' +
+    ') ENGINE=InnoDB DEFAULT CHARSET=utf8', testNegativeAI);
+};
+
+var testNegativeAI = function (err) {
+  assert.ifError(err);
+  // insert the negative AI
+  connection.query(
+    'INSERT INTO `' + testTable + '`' +
+    ' (id, title) values (-999, "' + testData + '")'
+    , function (err, result) {
+
+      assert.ifError(err);
+      insertResult = result;
+
+      // select the row with negative AI
+      connection.query('SELECT * FROM `' + testTable + '`' +
+      ' WHERE id = ' + result.insertId
+      ,function (err, result_) {
+
+        assert.ifError(err);
+        selectResult = result_;
+
+        connection.end();
+      });
+  });
+};
+
+prepareAndTest();
+
+process.on('exit', function () {
+  assert.strictEqual(insertResult.insertId, -999);
+  assert.strictEqual(selectResult.length, 1);
+
+  assert.equal(selectResult[0].id, String(insertResult.insertId));
+  assert.equal(selectResult[0].title, testData);
+});