Return blob for GEOMETRY columns. Fixes #70

Author: bgrainger

src/MySqlConnector/Core/Row.cs

@@ -94,7 +94,8 @@ public long GetBytes(int ordinal, long dataOffset, byte[] buffer, int bufferOffs
 			var columnType = column.ColumnType;
 			if ((column.ColumnFlags & ColumnFlags.Binary) == 0 ||
 				(columnType != ColumnType.String && columnType != ColumnType.VarString && columnType != ColumnType.TinyBlob &&
-				columnType != ColumnType.Blob && columnType != ColumnType.MediumBlob && columnType != ColumnType.LongBlob))
+				columnType != ColumnType.Blob && columnType != ColumnType.MediumBlob && columnType != ColumnType.LongBlob &&
+				columnType != ColumnType.Geometry))
 			{
 				throw new InvalidCastException("Can't convert {0} to bytes.".FormatInvariant(columnType));
 			}
@@ -421,6 +422,9 @@ public object GetValue(int ordinal)
 			case ColumnType.NewDecimal:
 				return Utf8Parser.TryParse(data, out decimal decimalValue, out int bytesConsumed) && bytesConsumed == data.Length ? decimalValue : throw new FormatException();
 
+			case ColumnType.Geometry:
+				return data.ToArray();
+
 			default:
 				throw new NotImplementedException("Reading {0} not implemented".FormatInvariant(columnDefinition.ColumnType));
 			}

src/MySqlConnector/Core/TypeMapper.cs

@@ -263,6 +263,9 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 			case ColumnType.NewDecimal:
 				return MySqlDbType.NewDecimal;
 
+			case ColumnType.Geometry:
+				return MySqlDbType.Geometry;
+
 			case ColumnType.Null:
 				return MySqlDbType.Null;
 

tests/SideBySide/DataTypes.cs

@@ -945,6 +945,24 @@ public void GetMySqlDateTime(string columnName)
 			}
 		}
 
+		[Fact]
+		public void Geometry()
+		{
+			DoQuery("geometry", "Geometry", "GEOMETRY", new object[]
+			{
+				null,
+				new byte[] { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 240, 63 },
+				new byte[] { 0, 0, 0, 0, 1, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 64 }
+			},
+#if !BASELINE
+				GetBytes
+#else
+				// NOTE: Connector/NET returns 'null' for NULL so simulate an exception for the tests
+				x => x.IsDBNull(0) ? throw new GetValueWhenNullException() : x.GetValue(0)
+#endif
+				);
+		}
+
 #if !NETCOREAPP1_1_2
 		[Theory]
 		[InlineData("Bit1", "datatypes_bits", MySqlDbType.Bit, 1, typeof(ulong), "N", 0, 0)]
@@ -1000,6 +1018,7 @@ public void GetMySqlDateTime(string columnName)
 		[InlineData("Timestamp", "datatypes_times", MySqlDbType.Timestamp, 26, typeof(DateTime), "N", 0, 6)]
 		[InlineData("Time", "datatypes_times", MySqlDbType.Time, 17, typeof(TimeSpan), "N", 0, 6)]
 		[InlineData("Year", "datatypes_times", MySqlDbType.Year, 4, typeof(int), "N", 0, 0)]
+		[InlineData("Geometry", "datatypes_geometry", MySqlDbType.Geometry, int.MaxValue, typeof(byte[]), "LN", 0, 0)]
 		public void GetSchemaTable(string column, string table, MySqlDbType mySqlDbType, int columnSize, Type dataType, string flags, int precision, int scale) =>
 			DoGetSchemaTable(column, table, mySqlDbType, columnSize, dataType, flags, precision, scale);
 
@@ -1123,6 +1142,7 @@ private void DoGetSchemaTable(string column, string table, MySqlDbType mySqlDbTy
 		[InlineData("Timestamp", "datatypes_times", MySqlDbType.Timestamp, "TIMESTAMP", 26, typeof(DateTime), "N", -1, 6)]
 		[InlineData("Time", "datatypes_times", MySqlDbType.Time, "TIME", 17, typeof(TimeSpan), "N", -1, 6)]
 		[InlineData("Year", "datatypes_times", MySqlDbType.Year, "YEAR", 4, typeof(int), "N", -1, 0)]
+		[InlineData("Geometry", "datatypes_geometry", MySqlDbType.Geometry, "GEOMETRY", int.MaxValue, typeof(byte[]), "LN", -1, 0)]
 		public void GetColumnSchema(string column, string table, MySqlDbType mySqlDbType, string dataTypeName, int columnSize, Type dataType, string flags, int precision, int scale)
 		{
 			if (table == "datatypes_json_core" && !AppConfig.SupportsJson)

tests/SideBySide/DataTypesFixture.cs

@@ -195,6 +195,18 @@ insert into datatypes_guids (char38, char38bin, `text`, `blob`)
     '33221100-5544-7766-8899-aabbccddeeff', X'00112233445566778899AABBCCDDEEFF'),
   ('{33221100-5544-7766-8899-aabbccddeeff}', '{33221100-5544-7766-8899-aabbccddeeff}',
     '{33221100-5544-7766-8899-aabbccddeeff}', X'00112233445566778899AABBCCDDEEFF');
+
+drop table if exists datatypes_geometry;
+create table datatypes_geometry (
+  rowid integer not null primary key auto_increment,
+  `Geometry` geometry null
+);
+
+insert into datatypes_geometry (`Geometry`)
+values
+  (null),
+  (ST_GeomFromText('POINT(1 1)')),
+  (ST_GeomFromText('LINESTRING(0 0,1 1,2 2)'));
 ");
 
 			if (AppConfig.SupportsJson)