BUG23729357: Fix fetching BIT datatype

amitab · amitab · commit d5a1a23e566a · 2016-08-11T14:26:32.000+05:30
Firing a select query on a table having a BIT datatype results in the
following error:
ValueError: Unknown column type None

Adding the check for ColumnProtoType.BIT fixes this issue.

Test case was added for regression.
diff --git a/lib/mysqlx/result.py b/lib/mysqlx/result.py
@@ -496,8 +496,10 @@ def _map_type(self):
             self._col_type = ColumnType.SET
         elif self._proto_type == ColumnProtoType.ENUM:
             self._col_type = ColumnType.ENUM
+        elif self._proto_type == ColumnProtoType.BIT:
+            self._col_type = ColumnType.BIT
         else:
-            raise ValueError("Unknown column type {0}".format(self._col_type))
+            raise ValueError("Unknown column type {0}".format(self._proto_type))
 
 
 class Warning(object):
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -577,18 +577,19 @@ def test_column_metadata(self):
 
         self.node_session.sql(
             "CREATE TABLE {0}(age INT, name VARCHAR(50), pic VARBINARY(100), "
-            "config JSON, created DATE)".format(table_name)).execute()
-        self.node_session.sql(
-            "INSERT INTO {0} VALUES (21, 'Fred', NULL, NULL, '2008-07-26')"
+            "config JSON, created DATE, active BIT)"
             "".format(table_name)).execute()
         self.node_session.sql(
-            "INSERT INTO {0} VALUES (28, 'Barney', NULL, NULL, '2012-03-12')"
+            "INSERT INTO {0} VALUES (21, 'Fred', NULL, NULL, '2008-07-26', 0)"
             "".format(table_name)).execute()
         self.node_session.sql(
-            "INSERT INTO {0} VALUES (42, 'Wilma', NULL, NULL, '1975-11-11')"
+            "INSERT INTO {0} VALUES (28, 'Barney', NULL, NULL, '2012-03-12'"
+            ", 0)".format(table_name)).execute()
+        self.node_session.sql(
+            "INSERT INTO {0} VALUES (42, 'Wilma', NULL, NULL, '1975-11-11', 1)"
             "".format(table_name)).execute()
         self.node_session.sql(
-            "INSERT INTO {0} VALUES (67, 'Betty', NULL, NULL, '2015-06-21')"
+            "INSERT INTO {0} VALUES (67, 'Betty', NULL, NULL, '2015-06-21', 0)"
             "".format(table_name)).execute()
 
         table = self.schema.get_table("test")
@@ -615,3 +616,8 @@ def test_column_metadata(self):
         self.assertEqual("config", col.get_column_name())
         self.assertEqual("test", col.get_table_name())
         self.assertEqual(mysqlx.ColumnType.JSON, col.get_type())
+
+        col = result.columns[5]
+        self.assertEqual("active", col.get_column_name())
+        self.assertEqual("test", col.get_table_name())
+        self.assertEqual(mysqlx.ColumnType.BIT, col.get_type())
