Bug #14520822 (on prepared statments) - getString on BIT fields with wrong output.

silvakid · silvakid · commit 507c29ab6ada · 2015-05-12T16:35:10.000+01:00
Modify previous unit test.
Add new unit test with prepared statments.
diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
@@ -340,7 +340,9 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
 {
 	switch (field->type) {
 		case MYSQL_TYPE_BIT:
-			return sql::DataType::BIT;
+        if (field->flags !=(BINARY_FLAG|UNSIGNED_FLAG))
+          return sql::DataType::BIT;
+        return sql::DataType::BINARY;
 		case MYSQL_TYPE_DECIMAL:
 		case MYSQL_TYPE_NEWDECIMAL:
 			return sql::DataType::DECIMAL;
diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
@@ -703,7 +703,7 @@ void bugs::bug66235()
     stmt.reset(con->createStatement());
     stmt->execute("DROP TABLE IF EXISTS test");
     stmt->execute("CREATE TABLE test(id BIT(3))");
-    stmt->execute("INSERT INTO test(id) VALUES(1), (10), (1), (1), (10), (111);");
+    stmt->execute("INSERT INTO test(id) VALUES(0b1), (0b10), (0b1), (0b1), (0b10), (0b111);");
 
     res.reset(stmt->executeQuery("SELECT MAX(id), MIN(id) FROM test"));
     while (res->next())
@@ -733,5 +733,47 @@ void bugs::bug66235()
 }
 
 
+void bugs::bug14520822()
+{
+  logMsg("bug::bug14520822");
+  try
+  {
+    stmt.reset(con->createStatement());
+    stmt->execute("DROP TABLE IF EXISTS bug14520822");
+    stmt->execute("CREATE TABLE bug14520822(b BIT NOT NULL DEFAULT 0)");
+    stmt->execute("INSERT INTO bug14520822(b) VALUES(0b0), (0b1)");
+
+    res.reset(stmt->executeQuery("select min(b) ,max(b) from bug14520822"));
+    res->next();
+    ASSERT_EQUALS("0", res->getString(1));
+    ASSERT_EQUALS("1", res->getString(2));
+    ASSERT_EQUALS(false, res->getBoolean(1));
+    ASSERT_EQUALS(true, res->getBoolean(2));
+    ASSERT_EQUALS(0L, res->getInt64(1));
+    ASSERT_EQUALS(1L, res->getInt64(2));
+
+    pstmt.reset(con->prepareStatement("select min(b) ,max(b) from bug14520822"));
+    res.reset(pstmt->executeQuery());
+    res->next();
+    ASSERT_EQUALS("0", res->getString(1));
+    ASSERT_EQUALS("1", res->getString(2));
+    ASSERT_EQUALS(false, res->getBoolean(1));
+    ASSERT_EQUALS(true, res->getBoolean(2));
+    ASSERT_EQUALS(0L, res->getInt64(1));
+    ASSERT_EQUALS(1L, res->getInt64(2));
+
+
+  }
+  catch (sql::SQLException &e)
+  {
+    logErr(e.what());
+    logErr("SQLState: " + std::string(e.getSQLState()));
+    fail(e.what(), __FILE__, __LINE__);
+  }
+
+
+}
+
+
 } /* namespace regression */
 } /* namespace testsuite */
diff --git a/test/unit/bugs/bugs.h b/test/unit/bugs/bugs.h
@@ -61,6 +61,7 @@ class bugs : public unit_fixture
     TEST_CASE(bug19938873_stmt);
     TEST_CASE(bug68523);
     TEST_CASE(bug66235);
+    TEST_CASE(bug14520822);
   }
 
   /**
@@ -103,6 +104,8 @@ class bugs : public unit_fixture
   void bug68523();
 
   void bug66235();
+
+  void bug14520822();
 };
 
 REGISTER_FIXTURE(bugs);
