Do not check for handshake if we are already running queries - fixes mauricio#80

mauricio · mauricio · commit 37c85b6e7178 · 2014-01-18T15:14:48.000-03:00
diff --git a/mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/MySQLFrameDecoder.scala b/mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/MySQLFrameDecoder.scala
@@ -77,15 +77,15 @@ class MySQLFrameDecoder(charset: Charset, connectionId : String) extends ByteToM
         val slice = buffer.readSlice(size)
 
         if ( log.isTraceEnabled ) {
-          log.trace(s"Reading message is $messageType - " +
+          log.trace(s"Reading message type $messageType - " +
             s"(count=$messagesCount,size=$size,isInQuery=$isInQuery,processingColumns=$processingColumns,processingParams=$processingParams,processedColumns=$processedColumns,processedParams=$processedParams)" +
-            s"\n${BufferDumper.dumpAsHex(buffer)}}")
+            s"\n${BufferDumper.dumpAsHex(slice)}}")
         }
 
         slice.readByte()
 
         val decoder = messageType match {
-          case ServerMessage.ServerProtocolVersion => this.handshakeDecoder
+          case ServerMessage.ServerProtocolVersion if !isInQuery => this.handshakeDecoder
           case ServerMessage.Error => {
             this.clear
             this.errorDecoder
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
@@ -223,6 +223,46 @@ class QuerySpec extends Specification with ConnectionHelper {
 
     }
 
+    "select from another empty table with many columns" in {
+      withConnection {
+        connection =>
+          val create = """create temporary table test_11 (
+                         |    id int primary key not null,
+                         |    c2 text not null, c3 text not null, c4 text not null,
+                         |    c5 text not null, c6 text not null, c7 text not null,
+                         |    c8 text not null, c9 text not null, c10 text not null,
+                         |    c11 text not null
+                         |) ENGINE=InnoDB DEFAULT CHARSET=utf8;""".stripMargin
+
+          executeQuery(connection, create)
+
+          val result = executeQuery(connection, "select * from test_11")
+
+          result.rows.get.size === 0
+      }
+    }
+
+    "select from an empty table with many columns" in {
+
+      withConnection {
+        connection =>
+
+          val create = """create temporary table test_10 (
+                         |    id int primary key not null,
+                         |    c2 text not null, c3 text not null, c4 text not null,
+                         |    c5 text not null, c6 text not null, c7 text not null,
+                         |    c8 text not null, c9 text not null, c10 text not null
+                         |) ENGINE=InnoDB DEFAULT CHARSET=utf8;""".stripMargin
+
+          executeQuery(connection, create)
+
+          val result = executeQuery(connection, "select * from test_10")
+
+          result.rows.get.size === 0
+      }
+
+    }
+
   }
 
 }
