Don't map TINYINT(1) UNSIGNED as bool. Fixes #530

Author: bgrainger

src/MySqlConnector/Core/Row.cs

@@ -354,7 +354,7 @@ public object GetValue(int ordinal)
 			{
 			case ColumnType.Tiny:
 				var value = ParseInt32(data);
-				if (Connection.TreatTinyAsBoolean && columnDefinition.ColumnLength == 1)
+				if (Connection.TreatTinyAsBoolean && columnDefinition.ColumnLength == 1 && !isUnsigned)
 					return value != 0;
 				return isUnsigned ? (object) (byte) value : (sbyte) value;
 

src/MySqlConnector/Core/TypeMapper.cs

@@ -179,7 +179,7 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 			switch (columnDefinition.ColumnType)
 			{
 			case ColumnType.Tiny:
-				return treatTinyAsBoolean && columnDefinition.ColumnLength == 1 ? MySqlDbType.Bool :
+				return treatTinyAsBoolean && columnDefinition.ColumnLength == 1 && !isUnsigned ? MySqlDbType.Bool :
 					isUnsigned ? MySqlDbType.UByte : MySqlDbType.Byte;
 
 			case ColumnType.Int24:

tests/SideBySide/DataTypes.cs

@@ -226,6 +226,13 @@ public void QueryTinyIntSbyte(string column, string dataTypeName, object[] expec
 			}
 		}
 
+		[Theory()]
+		[InlineData("TinyInt1U", "TINYINT", new object[] { null, (byte) 0, (byte) 1, (byte) 0, (byte) 1, (byte) 255, (byte) 123 })]
+		public void QueryTinyInt1Unsigned(string column, string dataTypeName, object[] expected)
+		{
+			DoQuery("bools", column, dataTypeName, expected, reader => reader.GetByte(0), baselineCoercedNullValue: default(byte));
+		}
+
 		[Theory]
 		[InlineData("SByte", "TINYINT", new object[] { null, default(sbyte), sbyte.MinValue, sbyte.MaxValue, (sbyte) 123 })]
 		public void QuerySByte(string column, string dataTypeName, object[] expected)
@@ -983,6 +990,7 @@ public void Geometry()
 		[InlineData("Boolean", "datatypes_bools", MySqlDbType.Bool, 1, typeof(bool), "N", 0, 0)]
 		[InlineData("TinyInt1", "datatypes_bools", MySqlDbType.Bool, 1, typeof(bool), "N", 0, 0)]
 #endif
+		[InlineData("TinyInt1U", "datatypes_bools", MySqlDbType.UByte, 1, typeof(byte), "N", 0, 0)]
 		[InlineData("size", "datatypes_enums", MySqlDbType.Enum, 7, typeof(string), "N", 0, 0)]
 		[InlineData("color", "datatypes_enums", MySqlDbType.Enum, 6, typeof(string), "", 0, 0)]
 		[InlineData("char38", "datatypes_guids", MySqlDbType.String, 38, typeof(string), "N", 0, 0)]
@@ -1107,6 +1115,7 @@ private void DoGetSchemaTable(string column, string table, MySqlDbType mySqlDbTy
 		[InlineData("rowid", "datatypes_bools", MySqlDbType.Int32, "INT", 11, typeof(int), "AK", -1, 0)]
 		[InlineData("Boolean", "datatypes_bools", MySqlDbType.Bool, "BOOL", 1, typeof(bool), "N", -1, 0)]
 		[InlineData("TinyInt1", "datatypes_bools", MySqlDbType.Bool, "BOOL", 1, typeof(bool), "N", -1, 0)]
+		[InlineData("TinyInt1U", "datatypes_bools", MySqlDbType.UByte, "TINYINT", 1, typeof(byte), "N", -1, 0)]
 		[InlineData("size", "datatypes_enums", MySqlDbType.Enum, "ENUM", 7, typeof(string), "N", -1, 0)]
 		[InlineData("color", "datatypes_enums", MySqlDbType.Enum, "ENUM", 6, typeof(string), "", -1, 0)]
 		[InlineData("char38", "datatypes_guids", MySqlDbType.String, "CHAR(38)", 38, typeof(string), "N", -1, 0)]

tests/SideBySide/DataTypesFixture.cs

@@ -12,18 +12,19 @@ public DataTypesFixture()
 create table datatypes_bools(
   rowid integer not null primary key auto_increment,
   Boolean bool null,
-  TinyInt1 tinyint(1) null
+  TinyInt1 tinyint(1) null,
+  TinyInt1U tinyint(1) unsigned null
 );
 
-insert into datatypes_bools(Boolean, TinyInt1)
+insert into datatypes_bools(Boolean, TinyInt1, TinyInt1U)
 values
-  (null, null),
-  (0, 0),
-  (1, 1),
-  (false, false),
-  (true, true),
-  (-1, -1),
-  (123, 123);
+  (null, null, null),
+  (0, 0, 0),
+  (1, 1, 1),
+  (false, false, false),
+  (true, true, true),
+  (-1, -1, 255),
+  (123, 123, 123);
 
 drop table if exists datatypes_bits;
 create table datatypes_bits(