Use target-typed new.

bgrainger · bgrainger · commit 488ef5bbe1ac · 2020-06-12T11:16:32.000-07:00
diff --git a/src/MySqlConnector/Authentication/AuthenticationPlugins.cs b/src/MySqlConnector/Authentication/AuthenticationPlugins.cs
@@ -30,7 +30,7 @@ internal static bool TryGetPlugin(string name, [NotNullWhen(true)] out IAuthenti
 				return s_plugins.TryGetValue(name, out plugin);
 		}
 
-		static readonly object s_lock = new object();
-		static readonly Dictionary<string, IAuthenticationPlugin> s_plugins = new Dictionary<string, IAuthenticationPlugin>();
+		static readonly object s_lock = new();
+		static readonly Dictionary<string, IAuthenticationPlugin> s_plugins = new();
 	}
 }
diff --git a/src/MySqlConnector/Core/CachedProcedure.cs b/src/MySqlConnector/Core/CachedProcedure.cs
@@ -87,7 +87,7 @@ FROM information_schema.parameters
 				while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
 				{
 					var dataType = ParseDataType(reader.GetString(3), out var unsigned, out var length);
-					parameters.Add(new CachedParameter(
+					parameters.Add(new(
 						reader.GetInt32(0),
 						!reader.IsDBNull(1) ? reader.GetString(1) : null,
 						!reader.IsDBNull(2) ? reader.GetString(2) : "",
diff --git a/src/MySqlConnector/Core/ConnectionPool.cs b/src/MySqlConnector/Core/ConnectionPool.cs
@@ -539,7 +539,7 @@ static ConnectionPool()
 #endif
 
 		static readonly IMySqlConnectorLogger Log = MySqlConnectorLogManager.CreateLogger(nameof(ConnectionPool));
-		static readonly ConcurrentDictionary<string, ConnectionPool?> s_pools = new ConcurrentDictionary<string, ConnectionPool?>();
+		static readonly ConcurrentDictionary<string, ConnectionPool?> s_pools = new();
 
 		static int s_poolId;
 		static ConnectionStringPool? s_mruCache;
diff --git a/src/MySqlConnector/Core/NormalizedSchema.cs b/src/MySqlConnector/Core/NormalizedSchema.cs
@@ -9,7 +9,7 @@ internal sealed class NormalizedSchema
 		private const string ReUnQuoted = @"([^\.`]+)";
 		private static readonly string ReEither = $@"(?:{ReQuoted}|{ReUnQuoted})";
 
-		private static readonly Regex NameRe = new Regex(
+		private static readonly Regex NameRe = new(
 			$@"^\s*{ReEither}\s*(?:\.\s*{ReEither}\s*)?$",
 			RegexOptions.Compiled);
 
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -192,7 +192,7 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can
 						var payloadLength = payload.Span.Length;
 						Utility.Resize(ref columnsAndParameters, columnsAndParametersSize + payloadLength);
 						payload.Span.CopyTo(columnsAndParameters.Array.AsSpan().Slice(columnsAndParametersSize));
-						parameters[i] = ColumnDefinitionPayload.Create(new ResizableArraySegment<byte>(columnsAndParameters, columnsAndParametersSize, payloadLength));
+						parameters[i] = ColumnDefinitionPayload.Create(new(columnsAndParameters, columnsAndParametersSize, payloadLength));
 						columnsAndParametersSize += payloadLength;
 					}
 					if (!SupportsDeprecateEof)
@@ -212,7 +212,7 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can
 						var payloadLength = payload.Span.Length;
 						Utility.Resize(ref columnsAndParameters, columnsAndParametersSize + payloadLength);
 						payload.Span.CopyTo(columnsAndParameters.Array.AsSpan().Slice(columnsAndParametersSize));
-						columns[i] = ColumnDefinitionPayload.Create(new ResizableArraySegment<byte>(columnsAndParameters, columnsAndParametersSize, payloadLength));
+						columns[i] = ColumnDefinitionPayload.Create(new(columnsAndParameters, columnsAndParametersSize, payloadLength));
 						columnsAndParametersSize += payloadLength;
 					}
 					if (!SupportsDeprecateEof)
@@ -222,11 +222,11 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can
 					}
 				}
 
-				preparedStatements.Add(new PreparedStatement(response.StatementId, statement, columns, parameters));
+				preparedStatements.Add(new(response.StatementId, statement, columns, parameters));
 			}
 
 			m_preparedStatements ??= new Dictionary<string, PreparedStatements>();
-			m_preparedStatements.Add(commandText, new PreparedStatements(preparedStatements, parsedStatements));
+			m_preparedStatements.Add(commandText, new(preparedStatements, parsedStatements));
 		}
 
 		public PreparedStatements? TryGetPreparedStatement(string commandText)
diff --git a/src/MySqlConnector/Core/TypeMapper.cs b/src/MySqlConnector/Core/TypeMapper.cs
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlBulkCopy.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlBulkCopy.cs
@@ -182,7 +182,7 @@ private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationTo
 						else if (addDefaultMappings)
 						{
 							Log.Debug("Adding default column mapping from SourceOrdinal {0} to DestinationColumn {1}", i, destinationColumn);
-							columnMappings.Add(new MySqlBulkCopyColumnMapping(i, destinationColumn));
+							columnMappings.Add(new(i, destinationColumn));
 						}
 					}
 				}
@@ -249,13 +249,13 @@ static void AddColumnMapping(List<MySqlBulkCopyColumnMapping> columnMappings, bo
 					{
 						Log.Debug("Setting expression to map SourceOrdinal {0} to DestinationColumn {1}", columnMapping.SourceOrdinal, destinationColumn);
 						columnMappings.Remove(columnMapping);
-						columnMappings.Add(new MySqlBulkCopyColumnMapping(columnMapping.SourceOrdinal, variableName, expression));
+						columnMappings.Add(new(columnMapping.SourceOrdinal, variableName, expression));
 					}
 				}
 				else if (addDefaultMappings)
 				{
 					Log.Debug("Adding default column mapping from SourceOrdinal {0} to DestinationColumn {1}", destinationOrdinal, destinationColumn);
-					columnMappings.Add(new MySqlBulkCopyColumnMapping(destinationOrdinal, variableName, expression));
+					columnMappings.Add(new(destinationOrdinal, variableName, expression));
 				}
 			}
 		}
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlBulkLoader.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlBulkLoader.cs
@@ -221,7 +221,7 @@ internal static bool TryGetAndRemoveSource(string sourceKey, [NotNullWhen(true)]
 
 		private static string GenerateSourceFileName() => SourcePrefix + Guid.NewGuid().ToString("N");
 
-		static readonly object s_lock = new object();
-		static readonly Dictionary<string, object> s_sources = new Dictionary<string, object>();
+		static readonly object s_lock = new();
+		static readonly Dictionary<string, object> s_sources = new();
 	}
 }
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlClientFactory.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlClientFactory.cs
@@ -4,7 +4,7 @@ namespace MySql.Data.MySqlClient
 {
 	public sealed class MySqlClientFactory : DbProviderFactory
 	{
-		public static readonly MySqlClientFactory Instance = new MySqlClientFactory();
+		public static readonly MySqlClientFactory Instance = new();
 
 		public override DbCommand CreateCommand() => new MySqlCommand();
 		public override DbConnection CreateConnection() => new MySqlConnection();
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs
@@ -698,7 +698,7 @@ internal void FinishQuerying(bool hasWarnings)
 				using (var reader = command.ExecuteReader())
 				{
 					while (reader.Read())
-						errors.Add(new MySqlError(reader.GetString(0), reader.GetInt32(1), reader.GetString(2)));
+						errors.Add(new(reader.GetString(0), reader.GetInt32(1), reader.GetString(2)));
 				}
 
 				InfoMessage(this, new MySqlInfoMessageEventArgs(errors.ToArray()));
@@ -920,12 +920,12 @@ private ConnectionSettings GetConnectionSettings() =>
 		private ConnectionSettings GetInitializedConnectionSettings() => m_connectionSettings!;
 
 		static readonly IMySqlConnectorLogger Log = MySqlConnectorLogManager.CreateLogger(nameof(MySqlConnection));
-		static readonly StateChangeEventArgs s_stateChangeClosedConnecting = new StateChangeEventArgs(ConnectionState.Closed, ConnectionState.Connecting);
-		static readonly StateChangeEventArgs s_stateChangeConnectingOpen = new StateChangeEventArgs(ConnectionState.Connecting, ConnectionState.Open);
-		static readonly StateChangeEventArgs s_stateChangeOpenClosed = new StateChangeEventArgs(ConnectionState.Open, ConnectionState.Closed);
+		static readonly StateChangeEventArgs s_stateChangeClosedConnecting = new(ConnectionState.Closed, ConnectionState.Connecting);
+		static readonly StateChangeEventArgs s_stateChangeConnectingOpen = new(ConnectionState.Connecting, ConnectionState.Open);
+		static readonly StateChangeEventArgs s_stateChangeOpenClosed = new(ConnectionState.Open, ConnectionState.Closed);
 #if !NETSTANDARD1_3
-		static readonly object s_lock = new object();
-		static readonly Dictionary<System.Transactions.Transaction, List<EnlistedTransactionBase>> s_transactionConnections = new Dictionary<System.Transactions.Transaction, List<EnlistedTransactionBase>>();
+		static readonly object s_lock = new();
+		static readonly Dictionary<System.Transactions.Transaction, List<EnlistedTransactionBase>> s_transactionConnections = new();
 #endif
 
 		string m_connectionString;
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameterCollection.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameterCollection.cs
@@ -19,7 +19,7 @@ internal MySqlParameterCollection()
 
 		public MySqlParameter Add(string parameterName, DbType dbType)
 		{
-			MySqlParameter parameter = new MySqlParameter
+			var parameter = new MySqlParameter
 			{
 				ParameterName = parameterName,
 				DbType = dbType,
@@ -40,8 +40,8 @@ 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(parameterName, mySqlDbType));
+		public MySqlParameter Add(string parameterName, MySqlDbType mySqlDbType, int size) => Add(new(parameterName, mySqlDbType, size));
 
 		public override void AddRange(Array values)
 		{
diff --git a/src/MySqlConnector/Protocol/Payloads/OkPayload.cs b/src/MySqlConnector/Protocol/Payloads/OkPayload.cs
@@ -86,7 +86,7 @@ private OkPayload(int affectedRowCount, ulong lastInsertId, ServerStatus serverS
 			NewSchema = newSchema;
 		}
 
-		static readonly OkPayload s_autoCommitOk = new OkPayload(0, 0, ServerStatus.AutoCommit, 0, null);
-		static readonly OkPayload s_autoCommitSessionStateChangedOk = new OkPayload(0, 0, ServerStatus.AutoCommit | ServerStatus.SessionStateChanged, 0, null);
+		static readonly OkPayload s_autoCommitOk = new(0, 0, ServerStatus.AutoCommit, 0, null);
+		static readonly OkPayload s_autoCommitSessionStateChangedOk = new(0, 0, ServerStatus.AutoCommit | ServerStatus.SessionStateChanged, 0, null);
 	}
 }
diff --git a/src/MySqlConnector/Utilities/TimerQueue.cs b/src/MySqlConnector/Utilities/TimerQueue.cs
@@ -29,7 +29,7 @@ public uint Add(int delay, Action action)
 				while (index > 0 && delay < unchecked(m_timeoutActions[index - 1].Time - current))
 					index--;
 				var absolute = unchecked(current + delay);
-				m_timeoutActions.Insert(index, new Data(id, absolute, action));
+				m_timeoutActions.Insert(index, new(id, absolute, action));
 
 				if (!m_isTimerEnabled || (index == 0 && unchecked(m_nextTimerTick - current) > delay))
 					UnsafeSetTimer(delay);
diff --git a/tests/MySqlConnector.Tests/MySqlDateTimeTests.cs b/tests/MySqlConnector.Tests/MySqlDateTimeTests.cs
@@ -142,7 +142,7 @@ public void InvalidDateTimeConvertibleToString()
 		}
 #endif
 
-		static readonly MySqlDateTime s_mySqlDateTime = new MySqlDateTime(2018, 6, 9, 12, 34, 56, 123456);
+		static readonly MySqlDateTime s_mySqlDateTime = new(2018, 6, 9, 12, 34, 56, 123456);
 		static readonly DateTime s_dateTime = new DateTime(2018, 6, 9, 12, 34, 56, 123).AddTicks(4560);
 	}
 }
diff --git a/tests/MySqlConnector.Tests/StatementPreparerTests.cs b/tests/MySqlConnector.Tests/StatementPreparerTests.cs
@@ -136,7 +136,7 @@ public void Bug589(string sql)
 		[MemberData(nameof(FormatParameterData))]
 		public void FormatParameter(object parameterValue, string replacedValue, bool noBackslashEscapes = false)
 		{
-			var parameters = new MySqlParameterCollection { new MySqlParameter("@param", parameterValue) };
+			var parameters = new MySqlParameterCollection { new("@param", parameterValue) };
 			const string sql = "SELECT @param;";
 			var options = noBackslashEscapes ? StatementPreparerOptions.NoBackslashEscapes : StatementPreparerOptions.None;
 			var parsedSql = GetParsedSql(sql, parameters, options);
@@ -183,7 +183,7 @@ public void FormatParameter(object parameterValue, string replacedValue, bool no
 		[InlineData(StatementPreparerOptions.GuidFormatLittleEndianBinary16, "_binary'dcbafehgijklmnop'")]
 		public void GuidFormat(object options, string replacedValue)
 		{
-			var parameters = new MySqlParameterCollection { new MySqlParameter("@param", new Guid("61626364-6566-6768-696a-6b6c6d6e6f70")) };
+			var parameters = new MySqlParameterCollection { new("@param", new Guid("61626364-6566-6768-696a-6b6c6d6e6f70")) };
 			const string sql = "SELECT @param;";
 			var parsedSql = GetParsedSql(sql, parameters, (StatementPreparerOptions) options);
 			Assert.Equal(sql.Replace("@param", replacedValue), parsedSql);
@@ -206,7 +206,7 @@ public void GuidFormat(object options, string replacedValue)
 		[InlineData("SELECT * FROM test WHERE id = ?", "SELECT * FROM test WHERE id = 0;", true)]
 		public void CompleteStatements(string sql, string expectedSql, bool expectedComplete)
 		{
-			var parameters = new MySqlParameterCollection { new MySqlParameter { Value = 0 } };
+			var parameters = new MySqlParameterCollection { new() { Value = 0 } };
 			var preparer = new StatementPreparer(sql, parameters, new StatementPreparerOptions());
 			var writer = new ByteBufferWriter();
 			var isComplete = preparer.ParseAndBindParameters(writer);
@@ -238,10 +238,10 @@ public void SplitStatement(string sql, string[] expectedStatements, string expec
 			// make some dummy parameters available to the test input
 			var parameters = new MySqlParameterCollection
 			{
-				new MySqlParameter("@zero", 0),
-				new MySqlParameter("@one", 0),
-				new MySqlParameter("@two", 0),
-				new MySqlParameter("@three", 0),
+				new("@zero", 0),
+				new("@one", 0),
+				new("@two", 0),
+				new("@three", 0),
 			};
 
 			var preparer = new StatementPreparer(sql, parameters, StatementPreparerOptions.None);
diff --git a/tests/SideBySide/BatchTests.cs b/tests/SideBySide/BatchTests.cs
@@ -19,7 +19,7 @@ public void NeedsConnection()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1;"),
+					new("SELECT 1;"),
 				},
 			};
 			Assert.Throws<InvalidOperationException>(() => batch.ExecuteNonQuery());
@@ -33,7 +33,7 @@ public void NeedsOpenConnection()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1;"),
+					new("SELECT 1;"),
 				},
 			};
 			Assert.Throws<InvalidOperationException>(() => batch.ExecuteNonQuery());
@@ -67,7 +67,7 @@ public void NeedsCommandsWithCommandText()
 			connection.Open();
 			using var batch = new MySqlBatch(connection)
 			{
-				BatchCommands = { new MySqlBatchCommand() },
+				BatchCommands = { new() },
 			};
 			Assert.Throws<InvalidOperationException>(() => batch.ExecuteNonQuery());
 		}
@@ -89,7 +89,7 @@ public void NoCloseConnection()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1;") { CommandBehavior = CommandBehavior.CloseConnection },
+					new("SELECT 1;") { CommandBehavior = CommandBehavior.CloseConnection },
 				},
 			};
 			Assert.Throws<NotSupportedException>(() => batch.ExecuteNonQuery());
@@ -112,7 +112,7 @@ public void BatchTransactionMustBeSet()
 			connection.Open();
 			using var transaction = connection.BeginTransaction();
 			using var batch = connection.CreateBatch();
-			batch.BatchCommands.Add(new MySqlBatchCommand("SELECT 1;"));
+			batch.BatchCommands.Add(new("SELECT 1;"));
 			Assert.Throws<InvalidOperationException>(() => batch.ExecuteScalar());
 
 			batch.Transaction = transaction;
@@ -126,7 +126,7 @@ public void IgnoreBatchTransactionIgnoresNull()
 			connection.Open();
 			using var transaction = connection.BeginTransaction();
 			using var batch = connection.CreateBatch();
-			batch.BatchCommands.Add(new MySqlBatchCommand("SELECT 1;"));
+			batch.BatchCommands.Add(new("SELECT 1;"));
 			TestUtilities.AssertIsOne(batch.ExecuteScalar());
 		}
 
@@ -141,7 +141,7 @@ public void IgnoreCommandTransactionIgnoresDisposedTransaction()
 			transaction.Dispose();
 
 			using var batch = connection.CreateBatch();
-			batch.BatchCommands.Add(new MySqlBatchCommand("SELECT 1;"));
+			batch.BatchCommands.Add(new("SELECT 1;"));
 			batch.Transaction = transaction;
 			TestUtilities.AssertIsOne(batch.ExecuteScalar());
 		}
@@ -156,7 +156,7 @@ public void IgnoreCommandTransactionIgnoresDifferentTransaction()
 			using var transaction1 = connection1.BeginTransaction();
 			using var batch2 = connection2.CreateBatch();
 			batch2.Transaction = transaction1;
-			batch2.BatchCommands.Add(new MySqlBatchCommand("SELECT 1;"));
+			batch2.BatchCommands.Add(new("SELECT 1;"));
 			TestUtilities.AssertIsOne(batch2.ExecuteScalar());
 		}
 
@@ -176,9 +176,9 @@ public void ExecuteBatch(string suffix)
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1" + suffix),
-					new MySqlBatchCommand("SELECT 2" + suffix),
-					new MySqlBatchCommand("SELECT 3" + suffix),
+					new("SELECT 1" + suffix),
+					new("SELECT 2" + suffix),
+					new("SELECT 3" + suffix),
 				},
 			};
 			using var reader = batch.ExecuteReader();
@@ -211,9 +211,9 @@ public void ExecuteInvalidSqlBatch()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1;"),
-					new MySqlBatchCommand("SELECT 2 /* incomplete"),
-					new MySqlBatchCommand("SELECT 3;"),
+					new("SELECT 1;"),
+					new("SELECT 2 /* incomplete"),
+					new("SELECT 3;"),
 				},
 			};
 			using var reader = batch.ExecuteReader();
@@ -248,8 +248,8 @@ public void SingleRow()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT id FROM batch_single_row ORDER BY id"),
-					new MySqlBatchCommand("SELECT id FROM batch_single_row ORDER BY id") { CommandBehavior = CommandBehavior.SingleRow },
+					new("SELECT id FROM batch_single_row ORDER BY id"),
+					new("SELECT id FROM batch_single_row ORDER BY id") { CommandBehavior = CommandBehavior.SingleRow },
 				},
 			};
 			using var reader = batch.ExecuteReader();
@@ -276,7 +276,7 @@ public void PrepareNeedsConnection()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1;"),
+					new("SELECT 1;"),
 				},
 			};
 			Assert.Throws<InvalidOperationException>(() => batch.Prepare());
@@ -290,7 +290,7 @@ public void PrepareNeedsOpenConnection()
 			{
 				BatchCommands =
 				{
-					new MySqlBatchCommand("SELECT 1;"),
+					new("SELECT 1;"),
 				},
 			};
 			Assert.Throws<InvalidOperationException>(() => batch.Prepare());
@@ -324,7 +324,7 @@ public void PrepareNeedsCommandsWithText()
 			connection.Open();
 			using var batch = new MySqlBatch(connection)
 			{
-				BatchCommands = { new MySqlBatchCommand() },
+				BatchCommands = { new() },
 			};
 			Assert.Throws<InvalidOperationException>(() => batch.Prepare());
 		}
diff --git a/tests/SideBySide/CancelTests.cs b/tests/SideBySide/CancelTests.cs
@@ -600,15 +600,15 @@ value varchar(45)
 
 			using (var batch = m_database.Connection.CreateBatch())
 			{
-				batch.BatchCommands.Add(new MySqlBatchCommand(@"insert into cancel_completed_command (id, value) values (1, null);"));
+				batch.BatchCommands.Add(new(@"insert into cancel_completed_command (id, value) values (1, null);"));
 
 				using (await batch.ExecuteReaderAsync().ConfigureAwait(false))
 					batch.Cancel();
 			}
 
 			using (var batch = m_database.Connection.CreateBatch())
 			{
-				batch.BatchCommands.Add(new MySqlBatchCommand(@"update cancel_completed_command SET value = ""value"" where id = 1;"));
+				batch.BatchCommands.Add(new(@"update cancel_completed_command SET value = ""value"" where id = 1;"));
 
 				await batch.ExecuteNonQueryAsync().ConfigureAwait(false);
 			}
diff --git a/tests/SideBySide/CommandTests.cs b/tests/SideBySide/CommandTests.cs
@@ -232,7 +232,7 @@ public void ThrowsIfTooManyUnnamedParametersUsed()
 			using var connection = new MySqlConnection(AppConfig.ConnectionString);
 			connection.Open();
 			using var cmd = new MySqlCommand("SELECT ?, ?;", connection);
-			cmd.Parameters.Add(new MySqlParameter { Value = 1 });
+			cmd.Parameters.Add(new() { Value = 1 });
 #if BASELINE
 			Assert.Throws<IndexOutOfRangeException>(() => cmd.ExecuteScalar());
 #else
diff --git a/tests/SideBySide/DataAdapterTests.cs b/tests/SideBySide/DataAdapterTests.cs
diff --git a/tests/SideBySide/DataTypes.cs b/tests/SideBySide/DataTypes.cs
diff --git a/tests/SideBySide/InsertTests.cs b/tests/SideBySide/InsertTests.cs
diff --git a/tests/SideBySide/ParameterCollection.cs b/tests/SideBySide/ParameterCollection.cs
diff --git a/tests/SideBySide/PreparedCommandTests.cs b/tests/SideBySide/PreparedCommandTests.cs
diff --git a/tests/SideBySide/QueryTests.cs b/tests/SideBySide/QueryTests.cs
diff --git a/tests/SideBySide/StoredProcedureTests.cs b/tests/SideBySide/StoredProcedureTests.cs

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ internal static bool TryGetPlugin(string name, [NotNullWhen(true)] out IAuthenti`
`30`	`30`	`return s_plugins.TryGetValue(name, out plugin);`
`31`	`31`	`}`
`32`	`32`
`33`		`- static readonly object s_lock = new object();`
`34`		`- static readonly Dictionary<string, IAuthenticationPlugin> s_plugins = new Dictionary<string, IAuthenticationPlugin>();`
	`33`	`+ static readonly object s_lock = new();`
	`34`	`+ static readonly Dictionary<string, IAuthenticationPlugin> s_plugins = new();`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ FROM information_schema.parameters`
`87`	`87`	`while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))`
`88`	`88`	`{`
`89`	`89`	`var dataType = ParseDataType(reader.GetString(3), out var unsigned, out var length);`
`90`		`- parameters.Add(new CachedParameter(`
	`90`	`+ parameters.Add(new(`
`91`	`91`	`reader.GetInt32(0),`
`92`	`92`	`!reader.IsDBNull(1) ? reader.GetString(1) : null,`
`93`	`93`	`!reader.IsDBNull(2) ? reader.GetString(2) : "",`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can`
`192`	`192`	`var payloadLength = payload.Span.Length;`
`193`	`193`	`Utility.Resize(ref columnsAndParameters, columnsAndParametersSize + payloadLength);`
`194`	`194`	`payload.Span.CopyTo(columnsAndParameters.Array.AsSpan().Slice(columnsAndParametersSize));`
`195`		`- parameters[i] = ColumnDefinitionPayload.Create(new ResizableArraySegment<byte>(columnsAndParameters, columnsAndParametersSize, payloadLength));`
	`195`	`+ parameters[i] = ColumnDefinitionPayload.Create(new(columnsAndParameters, columnsAndParametersSize, payloadLength));`
`196`	`196`	`columnsAndParametersSize += payloadLength;`
`197`	`197`	`}`
`198`	`198`	`if (!SupportsDeprecateEof)`
`@@ -212,7 +212,7 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can`
`212`	`212`	`var payloadLength = payload.Span.Length;`
`213`	`213`	`Utility.Resize(ref columnsAndParameters, columnsAndParametersSize + payloadLength);`
`214`	`214`	`payload.Span.CopyTo(columnsAndParameters.Array.AsSpan().Slice(columnsAndParametersSize));`
`215`		`- columns[i] = ColumnDefinitionPayload.Create(new ResizableArraySegment<byte>(columnsAndParameters, columnsAndParametersSize, payloadLength));`
	`215`	`+ columns[i] = ColumnDefinitionPayload.Create(new(columnsAndParameters, columnsAndParametersSize, payloadLength));`
`216`	`216`	`columnsAndParametersSize += payloadLength;`
`217`	`217`	`}`
`218`	`218`	`if (!SupportsDeprecateEof)`
`@@ -222,11 +222,11 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`225`		`- preparedStatements.Add(new PreparedStatement(response.StatementId, statement, columns, parameters));`
	`225`	`+ preparedStatements.Add(new(response.StatementId, statement, columns, parameters));`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`m_preparedStatements ??= new Dictionary<string, PreparedStatements>();`
`229`		`- m_preparedStatements.Add(commandText, new PreparedStatements(preparedStatements, parsedStatements));`
	`229`	`+ m_preparedStatements.Add(commandText, new(preparedStatements, parsedStatements));`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`public PreparedStatements? TryGetPreparedStatement(string commandText)`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationTo`
`182`	`182`	`else if (addDefaultMappings)`
`183`	`183`	`{`
`184`	`184`	`Log.Debug("Adding default column mapping from SourceOrdinal {0} to DestinationColumn {1}", i, destinationColumn);`
`185`		`- columnMappings.Add(new MySqlBulkCopyColumnMapping(i, destinationColumn));`
	`185`	`+ columnMappings.Add(new(i, destinationColumn));`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`}`
`@@ -249,13 +249,13 @@ static void AddColumnMapping(List<MySqlBulkCopyColumnMapping> columnMappings, bo`
`249`	`249`	`{`
`250`	`250`	`Log.Debug("Setting expression to map SourceOrdinal {0} to DestinationColumn {1}", columnMapping.SourceOrdinal, destinationColumn);`
`251`	`251`	`columnMappings.Remove(columnMapping);`
`252`		`- columnMappings.Add(new MySqlBulkCopyColumnMapping(columnMapping.SourceOrdinal, variableName, expression));`
	`252`	`+ columnMappings.Add(new(columnMapping.SourceOrdinal, variableName, expression));`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`else if (addDefaultMappings)`
`256`	`256`	`{`
`257`	`257`	`Log.Debug("Adding default column mapping from SourceOrdinal {0} to DestinationColumn {1}", destinationOrdinal, destinationColumn);`
`258`		`- columnMappings.Add(new MySqlBulkCopyColumnMapping(destinationOrdinal, variableName, expression));`
	`258`	`+ columnMappings.Add(new(destinationOrdinal, variableName, expression));`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ internal static bool TryGetAndRemoveSource(string sourceKey, [NotNullWhen(true)]`
`221`	`221`
`222`	`222`	`private static string GenerateSourceFileName() => SourcePrefix + Guid.NewGuid().ToString("N");`
`223`	`223`
`224`		`- static readonly object s_lock = new object();`
`225`		`- static readonly Dictionary<string, object> s_sources = new Dictionary<string, object>();`
	`224`	`+ static readonly object s_lock = new();`
	`225`	`+ static readonly Dictionary<string, object> s_sources = new();`
`226`	`226`	`}`
`227`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace MySql.Data.MySqlClient`
`4`	`4`	`{`
`5`	`5`	`public sealed class MySqlClientFactory : DbProviderFactory`
`6`	`6`	`{`
`7`		`- public static readonly MySqlClientFactory Instance = new MySqlClientFactory();`
	`7`	`+ public static readonly MySqlClientFactory Instance = new();`
`8`	`8`
`9`	`9`	`public override DbCommand CreateCommand() => new MySqlCommand();`
`10`	`10`	`public override DbConnection CreateConnection() => new MySqlConnection();`