support JSON type on MySQL 5.7

tmtm · Dec 30, 2015 · 6cf6ee1 · 6cf6ee1
1 parent 98a0954
commit 6cf6ee1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ext/mysql/ext.c b/ext/mysql/ext.c
@@ -286,6 +286,7 @@ static VALUE _protocol_net2value(packet_data_t *data, int type, int uflag)
     case TYPE_NEWDECIMAL:
     case TYPE_BLOB:
     case TYPE_BIT:
+    case TYPE_JSON:
         return _packet_lcs(data);
     case TYPE_TINY:
         n = *data->ptr++;

diff --git a/lib/mysql/protocol.rb b/lib/mysql/protocol.rb
@@ -23,7 +23,7 @@ class Protocol
     # Object :: converted value.
     def self.net2value(pkt, type, unsigned)
       case type
-      when Field::TYPE_STRING, Field::TYPE_VAR_STRING, Field::TYPE_NEWDECIMAL, Field::TYPE_BLOB
+      when Field::TYPE_STRING, Field::TYPE_VAR_STRING, Field::TYPE_NEWDECIMAL, Field::TYPE_BLOB, Field::TYPE_JSON
         return pkt.lcs
       when Field::TYPE_TINY
         v = pkt.utiny

diff --git a/test/test_mysql.rb b/test/test_mysql.rb
@@ -1564,6 +1564,16 @@ class TestMysql < Test::Unit::TestCase
       assert{ @s.entries == [[nil], [''], ['abc'], ['def'], ['abc,def'], ['abc'], ['def'], ['abc,def'], ['']] }
     end
 
+    test '#fetch json column' do
+      if @m.server_version >= 50700
+        @m.query "create temporary table t (i json)"
+        @m.query "insert into t values ('123'),('{\"a\":1,\"b\":2,\"c\":3}'),('[1,2,3]')"
+        @s.prepare 'select i from t'
+        @s.execute
+        assert{ @s.entries == [['123'], ['{"a": 1, "b": 2, "c": 3}'], ['[1, 2, 3]']] }
+      end
+    end
+
     test '#field_count' do
       @s.prepare 'select 1,2,3'
       assert{ @s.field_count == 3 }