Rename TypeMapper.Mapper to TypeMapper.Instance.

Author: bgrainger

src/MySqlConnector/MySqlClient/Caches/CachedParameter.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Linq;
 using MySql.Data.MySqlClient.Types;
 
@@ -29,7 +29,7 @@ public CachedParameter(int ordinalPosition, string mode, string name, string dat
 				}
 			}
 			Name = name;
-			DbType = TypeMapper.Mapper.GetDbTypeMapping(dataType, unsigned).DbTypes?.First() ?? DbType.Object;
+			DbType = TypeMapper.Instance.GetDbTypeMapping(dataType, unsigned).DbTypes?.First() ?? DbType.Object;
 		}
 
 		internal readonly int Position;

src/MySqlConnector/MySqlClient/CommandExecutors/StoredProcedureCommandExecutor.cs

@@ -104,7 +104,7 @@ internal void SetParams()
 					var param = m_outParams[i];
 					if (param.HasSetDbType)
 					{
-						var dbTypeMapping = TypeMapper.Mapper.GetDbTypeMapping(param.DbType);
+						var dbTypeMapping = TypeMapper.Instance.GetDbTypeMapping(param.DbType);
 						if (dbTypeMapping != null)
 						{
 							param.Value = dbTypeMapping.DoConversion(reader.GetValue(i));

src/MySqlConnector/MySqlClient/MySqlConnection.cs

@@ -250,7 +250,7 @@ public override System.Data.DataTable GetSchema(string collectionName, string[]
 				});
 
 				// Column type mappings:
-				var colTypes = Types.TypeMapper.Mapper.GetColumnMappings();
+				var colTypes = Types.TypeMapper.Instance.GetColumnMappings();
 				foreach (var map in colTypes)
 				{
 					var dbTypeMap = map.DbTypeMapping;
@@ -267,8 +267,8 @@ public override System.Data.DataTable GetSchema(string collectionName, string[]
 				foreach (MySqlDbType mapItem in Enum.GetValues(typeof(MySqlDbType)))
 				{
 					var typeName = Enum.GetName(typeof(MySqlDbType), mapItem);
-					var dbType = Types.TypeMapper.Mapper.GetDbTypeForMySqlDbType(mapItem);
-					var map = Types.TypeMapper.Mapper.GetDbTypeMapping(dbType);
+					var dbType = Types.TypeMapper.Instance.GetDbTypeForMySqlDbType(mapItem);
+					var map = Types.TypeMapper.Instance.GetDbTypeMapping(dbType);
 					if (map != null) // MySqlDbType.Set is not supported by the mapper.
 					{
 						dt.Rows.Add(new object[] {

src/MySqlConnector/MySqlClient/MySqlDbColumn.cs

@@ -42,7 +42,7 @@ public sealed class MySqlDbColumn : System.Data.Common.DbColumn
 	{
 		internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, MySqlDbType mySqlDbType)
 		{
-			var columnTypeMetadata = TypeMapper.Mapper.GetColumnTypeMetadata(mySqlDbType);
+			var columnTypeMetadata = TypeMapper.Instance.GetColumnTypeMetadata(mySqlDbType);
 
 			var type = columnTypeMetadata.DbTypeMapping.ClrType;
 			var columnSize = type == typeof(string) || type == typeof(Guid) ?

src/MySqlConnector/MySqlClient/MySqlParameter.cs

@@ -26,7 +26,7 @@ public override DbType DbType
 			set
 			{
 				m_dbType = value;
-				m_mySqlDbType = TypeMapper.Mapper.GetMySqlDbTypeForDbType(value);
+				m_mySqlDbType = TypeMapper.Instance.GetMySqlDbTypeForDbType(value);
 				HasSetDbType = true;
 			}
 		}
@@ -36,7 +36,7 @@ public MySqlDbType MySqlDbType
 			get => m_mySqlDbType;
 			set
 			{
-				m_dbType = TypeMapper.Mapper.GetDbTypeForMySqlDbType(value);
+				m_dbType = TypeMapper.Instance.GetDbTypeForMySqlDbType(value);
 				m_mySqlDbType = value;
 				HasSetDbType = true;
 			}

src/MySqlConnector/MySqlClient/Results/ResultSet.cs

@@ -278,15 +278,15 @@ public string GetDataTypeName(int ordinal)
 			var mySqlDbType = ColumnTypes[ordinal];
 			if (mySqlDbType == MySqlDbType.String)
 				return string.Format(CultureInfo.InvariantCulture, "CHAR({0})", ColumnDefinitions[ordinal].ColumnLength / SerializationUtility.GetBytesPerCharacter(ColumnDefinitions[ordinal].CharacterSet));
-			return TypeMapper.Mapper.GetColumnTypeMetadata(mySqlDbType).SimpleDataTypeName;
+			return TypeMapper.Instance.GetColumnTypeMetadata(mySqlDbType).SimpleDataTypeName;
 		}
 
 		public Type GetFieldType(int ordinal)
 		{
 			if (ordinal < 0 || ordinal > ColumnDefinitions.Length)
 				throw new ArgumentOutOfRangeException(nameof(ordinal), "value must be between 0 and {0}.".FormatInvariant(ColumnDefinitions.Length));
 
-			return TypeMapper.Mapper.GetColumnTypeMetadata(ColumnTypes[ordinal]).DbTypeMapping.ClrType;
+			return TypeMapper.Instance.GetColumnTypeMetadata(ColumnTypes[ordinal]).DbTypeMapping.ClrType;
 		}
 
 		public int FieldCount => ColumnDefinitions?.Length ?? 0;

src/MySqlConnector/MySqlClient/Types/TypeMapper.cs

@@ -31,8 +31,8 @@ public class TypeMapperTests
 		[InlineData(typeof(Guid), DbType.Guid)]
 		public void DbTypeMappingTest(Type clrType, DbType dbType)
 		{
-			Assert.Equal(clrType, TypeMapper.Mapper.GetDbTypeMapping(dbType).ClrType);
-			Assert.Contains(dbType, TypeMapper.Mapper.GetDbTypeMapping(clrType).DbTypes);
+			Assert.Equal(clrType, TypeMapper.Instance.GetDbTypeMapping(dbType).ClrType);
+			Assert.Contains(dbType, TypeMapper.Instance.GetDbTypeMapping(clrType).DbTypes);
 		}
 
 		[Theory]
@@ -51,7 +51,7 @@ public void DbTypeMappingTest(Type clrType, DbType dbType)
 		[InlineData((ulong)1, DbType.AnsiStringFixedLength, "1")]
 		public void ConversionTest(object original, DbType dbType, object expected)
 		{
-			Assert.Equal(expected, TypeMapper.Mapper.GetDbTypeMapping(dbType).DoConversion(original));
+			Assert.Equal(expected, TypeMapper.Instance.GetDbTypeMapping(dbType).DoConversion(original));
 		}
 
 		[Theory]
@@ -100,8 +100,8 @@ public void ConversionTest(object original, DbType dbType, object expected)
 		[InlineData("year", false, 0, DbType.Int32)]
 		public void ColumnTypeMetadataTest(string columnTypeName, bool unsigned, int length, DbType dbType)
 		{
-			Assert.Equal(dbType, TypeMapper.Mapper.GetDbTypeMapping(columnTypeName, unsigned, length).DbTypes.FirstOrDefault());
-			Assert.Equal(dbType, TypeMapper.Mapper.GetDbTypeMapping(columnTypeName.ToUpperInvariant(), unsigned, length).DbTypes.FirstOrDefault());
+			Assert.Equal(dbType, TypeMapper.Instance.GetDbTypeMapping(columnTypeName, unsigned, length).DbTypes.FirstOrDefault());
+			Assert.Equal(dbType, TypeMapper.Instance.GetDbTypeMapping(columnTypeName.ToUpperInvariant(), unsigned, length).DbTypes.FirstOrDefault());
 		}
 	}
 }