Stop trying to decode blobs as UTF8 strings

Author: jamesots

lib/src/blob.dart

@@ -27,7 +27,7 @@ class Blob {
     if (_string != null) {
       return _string;
     }
-    return UTF8.decode(_codeUnits);
+    return UTF8.decode(_codeUnits, allowMalformed: true);
   }
 
   /// Returns the value of the blob as a list of code units.
@@ -43,7 +43,7 @@ class Blob {
       if (_string != null) {
         _hashcode = _string.hashCode;
       } else {
-        _hashcode = UTF8.decode(_codeUnits).hashCode;
+        _hashcode = UTF8.decode(_codeUnits, allowMalformed: true).hashCode;
       }
     }
     return _hashcode;

lib/src/query/standard_data_packet.dart

@@ -5,18 +5,14 @@ class _StandardDataPacket extends Row {
   final Map<Symbol, int> _fieldIndex;
 
   _StandardDataPacket(Buffer buffer, List<_FieldImpl> fieldPackets, this._fieldIndex) :
-      values = new List<dynamic>(fieldPackets.length) {
+    values = new List<dynamic>(fieldPackets.length) {
     for (var i = 0; i < fieldPackets.length; i++) {
 
-      var s;
       var list;
       int length = buffer.readLengthCodedBinary();
       if (length != null) {
         list = buffer.readList(length);
-        s = UTF8.decode(list);
-      }
-      
-      if (s == null) {
+      } else {
         values[i] = null;
         continue;
       }
@@ -26,11 +22,13 @@ class _StandardDataPacket extends Row {
         case FIELD_TYPE_INT24: // mediumint
         case FIELD_TYPE_LONGLONG: // bigint/serial
         case FIELD_TYPE_LONG: // int
+          var s = UTF8.decode(list);
           values[i] = int.parse(s);
           break;
         case FIELD_TYPE_NEWDECIMAL: // decimal
         case FIELD_TYPE_FLOAT: // float
         case FIELD_TYPE_DOUBLE: // double
+          var s = UTF8.decode(list);
           values[i] = double.parse(s);
           break;
         case FIELD_TYPE_BIT: // bit
@@ -43,25 +41,30 @@ class _StandardDataPacket extends Row {
         case FIELD_TYPE_DATE: // date
         case FIELD_TYPE_DATETIME: // datetime
         case FIELD_TYPE_TIMESTAMP: // timestamp
+          var s = UTF8.decode(list);
           values[i] = DateTime.parse(s);
           break;
         case FIELD_TYPE_TIME: // time
+          var s = UTF8.decode(list);
           var parts = s.split(":");
           values[i] = new Duration(days: 0, hours: int.parse(parts[0]),
             minutes: int.parse(parts[1]), seconds: int.parse(parts[2]), 
             milliseconds: 0);
           break;
         case FIELD_TYPE_YEAR: // year
+          var s = UTF8.decode(list);
           values[i] = int.parse(s);
           break;
         case FIELD_TYPE_STRING: // char/binary/enum/set
         case FIELD_TYPE_VAR_STRING: // varchar/varbinary
+          var s = UTF8.decode(list);
           values[i] = s;
           break;
         case FIELD_TYPE_BLOB: // tinytext/text/mediumtext/longtext/tinyblob/mediumblob/blob/longblob
-          values[i] = new Blob.fromString(s);
+          values[i] = new Blob.fromBytes(list);
           break;
         case FIELD_TYPE_GEOMETRY: // geometry
+          var s = UTF8.decode(list);
           values[i] = s;
           break;
       }

test/integration/blob.dart

@@ -0,0 +1,31 @@
+part of integrationtests;
+
+void runBlobTests(String user, String password, String db, int port, String host) {
+  ConnectionPool pool;
+  group('charset tests:', () {
+    test('setup', () {
+      pool = new ConnectionPool(user:user, password:password, db:db, port:port, host:host, max:1);
+      return setup(pool, "blobtest", "create table blobtest (stuff blob)");
+    });
+
+    test('write blob', () async {
+      var query = await pool.prepare("insert into blobtest (stuff) values (?)");
+      await query.execute([[0xc3, 0x28]]);  // this is an invalid UTF8 string
+    });
+
+    test('read data', () async {
+      var c = new Completer();
+      var results = await pool.query('select * from blobtest');
+      results.listen((row) {
+        expect((row[0] as Blob).toBytes(), equals([0xc3, 0x28]));
+      }, onDone: () {
+        c.complete();
+      });
+      return c.future;
+    });
+
+    test('close connection', () {
+      pool.closeConnectionsWhenNotInUse();
+    });
+  });
+}

test/integration_test.dart

@@ -23,6 +23,7 @@ part 'integration/errors.dart';
 part 'integration/stored_procedures.dart';
 part 'integration/execute_multi.dart';
 part 'integration/prepared_query.dart';
+part 'integration/blob.dart';
 
 void main(List<String> args) {
   hierarchicalLoggingEnabled = true;
@@ -61,6 +62,7 @@ void main(List<String> args) {
   runStreamTests(user, password, db, port, host);
   runRowTests(user, password, db, port, host);
   runErrorTests(user, password, db, port, host);
+  runBlobTests(user, password, db, port, host);
 //  runStoredProcedureTests(user, password, db, port, host);
   runExecuteMultiTests(user, password, db, port, host);
 //  if (results['large_packets'] == 'true') {