Merge pull request mauricio#55 from kxbmap/mysql-binary-types

mauricio · mauricio · commit fcd53aa8ac2a · 2013-12-01T12:54:55.000-08:00
Add support for MySQL BINARY/VARBINARY types
diff --git a/mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/DecoderRegistry.scala b/mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/DecoderRegistry.scala
@@ -36,13 +36,13 @@ class DecoderRegistry(charset: Charset) {
 
     (columnType: @switch) match {
       case ColumnTypes.FIELD_TYPE_VARCHAR |
-           ColumnTypes.FIELD_TYPE_VAR_STRING |
-           ColumnTypes.FIELD_TYPE_STRING |
            ColumnTypes.FIELD_TYPE_ENUM => this.stringDecoder
       case ColumnTypes.FIELD_TYPE_BLOB |
            ColumnTypes.FIELD_TYPE_LONG_BLOB |
            ColumnTypes.FIELD_TYPE_MEDIUM_BLOB |
-           ColumnTypes.FIELD_TYPE_TINY_BLOB => {
+           ColumnTypes.FIELD_TYPE_TINY_BLOB |
+           ColumnTypes.FIELD_TYPE_VAR_STRING |
+           ColumnTypes.FIELD_TYPE_STRING => {
         if (charsetCode == CharsetMapper.Binary) {
           ByteArrayDecoder
         } else {
@@ -83,13 +83,13 @@ class DecoderRegistry(charset: Charset) {
       case ColumnTypes.FIELD_TYPE_SHORT => ShortEncoderDecoder
       case ColumnTypes.FIELD_TYPE_TIME => TextTimeDecoder
       case ColumnTypes.FIELD_TYPE_TINY => TextByteDecoder
-      case ColumnTypes.FIELD_TYPE_VAR_STRING |
-           ColumnTypes.FIELD_TYPE_VARCHAR |
-           ColumnTypes.FIELD_TYPE_STRING |
+      case ColumnTypes.FIELD_TYPE_VARCHAR |
            ColumnTypes.FIELD_TYPE_ENUM => StringEncoderDecoder
       case ColumnTypes.FIELD_TYPE_YEAR => ShortEncoderDecoder
       case ColumnTypes.FIELD_TYPE_BIT => ByteArrayColumnDecoder
-      case ColumnTypes.FIELD_TYPE_BLOB => {
+      case ColumnTypes.FIELD_TYPE_BLOB |
+           ColumnTypes.FIELD_TYPE_VAR_STRING |
+           ColumnTypes.FIELD_TYPE_STRING => {
         if (charsetCode == CharsetMapper.Binary) {
           ByteArrayColumnDecoder
         } else {
diff --git a/mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/QuerySpec.scala b/mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/QuerySpec.scala
@@ -211,6 +211,55 @@ class QuerySpec extends Specification with ConnectionHelper {
 
     }
 
+    "support BINARY type" in {
+
+      val create =
+        """CREATE TEMPORARY TABLE POSTS (
+          | id INT NOT NULL AUTO_INCREMENT,
+          | binary_column BINARY(20),
+          | primary key (id))
+        """.stripMargin
+
+      val insert = "INSERT INTO POSTS (binary_column) VALUES (?)"
+      val select = "SELECT * FROM POSTS"
+      val bytes = (1 to 10).map(_.toByte).toArray
+      val padding = Array.fill[Byte](10)(0)
+
+      withConnection {
+        connection =>
+          executeQuery(connection, create)
+          executePreparedStatement(connection, insert, bytes)
+          val row = executeQuery(connection, select).rows.get(0)
+          row("id") === 1
+          row("binary_column") === bytes ++ padding
+      }
+
+    }
+
+    "support VARBINARY type" in {
+
+      val create =
+        """CREATE TEMPORARY TABLE POSTS (
+          | id INT NOT NULL AUTO_INCREMENT,
+          | varbinary_column VARBINARY(20),
+          | primary key (id))
+        """.stripMargin
+
+      val insert = "INSERT INTO POSTS (varbinary_column) VALUES (?)"
+      val select = "SELECT * FROM POSTS"
+      val bytes = (1 to 10).map(_.toByte).toArray
+
+      withConnection {
+        connection =>
+          executeQuery(connection, create)
+          executePreparedStatement(connection, insert, bytes)
+          val row = executeQuery(connection, select).rows.get(0)
+          row("id") === 1
+          row("varbinary_column") === bytes
+      }
+
+    }
+
     "fail if number of args required is different than the number of provided parameters" in {
 
       withConnection {
