Skip to content

Commit b018614

Browse files
committed
Rename ColumnTypeMapping to ColumnTypeMetadata.
1 parent 22db119 commit b018614

File tree

5 files changed

+78
-78
lines changed

5 files changed

+78
-78
lines changed

src/MySqlConnector/MySqlClient/MySqlDbColumn.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public sealed class MySqlDbColumn : System.Data.Common.DbColumn
4242
{
4343
internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, MySqlDbType mySqlDbType)
4444
{
45-
var columnTypeMapping = TypeMapper.Mapper.GetColumnMapping(mySqlDbType);
45+
var columnTypeMetadata = TypeMapper.Mapper.GetColumnTypeMetadata(mySqlDbType);
4646

47-
var type = columnTypeMapping.DbTypeMapping.ClrType;
47+
var type = columnTypeMetadata.DbTypeMapping.ClrType;
4848
var columnSize = type == typeof(string) || type == typeof(Guid) ?
4949
column.ColumnLength / SerializationUtility.GetBytesPerCharacter(column.CharacterSet) :
5050
column.ColumnLength;
@@ -58,7 +58,7 @@ internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, MySqlDbType
5858
ColumnOrdinal = ordinal;
5959
ColumnSize = columnSize > int.MaxValue ? int.MaxValue : unchecked((int) columnSize);
6060
DataType = type;
61-
DataTypeName = columnTypeMapping.SimpleDataTypeName;
61+
DataTypeName = columnTypeMetadata.SimpleDataTypeName;
6262
if (mySqlDbType == MySqlDbType.String)
6363
DataTypeName += string.Format(CultureInfo.InvariantCulture, "({0})", columnSize);
6464
IsAliased = column.PhysicalName != column.Name;

src/MySqlConnector/MySqlClient/Results/ResultSet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ public string GetDataTypeName(int ordinal)
278278
var mySqlDbType = ColumnTypes[ordinal];
279279
if (mySqlDbType == MySqlDbType.String)
280280
return string.Format(CultureInfo.InvariantCulture, "CHAR({0})", ColumnDefinitions[ordinal].ColumnLength / SerializationUtility.GetBytesPerCharacter(ColumnDefinitions[ordinal].CharacterSet));
281-
return TypeMapper.Mapper.GetColumnMapping(mySqlDbType).SimpleDataTypeName;
281+
return TypeMapper.Mapper.GetColumnTypeMetadata(mySqlDbType).SimpleDataTypeName;
282282
}
283283

284284
public Type GetFieldType(int ordinal)
285285
{
286286
if (ordinal < 0 || ordinal > ColumnDefinitions.Length)
287287
throw new ArgumentOutOfRangeException(nameof(ordinal), "value must be between 0 and {0}.".FormatInvariant(ColumnDefinitions.Length));
288288

289-
return TypeMapper.Mapper.GetColumnMapping(ColumnTypes[ordinal]).DbTypeMapping.ClrType;
289+
return TypeMapper.Mapper.GetColumnTypeMetadata(ColumnTypes[ordinal]).DbTypeMapping.ClrType;
290290
}
291291

292292
public int FieldCount => ColumnDefinitions?.Length ?? 0;

src/MySqlConnector/MySqlClient/Types/ColumnTypeMapping.cs renamed to src/MySqlConnector/MySqlClient/Types/ColumnTypeMetadata.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
namespace MySql.Data.MySqlClient.Types
22
{
3-
internal sealed class ColumnTypeMapping
3+
internal sealed class ColumnTypeMetadata
44
{
55
public static string CreateLookupKey(string columnTypeName, bool isUnsigned, int length) => $"{columnTypeName}|{(isUnsigned ? "u" : "s")}|{length}";
66

7-
public ColumnTypeMapping(string dataTypeName, DbTypeMapping dbTypeMapping, MySqlDbType mySqlDbType, bool unsigned = false, bool binary = false, int length = 0, string simpleDataTypeName = null)
7+
public ColumnTypeMetadata(string dataTypeName, DbTypeMapping dbTypeMapping, MySqlDbType mySqlDbType, bool unsigned = false, bool binary = false, int length = 0, string simpleDataTypeName = null)
88
{
99
DataTypeName = dataTypeName;
1010
SimpleDataTypeName = simpleDataTypeName ?? dataTypeName;

0 commit comments

Comments
 (0)