Complete BOOL to integral conversions. Fixes #782

Author: bgrainger

src/MySqlConnector/Core/Row.cs

@@ -89,6 +89,8 @@ public sbyte GetSByte(int ordinal)
 				return checked((sbyte) ulongValue);
 			if (value is decimal decimalValue)
 				return (sbyte) decimalValue;
+			if (value is bool boolValue)
+				return boolValue ? (sbyte) 1 : (sbyte) 0;
 			return (sbyte) value;
 		}
 
@@ -114,6 +116,8 @@ public byte GetByte(int ordinal)
 				return checked((byte) ulongValue);
 			if (value is decimal decimalValue)
 				return (byte) decimalValue;
+			if (value is bool boolValue)
+				return boolValue ? (byte) 1 : (byte) 0;
 			return (byte) value;
 		}
 
@@ -226,7 +230,18 @@ public int GetInt32(int ordinal)
 
 			if (columnDefinition.ColumnType == ColumnType.Bit)
 				return checked((int) ReadBit(data, columnDefinition));
-			return GetInt32Core(data, columnDefinition);
+
+			var result = GetInt32Core(data, columnDefinition);
+			if (columnDefinition.ColumnType == ColumnType.Tiny &&
+				Connection.TreatTinyAsBoolean &&
+				columnDefinition.ColumnLength == 1 &&
+				(columnDefinition.ColumnFlags & ColumnFlags.Unsigned) == 0 &&
+				result != 0)
+			{
+				// coerce all non-zero TINYINT(1) results to 1, since it represents a BOOL value
+				result = 1;
+			}
+			return result;
 		}
 
 		protected abstract int GetInt32Core(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition);
@@ -254,7 +269,7 @@ public long GetInt64(int ordinal)
 			if (value is decimal)
 				return (long) (decimal) value;
 			if (value is bool)
-				return (bool)value ? 1 : 0;
+				return (bool) value ? 1 : 0;
 			return (long) value;
 		}
 

tests/SideBySide/QueryTests.cs

@@ -1214,6 +1214,51 @@ END AS value
 			Assert.False(await reader.NextResultAsync());
 		}
 
+		[Theory]
+		[InlineData(false, false)]
+		[InlineData(false, true)]
+		[InlineData(true, false)]
+		[InlineData(true, true)]
+		public void GetIntForTinyInt1(bool treatTinyAsBoolean, bool prepare)
+		{
+			var csb = AppConfig.CreateConnectionStringBuilder();
+			csb.TreatTinyAsBoolean = treatTinyAsBoolean;
+			csb.IgnorePrepare = false;
+			using var connection = new MySqlConnection(csb.ConnectionString);
+			connection.Open();
+			connection.Execute(@"drop table if exists datatypes_tinyint1;
+create table datatypes_tinyint1(value tinyint(1));
+insert into datatypes_tinyint1(value) values(0), (1), (2), (-1), (-128), (127);");
+
+			using var command = new MySqlCommand("select value from datatypes_tinyint1;", connection);
+			if (prepare)
+				command.Prepare();
+			using var reader = command.ExecuteReader();
+
+			int[] expected = { 0, 1, 2, -1, -128, 127 };
+			if (treatTinyAsBoolean)
+				expected = expected.Select(x => x == 0 ? 0 : 1).ToArray();
+
+			for (int i = 0; i < expected.Length; i++)
+			{
+				Assert.True(reader.Read());
+#if !BASELINE
+				Assert.Equal((sbyte) expected[i], reader.GetSByte(0));
+				if (treatTinyAsBoolean)
+					Assert.Equal((byte) expected[i], reader.GetByte(0));
+#endif
+				Assert.Equal((short) expected[i], reader.GetInt16(0));
+				Assert.Equal(expected[i], reader.GetInt32(0));
+				Assert.Equal((long) expected[i], reader.GetInt64(0));
+#if !BASELINE
+				Assert.Equal(expected[i], reader.GetFieldValue<int>(0));
+#endif
+			}
+
+			Assert.False(reader.Read());
+		}
+
+
 		class BoolTest
 		{
 			public int Id { get; set; }