Got the row parsing working, yeah!

mysqljs · Aug 12, 2010 · c5c83c7 · c5c83c7
1 parent bff0615
commit c5c83c7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/lib/mysql/parser.js b/lib/mysql/parser.js
@@ -482,20 +482,28 @@ Parser.prototype.write = function(buffer) {
         packet.columnLength = lengthCoded(packet.columnLength);
         break;
       case Parser.COLUMN_VALUE_STRING:
-        var remaining = packet.columnLength - packet.index;
-        console.log(remaining);
+        var remaining = packet.columnLength - packet.index, read;
         if (i + remaining >= buffer.length) {
-          var read = buffer.length - i;
+          read = buffer.length - i;
           packet.emit('data', buffer.slice(i, buffer.length), remaining - read);
           packet.index += read;
+          // the -1 offsets are because these values are also manipulated by the loop itself
+          packet.received += read - 1;
           i = buffer.length;
         } else {
           packet.emit('data', buffer.slice(i, i + remaining), 0);
           i += remaining - 1;
+          packet.received += remaining - 1;
           advance(Parser.COLUMN_VALUE_LENGTH);
+          // advance() sets this to -1, but packet.index++ is skipped, so we need to manually fix
           packet.index = 0;
         }
 
+        if (packet.received == packet.length) {
+          self.packet = packet = null;
+          self.state = state = Parser.PACKET_LENGTH;
+        }
+
         continue;
     }
 

diff --git a/test/simple/test-parser.js b/test/simple/test-parser.js
@@ -291,7 +291,7 @@ test(function write() {
   })();
 
   (function testRowPacket() {
-    parser.write(new Buffer([20, 0, 0, 1]));
+    parser.write(new Buffer([23, 0, 0, 1]));
     var packet = parser.packet;
 
     gently.expect(parser, 'emit', function(event, val) {
@@ -332,7 +332,9 @@ test(function write() {
     });
 
     parser.write(new Buffer(' are you?\u0005Fine!'));
-    console.log(parser);
+
+    assert.equal(parser.packet, null);
+    assert.equal(parser.state, Parser.PACKET_LENGTH);
   })();
 
   (function testEofPacketAfterRowPacket() {

diff --git a/test/system/test-query.js b/test/system/test-query.js
@@ -47,6 +47,17 @@ client.query(
   })
 );
 
+client.query(
+  'INSERT INTO '+TEST_TABLE+' '+
+  'SET title = ?, text = ?',
+  ['another entry', 'because 2 entries make a better test'],
+  gently.expect(function insertCb(err) {
+    if (err) {
+      throw err;
+    }
+  })
+);
+
 var query = client.query(
   'SELECT * FROM '+TEST_TABLE,
   gently.expect(function selectCb(err, results) {