Update nullable annotations.

bgrainger · bgrainger · commit 633eea3c6ead · 2019-12-09T13:13:57.000-08:00
Updated to follow latest proposal at dotnet/runtime#689.
diff --git a/src/MySqlConnector/Core/CachedParameter.cs b/src/MySqlConnector/Core/CachedParameter.cs
@@ -6,7 +6,7 @@ namespace MySqlConnector.Core
 {
 	internal sealed class CachedParameter
 	{
-		public CachedParameter(int ordinalPosition, string? mode, string? name, string dataType, bool unsigned, int length)
+		public CachedParameter(int ordinalPosition, string? mode, string name, string dataType, bool unsigned, int length)
 		{
 			Position = ordinalPosition;
 			if (Position == 0)
@@ -23,7 +23,7 @@ public CachedParameter(int ordinalPosition, string? mode, string? name, string d
 
 		public int Position { get; }
 		public ParameterDirection Direction { get; }
-		public string? Name { get; }
+		public string Name { get; }
 		public MySqlDbType MySqlDbType { get; }
 	}
 }
diff --git a/src/MySqlConnector/Core/CachedProcedure.cs b/src/MySqlConnector/Core/CachedProcedure.cs
@@ -45,7 +45,7 @@ internal sealed class CachedProcedure
 					if (returnsSql.Length != 0)
 					{
 						var returnDataType = ParseDataType(returnsSql, out var unsigned, out var length);
-						parsedParameters.Insert(0, CreateCachedParameter(0, null, null, returnDataType, unsigned, length, returnsSql));
+						parsedParameters.Insert(0, CreateCachedParameter(0, null, "", returnDataType, unsigned, length, returnsSql));
 					}
 
 					return new CachedProcedure(schema, component, parsedParameters);
@@ -90,7 +90,7 @@ FROM information_schema.parameters
 					parameters.Add(new CachedParameter(
 						reader.GetInt32(0),
 						!reader.IsDBNull(1) ? reader.GetString(1) : null,
-						!reader.IsDBNull(2) ? reader.GetString(2) : null,
+						!reader.IsDBNull(2) ? reader.GetString(2) : "",
 						dataType,
 						unsigned,
 						length
@@ -247,7 +247,7 @@ internal static string ParseDataType(string sql, out bool unsigned, out int leng
 			return sql;
 		}
 
-		private static CachedParameter CreateCachedParameter(int ordinal, string? direction, string? name, string dataType, bool unsigned, int length, string originalSql)
+		private static CachedParameter CreateCachedParameter(int ordinal, string? direction, string name, string dataType, bool unsigned, int length, string originalSql)
 		{
 			try
 			{
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlCommand.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlCommand.cs
@@ -73,7 +73,7 @@ private MySqlCommand(MySqlCommand other)
 
 		public override int ExecuteNonQuery() => ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 
-		public override object ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		public override object? ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 
 		public new MySqlDataReader ExecuteReader() => (MySqlDataReader) base.ExecuteReader();
 
@@ -238,10 +238,10 @@ internal async Task<int> ExecuteNonQueryAsync(IOBehavior ioBehavior, Cancellatio
 			return reader.RecordsAffected;
 		}
 
-		public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken) =>
+		public override Task<object?> ExecuteScalarAsync(CancellationToken cancellationToken) =>
 			ExecuteScalarAsync(AsyncIOBehavior, cancellationToken);
 
-		internal async Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
+		internal async Task<object?> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{
 			this.ResetCommandTimeout();
 			var hasSetResult = false;
@@ -257,7 +257,7 @@ internal async Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, Cancellati
 					hasSetResult = true;
 				}
 			} while (await reader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false));
-			return result!;
+			return result;
 		}
 
 		protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs
@@ -388,7 +388,7 @@ private static async Task ClearPoolAsync(MySqlConnection connection, IOBehavior
 		public override DataTable GetSchema(string collectionName) => GetSchemaProvider().GetSchema(collectionName);
 
 		/// <inheritdoc cref="DbConnection.GetSchema(string)"/>
-		public override DataTable GetSchema(string collectionName, string?[]? restrictions) => GetSchemaProvider().GetSchema(collectionName);
+		public override DataTable GetSchema(string collectionName, string?[] restrictions) => GetSchemaProvider().GetSchema(collectionName);
 
 		private SchemaProvider GetSchemaProvider()
 		{
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlDataAdapter.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlDataAdapter.cs
@@ -92,7 +92,7 @@ protected override int AddToBatch(IDbCommand command)
 			if (mySqlCommand.CloneRawParameters() is MySqlParameterCollection clonedParameters)
 			{
 				foreach (var clonedParameter in clonedParameters)
-					batchCommand.Parameters.Add(clonedParameter);
+					batchCommand.Parameters.Add(clonedParameter!);
 			}
 
 			m_batch.BatchCommands.Add(batchCommand);
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlDbColumn.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlDbColumn.cs
@@ -7,18 +7,17 @@
 using MySqlConnector.Protocol.Serialization;
 
 #if NET45
-#nullable disable
 namespace System.Data.Common
 {
 	public abstract class DbColumn
 	{
 		public bool? AllowDBNull { get; protected set; }
-		public string BaseCatalogName { get; protected set; }
-		public string BaseColumnName { get; protected set; }
-		public string BaseSchemaName { get; protected set; }
-		public string BaseServerName { get; protected set; }
-		public string BaseTableName { get; protected set; }
-		public string ColumnName { get; protected set; }
+		public string? BaseCatalogName { get; protected set; }
+		public string? BaseColumnName { get; protected set; }
+		public string? BaseSchemaName { get; protected set; }
+		public string? BaseServerName { get; protected set; }
+		public string? BaseTableName { get; protected set; }
+		public string ColumnName { get; protected set; } = "";
 		public int? ColumnOrdinal { get; protected set; }
 		public int? ColumnSize { get; protected set; }
 		public bool? IsAliased { get; protected set; }
@@ -32,13 +31,12 @@ public abstract class DbColumn
 		public bool? IsUnique { get; protected set; }
 		public int? NumericPrecision { get; protected set; }
 		public int? NumericScale { get; protected set; }
-		public string UdtAssemblyQualifiedName { get; protected set; }
-		public Type DataType { get; protected set; }
-		public string DataTypeName { get; protected set; }
-		public virtual object this[string property] => null;
+		public string? UdtAssemblyQualifiedName { get; protected set; }
+		public Type? DataType { get; protected set; }
+		public string? DataTypeName { get; protected set; }
+		public virtual object? this[string property] => null;
 	}
 }
-#nullable enable
 #endif
 
 namespace MySql.Data.MySqlClient
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameter.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameter.cs
@@ -33,17 +33,17 @@ public MySqlParameter(string? name, object? value)
 #endif
 		}
 
-		public MySqlParameter(string? name, MySqlDbType mySqlDbType)
+		public MySqlParameter(string name, MySqlDbType mySqlDbType)
 			: this(name, mySqlDbType, 0)
 		{
 		}
 
-		public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size)
-			: this(name, mySqlDbType, size, null)
+		public MySqlParameter(string name, MySqlDbType mySqlDbType, int size)
+			: this(name, mySqlDbType, size, "")
 		{
 		}
 
-		public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size, string? sourceColumn)
+		public MySqlParameter(string name, MySqlDbType mySqlDbType, int size, string sourceColumn)
 		{
 			m_name = name ?? "";
 			NormalizedParameterName = NormalizeParameterName(m_name);
@@ -56,7 +56,7 @@ public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size, string? s
 		}
 
 #if !NETSTANDARD1_3
-		public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size, ParameterDirection direction, bool isNullable, byte precision, byte scale, string? sourceColumn, DataRowVersion sourceVersion, object value)
+		public MySqlParameter(string name, MySqlDbType mySqlDbType, int size, ParameterDirection direction, bool isNullable, byte precision, byte scale, string sourceColumn, DataRowVersion sourceVersion, object value)
 			: this(name, mySqlDbType, size, sourceColumn)
 		{
 			Direction = direction;
@@ -114,8 +114,8 @@ public override ParameterDirection Direction
 		public override byte Scale { get; set; }
 #endif
 
-		[NotNull]
-		public override string? ParameterName
+		[AllowNull]
+		public override string ParameterName
 		{
 			get => m_name;
 			set
@@ -127,8 +127,8 @@ public override string? ParameterName
 
 		public override int Size { get; set; }
 
-		[NotNull]
-		public override string? SourceColumn
+		[AllowNull]
+		public override string SourceColumn
 		{
 			get => m_sourceColumn;
 			set => m_sourceColumn = value ?? "";
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameterCollection.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameterCollection.cs
@@ -17,7 +17,7 @@ internal MySqlParameterCollection()
 			m_nameToIndex = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
 		}
 
-		public MySqlParameter Add(string? parameterName, DbType dbType)
+		public MySqlParameter Add(string parameterName, DbType dbType)
 		{
 			MySqlParameter parameter = new MySqlParameter
 			{
@@ -28,7 +28,7 @@ public MySqlParameter Add(string? parameterName, DbType dbType)
 			return parameter;
 		}
 
-		public override int Add(object? value)
+		public override int Add(object value)
 		{
 			AddParameter((MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))));
 			return m_parameters.Count - 1;
@@ -40,16 +40,16 @@ public MySqlParameter Add(MySqlParameter parameter)
 			return parameter;
 		}
 
-		public MySqlParameter Add(string? parameterName, MySqlDbType mySqlDbType) => Add(new MySqlParameter(parameterName, mySqlDbType));
-		public MySqlParameter Add(string? parameterName, MySqlDbType mySqlDbType, int size) => Add(new MySqlParameter(parameterName, mySqlDbType, size));
+		public MySqlParameter Add(string parameterName, MySqlDbType mySqlDbType) => Add(new MySqlParameter(parameterName, mySqlDbType));
+		public MySqlParameter Add(string parameterName, MySqlDbType mySqlDbType, int size) => Add(new MySqlParameter(parameterName, mySqlDbType, size));
 
 		public override void AddRange(Array values)
 		{
 			foreach (var obj in values)
-				Add(obj);
+				Add(obj!);
 		}
 
-		public MySqlParameter AddWithValue(string? parameterName, object? value)
+		public MySqlParameter AddWithValue(string parameterName, object? value)
 		{
 			var parameter = new MySqlParameter
 			{
@@ -60,7 +60,7 @@ public MySqlParameter AddWithValue(string? parameterName, object? value)
 			return parameter;
 		}
 
-		public override bool Contains(object? value) => value is MySqlParameter parameter && m_parameters.Contains(parameter);
+		public override bool Contains(object value) => value is MySqlParameter parameter && m_parameters.Contains(parameter);
 
 		public override bool Contains(string value) => IndexOf(value) != -1;
 
@@ -78,17 +78,17 @@ public override void Clear()
 
 		protected override DbParameter GetParameter(int index) => m_parameters[index];
 
-		protected override DbParameter GetParameter(string? parameterName)
+		protected override DbParameter GetParameter(string parameterName)
 		{
 			var index = IndexOf(parameterName);
 			if (index == -1)
 				throw new ArgumentException("Parameter '{0}' not found in the collection".FormatInvariant(parameterName), nameof(parameterName));
 			return m_parameters[index];
 		}
 
-		public override int IndexOf(object? value) => value is MySqlParameter parameter ? m_parameters.IndexOf(parameter) : -1;
+		public override int IndexOf(object value) => value is MySqlParameter parameter ? m_parameters.IndexOf(parameter) : -1;
 
-		public override int IndexOf(string? parameterName) => NormalizedIndexOf(parameterName);
+		public override int IndexOf(string parameterName) => NormalizedIndexOf(parameterName);
 
 		// Finds the index of a parameter by name, regardless of whether 'parameterName' or the matching
 		// MySqlParameter.ParameterName has a leading '?' or '@'.
@@ -98,15 +98,15 @@ internal int NormalizedIndexOf(string? parameterName)
 			return m_nameToIndex.TryGetValue(normalizedName, out var index) ? index : -1;
 		}
 
-		public override void Insert(int index, object? value) => m_parameters.Insert(index, (MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))));
+		public override void Insert(int index, object value) => m_parameters.Insert(index, (MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))));
 
 #if !NETSTANDARD1_3
 		public override bool IsFixedSize => false;
 		public override bool IsReadOnly => false;
 		public override bool IsSynchronized => false;
 #endif
 
-		public override void Remove(object? value) => RemoveAt(IndexOf(value ?? throw new ArgumentNullException(nameof(value))));
+		public override void Remove(object value) => RemoveAt(IndexOf(value ?? throw new ArgumentNullException(nameof(value))));
 
 		public override void RemoveAt(int index)
 		{
@@ -122,9 +122,9 @@ public override void RemoveAt(int index)
 			}
 		}
 
-		public override void RemoveAt(string? parameterName) => RemoveAt(IndexOf(parameterName));
+		public override void RemoveAt(string parameterName) => RemoveAt(IndexOf(parameterName));
 
-		protected override void SetParameter(int index, DbParameter? value)
+		protected override void SetParameter(int index, DbParameter value)
 		{
 			var newParameter = (MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value)));
 			var oldParameter = m_parameters[index];
@@ -135,7 +135,7 @@ protected override void SetParameter(int index, DbParameter? value)
 				m_nameToIndex.Add(newParameter.NormalizedParameterName, index);
 		}
 
-		protected override void SetParameter(string? parameterName, DbParameter? value) => SetParameter(IndexOf(parameterName), value);
+		protected override void SetParameter(string parameterName, DbParameter value) => SetParameter(IndexOf(parameterName), value);
 
 		public override int Count => m_parameters.Count;
 
@@ -147,7 +147,7 @@ protected override void SetParameter(int index, DbParameter? value)
 			set => SetParameter(index, value);
 		}
 
-		public new MySqlParameter this[string? name]
+		public new MySqlParameter this[string name]
 		{
 			get => (MySqlParameter) GetParameter(name);
 			set => SetParameter(name, value);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace MySqlConnector.Core`
`6`	`6`	`{`
`7`	`7`	`internal sealed class CachedParameter`
`8`	`8`	`{`
`9`		`- public CachedParameter(int ordinalPosition, string? mode, string? name, string dataType, bool unsigned, int length)`
	`9`	`+ public CachedParameter(int ordinalPosition, string? mode, string name, string dataType, bool unsigned, int length)`
`10`	`10`	`{`
`11`	`11`	`Position = ordinalPosition;`
`12`	`12`	`if (Position == 0)`
`@@ -23,7 +23,7 @@ public CachedParameter(int ordinalPosition, string? mode, string? name, string d`
`23`	`23`
`24`	`24`	`public int Position { get; }`
`25`	`25`	`public ParameterDirection Direction { get; }`
`26`		`- public string? Name { get; }`
	`26`	`+ public string Name { get; }`
`27`	`27`	`public MySqlDbType MySqlDbType { get; }`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ internal sealed class CachedProcedure`
`45`	`45`	`if (returnsSql.Length != 0)`
`46`	`46`	`{`
`47`	`47`	`var returnDataType = ParseDataType(returnsSql, out var unsigned, out var length);`
`48`		`- parsedParameters.Insert(0, CreateCachedParameter(0, null, null, returnDataType, unsigned, length, returnsSql));`
	`48`	`+ parsedParameters.Insert(0, CreateCachedParameter(0, null, "", returnDataType, unsigned, length, returnsSql));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return new CachedProcedure(schema, component, parsedParameters);`
`@@ -90,7 +90,7 @@ FROM information_schema.parameters`
`90`	`90`	`parameters.Add(new CachedParameter(`
`91`	`91`	`reader.GetInt32(0),`
`92`	`92`	`!reader.IsDBNull(1) ? reader.GetString(1) : null,`
`93`		`- !reader.IsDBNull(2) ? reader.GetString(2) : null,`
	`93`	`+ !reader.IsDBNull(2) ? reader.GetString(2) : "",`
`94`	`94`	`dataType,`
`95`	`95`	`unsigned,`
`96`	`96`	`length`
`@@ -247,7 +247,7 @@ internal static string ParseDataType(string sql, out bool unsigned, out int leng`
`247`	`247`	`return sql;`
`248`	`248`	`}`
`249`	`249`
`250`		`- private static CachedParameter CreateCachedParameter(int ordinal, string? direction, string? name, string dataType, bool unsigned, int length, string originalSql)`
	`250`	`+ private static CachedParameter CreateCachedParameter(int ordinal, string? direction, string name, string dataType, bool unsigned, int length, string originalSql)`
`251`	`251`	`{`
`252`	`252`	`try`
`253`	`253`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private MySqlCommand(MySqlCommand other)`
`73`	`73`
`74`	`74`	`public override int ExecuteNonQuery() => ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();`
`75`	`75`
`76`		`- public override object ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();`
	`76`	`+ public override object? ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();`
`77`	`77`
`78`	`78`	`public new MySqlDataReader ExecuteReader() => (MySqlDataReader) base.ExecuteReader();`
`79`	`79`
`@@ -238,10 +238,10 @@ internal async Task<int> ExecuteNonQueryAsync(IOBehavior ioBehavior, Cancellatio`
`238`	`238`	`return reader.RecordsAffected;`
`239`	`239`	`}`
`240`	`240`
`241`		`- public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken) =>`
	`241`	`+ public override Task<object?> ExecuteScalarAsync(CancellationToken cancellationToken) =>`
`242`	`242`	`ExecuteScalarAsync(AsyncIOBehavior, cancellationToken);`
`243`	`243`
`244`		`- internal async Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)`
	`244`	`+ internal async Task<object?> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)`
`245`	`245`	`{`
`246`	`246`	`this.ResetCommandTimeout();`
`247`	`247`	`var hasSetResult = false;`
`@@ -257,7 +257,7 @@ internal async Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, Cancellati`
`257`	`257`	`hasSetResult = true;`
`258`	`258`	`}`
`259`	`259`	`} while (await reader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false));`
`260`		`- return result!;`
	`260`	`+ return result;`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ private static async Task ClearPoolAsync(MySqlConnection connection, IOBehavior`
`388`	`388`	`public override DataTable GetSchema(string collectionName) => GetSchemaProvider().GetSchema(collectionName);`
`389`	`389`
`390`	`390`	`/// <inheritdoc cref="DbConnection.GetSchema(string)"/>`
`391`		`- public override DataTable GetSchema(string collectionName, string?[]? restrictions) => GetSchemaProvider().GetSchema(collectionName);`
	`391`	`+ public override DataTable GetSchema(string collectionName, string?[] restrictions) => GetSchemaProvider().GetSchema(collectionName);`
`392`	`392`
`393`	`393`	`private SchemaProvider GetSchemaProvider()`
`394`	`394`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected override int AddToBatch(IDbCommand command)`
`92`	`92`	`if (mySqlCommand.CloneRawParameters() is MySqlParameterCollection clonedParameters)`
`93`	`93`	`{`
`94`	`94`	`foreach (var clonedParameter in clonedParameters)`
`95`		`- batchCommand.Parameters.Add(clonedParameter);`
	`95`	`+ batchCommand.Parameters.Add(clonedParameter!);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`m_batch.BatchCommands.Add(batchCommand);`
Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,17 @@ public MySqlParameter(string? name, object? value)`
`33`	`33`	`#endif`
`34`	`34`	`}`
`35`	`35`
`36`		`- public MySqlParameter(string? name, MySqlDbType mySqlDbType)`
	`36`	`+ public MySqlParameter(string name, MySqlDbType mySqlDbType)`
`37`	`37`	`: this(name, mySqlDbType, 0)`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`41`		`- public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size)`
`42`		`- : this(name, mySqlDbType, size, null)`
	`41`	`+ public MySqlParameter(string name, MySqlDbType mySqlDbType, int size)`
	`42`	`+ : this(name, mySqlDbType, size, "")`
`43`	`43`	`{`
`44`	`44`	`}`
`45`	`45`
`46`		`- public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size, string? sourceColumn)`
	`46`	`+ public MySqlParameter(string name, MySqlDbType mySqlDbType, int size, string sourceColumn)`
`47`	`47`	`{`
`48`	`48`	`m_name = name ?? "";`
`49`	`49`	`NormalizedParameterName = NormalizeParameterName(m_name);`
`@@ -56,7 +56,7 @@ public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size, string? s`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`#if !NETSTANDARD1_3`
`59`		`- public MySqlParameter(string? name, MySqlDbType mySqlDbType, int size, ParameterDirection direction, bool isNullable, byte precision, byte scale, string? sourceColumn, DataRowVersion sourceVersion, object value)`
	`59`	`+ public MySqlParameter(string name, MySqlDbType mySqlDbType, int size, ParameterDirection direction, bool isNullable, byte precision, byte scale, string sourceColumn, DataRowVersion sourceVersion, object value)`
`60`	`60`	`: this(name, mySqlDbType, size, sourceColumn)`
`61`	`61`	`{`
`62`	`62`	`Direction = direction;`
`@@ -114,8 +114,8 @@ public override ParameterDirection Direction`
`114`	`114`	`public override byte Scale { get; set; }`
`115`	`115`	`#endif`
`116`	`116`
`117`		`- [NotNull]`
`118`		`- public override string? ParameterName`
	`117`	`+ [AllowNull]`
	`118`	`+ public override string ParameterName`
`119`	`119`	`{`
`120`	`120`	`get => m_name;`
`121`	`121`	`set`
`@@ -127,8 +127,8 @@ public override string? ParameterName`
`127`	`127`
`128`	`128`	`public override int Size { get; set; }`
`129`	`129`
`130`		`- [NotNull]`
`131`		`- public override string? SourceColumn`
	`130`	`+ [AllowNull]`
	`131`	`+ public override string SourceColumn`
`132`	`132`	`{`
`133`	`133`	`get => m_sourceColumn;`
`134`	`134`	`set => m_sourceColumn = value ?? "";`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal MySqlParameterCollection()`
`17`	`17`	`m_nameToIndex = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);`
`18`	`18`	`}`
`19`	`19`
`20`		`- public MySqlParameter Add(string? parameterName, DbType dbType)`
	`20`	`+ public MySqlParameter Add(string parameterName, DbType dbType)`
`21`	`21`	`{`
`22`	`22`	`MySqlParameter parameter = new MySqlParameter`
`23`	`23`	`{`
`@@ -28,7 +28,7 @@ public MySqlParameter Add(string? parameterName, DbType dbType)`
`28`	`28`	`return parameter;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public override int Add(object? value)`
	`31`	`+ public override int Add(object value)`
`32`	`32`	`{`
`33`	`33`	`AddParameter((MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))));`
`34`	`34`	`return m_parameters.Count - 1;`
`@@ -40,16 +40,16 @@ public MySqlParameter Add(MySqlParameter parameter)`
`40`	`40`	`return parameter;`
`41`	`41`	`}`
`42`	`42`
`43`		`- public MySqlParameter Add(string? parameterName, MySqlDbType mySqlDbType) => Add(new MySqlParameter(parameterName, mySqlDbType));`
`44`		`- public MySqlParameter Add(string? parameterName, MySqlDbType mySqlDbType, int size) => Add(new MySqlParameter(parameterName, mySqlDbType, size));`
	`43`	`+ public MySqlParameter Add(string parameterName, MySqlDbType mySqlDbType) => Add(new MySqlParameter(parameterName, mySqlDbType));`
	`44`	`+ public MySqlParameter Add(string parameterName, MySqlDbType mySqlDbType, int size) => Add(new MySqlParameter(parameterName, mySqlDbType, size));`
`45`	`45`
`46`	`46`	`public override void AddRange(Array values)`
`47`	`47`	`{`
`48`	`48`	`foreach (var obj in values)`
`49`		`- Add(obj);`
	`49`	`+ Add(obj!);`
`50`	`50`	`}`
`51`	`51`
`52`		`- public MySqlParameter AddWithValue(string? parameterName, object? value)`
	`52`	`+ public MySqlParameter AddWithValue(string parameterName, object? value)`
`53`	`53`	`{`
`54`	`54`	`var parameter = new MySqlParameter`
`55`	`55`	`{`
`@@ -60,7 +60,7 @@ public MySqlParameter AddWithValue(string? parameterName, object? value)`
`60`	`60`	`return parameter;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public override bool Contains(object? value) => value is MySqlParameter parameter && m_parameters.Contains(parameter);`
	`63`	`+ public override bool Contains(object value) => value is MySqlParameter parameter && m_parameters.Contains(parameter);`
`64`	`64`
`65`	`65`	`public override bool Contains(string value) => IndexOf(value) != -1;`
`66`	`66`
`@@ -78,17 +78,17 @@ public override void Clear()`
`78`	`78`
`79`	`79`	`protected override DbParameter GetParameter(int index) => m_parameters[index];`
`80`	`80`
`81`		`- protected override DbParameter GetParameter(string? parameterName)`
	`81`	`+ protected override DbParameter GetParameter(string parameterName)`
`82`	`82`	`{`
`83`	`83`	`var index = IndexOf(parameterName);`
`84`	`84`	`if (index == -1)`
`85`	`85`	`throw new ArgumentException("Parameter '{0}' not found in the collection".FormatInvariant(parameterName), nameof(parameterName));`
`86`	`86`	`return m_parameters[index];`
`87`	`87`	`}`
`88`	`88`
`89`		`- public override int IndexOf(object? value) => value is MySqlParameter parameter ? m_parameters.IndexOf(parameter) : -1;`
	`89`	`+ public override int IndexOf(object value) => value is MySqlParameter parameter ? m_parameters.IndexOf(parameter) : -1;`
`90`	`90`
`91`		`- public override int IndexOf(string? parameterName) => NormalizedIndexOf(parameterName);`
	`91`	`+ public override int IndexOf(string parameterName) => NormalizedIndexOf(parameterName);`
`92`	`92`
`93`	`93`	`// Finds the index of a parameter by name, regardless of whether 'parameterName' or the matching`
`94`	`94`	`// MySqlParameter.ParameterName has a leading '?' or '@'.`
`@@ -98,15 +98,15 @@ internal int NormalizedIndexOf(string? parameterName)`
`98`	`98`	`return m_nameToIndex.TryGetValue(normalizedName, out var index) ? index : -1;`
`99`	`99`	`}`
`100`	`100`
`101`		`- public override void Insert(int index, object? value) => m_parameters.Insert(index, (MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))));`
	`101`	`+ public override void Insert(int index, object value) => m_parameters.Insert(index, (MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))));`
`102`	`102`
`103`	`103`	`#if !NETSTANDARD1_3`
`104`	`104`	`public override bool IsFixedSize => false;`
`105`	`105`	`public override bool IsReadOnly => false;`
`106`	`106`	`public override bool IsSynchronized => false;`
`107`	`107`	`#endif`
`108`	`108`
`109`		`- public override void Remove(object? value) => RemoveAt(IndexOf(value ?? throw new ArgumentNullException(nameof(value))));`
	`109`	`+ public override void Remove(object value) => RemoveAt(IndexOf(value ?? throw new ArgumentNullException(nameof(value))));`
`110`	`110`
`111`	`111`	`public override void RemoveAt(int index)`
`112`	`112`	`{`
`@@ -122,9 +122,9 @@ public override void RemoveAt(int index)`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- public override void RemoveAt(string? parameterName) => RemoveAt(IndexOf(parameterName));`
	`125`	`+ public override void RemoveAt(string parameterName) => RemoveAt(IndexOf(parameterName));`
`126`	`126`
`127`		`- protected override void SetParameter(int index, DbParameter? value)`
	`127`	`+ protected override void SetParameter(int index, DbParameter value)`
`128`	`128`	`{`
`129`	`129`	`var newParameter = (MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value)));`
`130`	`130`	`var oldParameter = m_parameters[index];`
`@@ -135,7 +135,7 @@ protected override void SetParameter(int index, DbParameter? value)`
`135`	`135`	`m_nameToIndex.Add(newParameter.NormalizedParameterName, index);`
`136`	`136`	`}`
`137`	`137`
`138`		`- protected override void SetParameter(string? parameterName, DbParameter? value) => SetParameter(IndexOf(parameterName), value);`
	`138`	`+ protected override void SetParameter(string parameterName, DbParameter value) => SetParameter(IndexOf(parameterName), value);`
`139`	`139`
`140`	`140`	`public override int Count => m_parameters.Count;`
`141`	`141`
`@@ -147,7 +147,7 @@ protected override void SetParameter(int index, DbParameter? value)`
`147`	`147`	`set => SetParameter(index, value);`
`148`	`148`	`}`
`149`	`149`
`150`		`- public new MySqlParameter this[string? name]`
	`150`	`+ public new MySqlParameter this[string name]`
`151`	`151`	`{`
`152`	`152`	`get => (MySqlParameter) GetParameter(name);`
`153`	`153`	`set => SetParameter(name, value);`