Use C# 9 pattern matching.

bgrainger · bgrainger · commit a3b5c799a570 · 2020-11-18T01:10:55.000-08:00
diff --git a/src/MySqlConnector/Core/BinaryRow.cs b/src/MySqlConnector/Core/BinaryRow.cs
@@ -115,7 +115,7 @@ protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinition
 				if (columnDefinition.CharacterSet == CharacterSet.Binary)
 				{
 					var guidFormat = Connection.GuidFormat;
-					if ((guidFormat == MySqlGuidFormat.Binary16 || guidFormat == MySqlGuidFormat.TimeSwapBinary16 || guidFormat == MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)
+					if ((guidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)
 						return CreateGuidFromBytes(guidFormat, data);
 
 					return data.ToArray();
diff --git a/src/MySqlConnector/Core/CommandExecutor.cs b/src/MySqlConnector/Core/CommandExecutor.cs
@@ -64,7 +64,7 @@ public static async Task<MySqlDataReader> ExecuteReaderAsync(IReadOnlyList<IMySq
 				Log.Warn("Session{0} query was interrupted", connection.Session.Id);
 				throw new OperationCanceledException(ex. Message, ex, cancellationToken);
 			}
-			catch (Exception ex) when (payload.Span.Length > 4_194_304 && (ex is SocketException || ex is IOException || ex is MySqlProtocolException))
+			catch (Exception ex) when (payload.Span.Length > 4_194_304 && (ex is SocketException or IOException or MySqlProtocolException))
 			{
 				// the default MySQL Server value for max_allowed_packet (in MySQL 5.7) is 4MiB: https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_max_allowed_packet
 				// use "decimal megabytes" (to round up) when creating the exception message
diff --git a/src/MySqlConnector/Core/ResultSet.cs b/src/MySqlConnector/Core/ResultSet.cs
@@ -182,7 +182,7 @@ private bool IsHostVerified(MySqlConnection connection)
 
 		public async Task ReadEntireAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{
-			while (State == ResultSetState.ReadingRows || State == ResultSetState.ReadResultSetHeader)
+			while (State is ResultSetState.ReadingRows or ResultSetState.ReadResultSetHeader)
 				await ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 		}
 
@@ -227,7 +227,7 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance
 		private ValueTask<Row?> ScanRowAsync(IOBehavior ioBehavior, Row? row, CancellationToken cancellationToken)
 		{
 			// if we've already read past the end of this resultset, Read returns false
-			if (BufferState == ResultSetState.HasMoreData || BufferState == ResultSetState.NoMoreData || BufferState == ResultSetState.None)
+			if (BufferState is ResultSetState.HasMoreData or ResultSetState.NoMoreData or ResultSetState.None)
 				return new ValueTask<Row?>(default(Row?));
 
 			using var registration = Command.CancellableCommand.RegisterCancel(cancellationToken); // lgtm[cs/useless-assignment-to-local]
diff --git a/src/MySqlConnector/Core/Row.cs b/src/MySqlConnector/Core/Row.cs
@@ -211,17 +211,13 @@ public int GetInt32(int ordinal)
 				throw new InvalidCastException();
 
 			var columnDefinition = ResultSet.ColumnDefinitions[ordinal];
-			if (columnDefinition.ColumnType == ColumnType.Decimal || columnDefinition.ColumnType == ColumnType.NewDecimal)
+			if (columnDefinition.ColumnType is ColumnType.Decimal or ColumnType.NewDecimal)
 			{
 				return (int) (decimal) GetValue(ordinal);
 			}
-			else if (columnDefinition.ColumnType != ColumnType.Tiny &&
-				columnDefinition.ColumnType != ColumnType.Short &&
-				columnDefinition.ColumnType != ColumnType.Int24 &&
-				columnDefinition.ColumnType != ColumnType.Long &&
-				columnDefinition.ColumnType != ColumnType.Longlong &&
-				columnDefinition.ColumnType != ColumnType.Bit &&
-				columnDefinition.ColumnType != ColumnType.Year)
+			else if (columnDefinition.ColumnType is not ColumnType.Tiny and not ColumnType.Short
+				and not ColumnType.Int24 and not ColumnType.Long and not ColumnType.Longlong
+				and not ColumnType.Bit and not ColumnType.Year)
 			{
 				throw new InvalidCastException("Can't convert {0} to Int32".FormatInvariant(ResultSet.ColumnTypes![ordinal]));
 			}
diff --git a/src/MySqlConnector/Core/SchemaProvider.cs b/src/MySqlConnector/Core/SchemaProvider.cs
@@ -254,32 +254,31 @@ private Task FillDataTypes(IOBehavior ioBehavior, DataTable dataTable, Cancellat
 			foreach (var columnType in TypeMapper.Instance.GetColumnTypeMetadata())
 			{
 				// hard-code a few types to not appear in the schema table
-				var mySqlDbType = columnType.MySqlDbType;
-				if (mySqlDbType == MySqlDbType.Decimal || mySqlDbType == MySqlDbType.Newdate || mySqlDbType == MySqlDbType.Null || mySqlDbType == MySqlDbType.VarString)
+				if (columnType.MySqlDbType is MySqlDbType.Decimal or MySqlDbType.Newdate or MySqlDbType.Null or MySqlDbType.VarString)
 					continue;
-				if (mySqlDbType == MySqlDbType.Bool && columnType.IsUnsigned)
+				if (columnType is { MySqlDbType: MySqlDbType.Bool, IsUnsigned: true })
 					continue;
 
 				// set miscellaneous properties in code (rather than being data-driven)
 				var clrType = columnType.DbTypeMapping.ClrType;
 				var clrTypeName = clrType.ToString();
+				var mySqlDbType = columnType.MySqlDbType;
 				var dataTypeName = mySqlDbType == MySqlDbType.Guid ? "GUID" :
 					mySqlDbType == MySqlDbType.Bool ? "BOOL" : columnType.DataTypeName;
-				var isAutoIncrementable = mySqlDbType == MySqlDbType.Byte || mySqlDbType == MySqlDbType.Int16 || mySqlDbType == MySqlDbType.Int24 || mySqlDbType == MySqlDbType.Int32 || mySqlDbType == MySqlDbType.Int64 ||
-					mySqlDbType == MySqlDbType.UByte || mySqlDbType == MySqlDbType.UInt16 || mySqlDbType == MySqlDbType.UInt24 || mySqlDbType == MySqlDbType.UInt32 || mySqlDbType == MySqlDbType.UInt64;
+				var isAutoIncrementable = mySqlDbType is MySqlDbType.Byte or MySqlDbType.Int16 or MySqlDbType.Int24 or MySqlDbType.Int32 or MySqlDbType.Int64
+					or MySqlDbType.UByte or MySqlDbType.UInt16 or MySqlDbType.UInt24 or MySqlDbType.UInt32 or MySqlDbType.UInt64;
 				var isBestMatch = clrTypes.Add(clrTypeName);
 				var isFixedLength = isAutoIncrementable ||
-					mySqlDbType == MySqlDbType.Date || mySqlDbType == MySqlDbType.DateTime || mySqlDbType == MySqlDbType.Time || mySqlDbType == MySqlDbType.Timestamp ||
-					mySqlDbType == MySqlDbType.Double || mySqlDbType == MySqlDbType.Float || mySqlDbType == MySqlDbType.Year || mySqlDbType == MySqlDbType.Guid || mySqlDbType == MySqlDbType.Bool;
-				var isFixedPrecisionScale = isFixedLength ||
-					mySqlDbType == MySqlDbType.Bit || mySqlDbType == MySqlDbType.NewDecimal;
-				var isLong = mySqlDbType == MySqlDbType.Blob || mySqlDbType == MySqlDbType.MediumBlob || mySqlDbType == MySqlDbType.LongBlob;
+					mySqlDbType is MySqlDbType.Date or MySqlDbType.DateTime or MySqlDbType.Time or MySqlDbType.Timestamp
+					or MySqlDbType.Double or MySqlDbType.Float or MySqlDbType.Year or MySqlDbType.Guid or MySqlDbType.Bool;
+				var isFixedPrecisionScale = isFixedLength || mySqlDbType is MySqlDbType.Bit or MySqlDbType.NewDecimal;
+				var isLong = mySqlDbType is MySqlDbType.Blob or MySqlDbType.MediumBlob or MySqlDbType.LongBlob;
 
 				// map ColumnTypeMetadata to the row for this data type
 				var createFormatParts = columnType.CreateFormat.Split(';');
 				dataTable.Rows.Add(
 					dataTypeName,
-					(int)mySqlDbType,
+					(int) mySqlDbType,
 					columnType.ColumnSize,
 					createFormatParts[0],
 					createFormatParts.Length == 1 ? null : createFormatParts[1],
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -246,7 +246,7 @@ public void StartQuerying(ICancellableCommand command)
 		{
 			lock (m_lock)
 			{
-				if (m_state == State.Querying || m_state == State.CancelingQuery)
+				if (m_state is State.Querying or State.CancelingQuery)
 				{
 					m_logArguments[1] = m_state;
 					Log.Error("Session{0} can't execute new command when in SessionState: {1}", m_logArguments[0], m_state);
@@ -289,7 +289,7 @@ public void FinishQuerying()
 
 			lock (m_lock)
 			{
-				if (m_state == State.Querying || m_state == State.ClearingPendingCancellation)
+				if (m_state is State.Querying or State.ClearingPendingCancellation)
 					m_state = State.Connected;
 				else
 					VerifyState(State.Failed);
@@ -307,7 +307,7 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella
 				State state;
 				lock (m_lock)
 				{
-					if (m_state == State.Connected || m_state == State.Failed)
+					if (m_state is State.Connected or State.Failed)
 						m_state = State.Closing;
 					state = m_state;
 				}
@@ -1099,7 +1099,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 					}
 					else
 					{
-						var requireValid = cs.SslMode == MySqlSslMode.VerifyCA || cs.SslMode == MySqlSslMode.VerifyFull;
+						var requireValid = cs.SslMode is MySqlSslMode.VerifyCA or MySqlSslMode.VerifyFull;
 						var foundCertificates = store.Certificates.Find(X509FindType.FindByThumbprint, cs.CertificateThumbprint, requireValid);
 						if (foundCertificates.Count == 0)
 						{
@@ -1290,7 +1290,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 
 			bool ValidateRemoteCertificate(object rcbSender, X509Certificate? rcbCertificate, X509Chain? rcbChain, SslPolicyErrors rcbPolicyErrors)
 			{
-				if (cs.SslMode == MySqlSslMode.Preferred || cs.SslMode == MySqlSslMode.Required)
+				if (cs.SslMode is MySqlSslMode.Preferred or MySqlSslMode.Required)
 					return true;
 
 				if ((rcbPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) != 0 && caCertificateChain is not null && rcbCertificate is not null)
@@ -1412,7 +1412,7 @@ internal sealed class SslClientAuthenticationOptions
 		private bool ShouldGetRealServerDetails(ConnectionSettings cs)
 		{
 			// currently hardcoded to the version(s) returned by the Azure Database for MySQL proxy
-			if (ServerVersion.OriginalString == "5.6.42.0" || ServerVersion.OriginalString == "5.6.39.0" || ServerVersion.OriginalString == "5.6.26.0")
+			if (ServerVersion.OriginalString is "5.6.42.0" or "5.6.39.0" or "5.6.26.0")
 				return true;
 
 			// detect Azure Database for MySQL DNS suffixes
diff --git a/src/MySqlConnector/Core/SqlParser.cs b/src/MySqlConnector/Core/SqlParser.cs
@@ -270,7 +270,7 @@ public void Parse(string sql)
 				states |= FinalParseStates.NeedsNewline;
 				state = beforeCommentState;
 			}
-			else if (state == State.SingleQuotedStringSingleQuote || state == State.DoubleQuotedStringDoubleQuote || state == State.BacktickQuotedStringBacktick)
+			else if (state is State.SingleQuotedStringSingleQuote or State.DoubleQuotedStringDoubleQuote or State.BacktickQuotedStringBacktick)
 			{
 				state = State.Statement;
 			}
@@ -334,9 +334,9 @@ protected enum FinalParseStates
 			NeedsSemicolon = 4,
 		}
 
-		private static bool IsWhitespace(char ch) => ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n';
+		private static bool IsWhitespace(char ch) => ch is ' ' or '\t' or '\r' or '\n';
 
-		private static bool IsVariableName(char ch) => (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '.' || ch == '_' || ch == '$' || (ch >= 0x0080 && ch <= 0xFFFF); // lgtm[cs/constant-comparison]
+		private static bool IsVariableName(char ch) => ch is (>= 'a' and <= 'z') or (>= 'A' and <= 'Z') or (>= '0' and <= '9') or '.' or '_'  or '$' or (>= (char) 0x0080 and <= (char) 0xFFFF);
 
 		private enum State
 		{
diff --git a/src/MySqlConnector/Core/TextRow.cs b/src/MySqlConnector/Core/TextRow.cs
@@ -71,7 +71,7 @@ protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinition
 				if (columnDefinition.CharacterSet == CharacterSet.Binary)
 				{
 					var guidFormat = Connection.GuidFormat;
-					if ((guidFormat == MySqlGuidFormat.Binary16 || guidFormat == MySqlGuidFormat.TimeSwapBinary16 || guidFormat == MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)
+					if ((guidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)
 						return CreateGuidFromBytes(guidFormat, data);
 
 					return data.ToArray();
diff --git a/src/MySqlConnector/Core/TypeMapper.cs b/src/MySqlConnector/Core/TypeMapper.cs
@@ -216,22 +216,28 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 				var type = columnDefinition.ColumnType;
 				if (columnDefinition.CharacterSet == CharacterSet.Binary)
 				{
-					if ((guidFormat == MySqlGuidFormat.Binary16 || guidFormat == MySqlGuidFormat.TimeSwapBinary16 || guidFormat == MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)
+					if ((guidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)
 						return MySqlDbType.Guid;
 
-					return type == ColumnType.String ? MySqlDbType.Binary :
-						type == ColumnType.VarString ? MySqlDbType.VarBinary :
-						type == ColumnType.TinyBlob ? MySqlDbType.TinyBlob :
-						type == ColumnType.Blob ? MySqlDbType.Blob :
-						type == ColumnType.MediumBlob ? MySqlDbType.MediumBlob :
-						MySqlDbType.LongBlob;
+					return type switch
+					{
+						ColumnType.String => MySqlDbType.Binary,
+						ColumnType.VarString => MySqlDbType.VarBinary,
+						ColumnType.TinyBlob => MySqlDbType.TinyBlob,
+						ColumnType.Blob => MySqlDbType.Blob,
+						ColumnType.MediumBlob => MySqlDbType.MediumBlob,
+						_ => MySqlDbType.LongBlob,
+					};
 				}
-				return type == ColumnType.String ? MySqlDbType.String :
-					type == ColumnType.VarString ? MySqlDbType.VarChar :
-					type == ColumnType.TinyBlob ? MySqlDbType.TinyText :
-					type == ColumnType.Blob ? MySqlDbType.Text :
-					type == ColumnType.MediumBlob ? MySqlDbType.MediumText :
-					MySqlDbType.LongText;
+				return type switch
+				{
+					ColumnType.String => MySqlDbType.String,
+					ColumnType.VarString => MySqlDbType.VarChar,
+					ColumnType.TinyBlob => MySqlDbType.TinyText,
+					ColumnType.Blob => MySqlDbType.Text,
+					ColumnType.MediumBlob => MySqlDbType.MediumText,
+					_ => MySqlDbType.LongText,
+				};
 
 			case ColumnType.Json:
 				return MySqlDbType.JSON;
@@ -285,8 +291,7 @@ public static MySqlDbType ConvertToMySqlDbType(ColumnDefinitionPayload columnDef
 
 		public static ushort ConvertToColumnTypeAndFlags(MySqlDbType dbType, MySqlGuidFormat guidFormat)
 		{
-			var isUnsigned = dbType == MySqlDbType.UByte || dbType == MySqlDbType.UInt16 ||
-				dbType == MySqlDbType.UInt24 || dbType == MySqlDbType.UInt32 || dbType == MySqlDbType.UInt64;
+			var isUnsigned = dbType is MySqlDbType.UByte or MySqlDbType.UInt16 or MySqlDbType.UInt24 or MySqlDbType.UInt32 or MySqlDbType.UInt64;
 			var columnType = dbType switch
 			{
 				MySqlDbType.Bool or MySqlDbType.Byte or MySqlDbType.UByte => ColumnType.Tiny,
@@ -295,7 +300,7 @@ public static ushort ConvertToColumnTypeAndFlags(MySqlDbType dbType, MySqlGuidFo
 				MySqlDbType.Int32 or MySqlDbType.UInt32 => ColumnType.Long,
 				MySqlDbType.Int64 or MySqlDbType.UInt64 => ColumnType.Longlong,
 				MySqlDbType.Bit => ColumnType.Bit,
-				MySqlDbType.Guid => (guidFormat == MySqlGuidFormat.Char36 || guidFormat == MySqlGuidFormat.Char32) ? ColumnType.String : ColumnType.Blob,
+				MySqlDbType.Guid => (guidFormat is MySqlGuidFormat.Char36 or MySqlGuidFormat.Char32) ? ColumnType.String : ColumnType.Blob,
 				MySqlDbType.Enum or MySqlDbType.Set => ColumnType.String,
 				MySqlDbType.Binary or MySqlDbType.String => ColumnType.String,
 				MySqlDbType.VarBinary or MySqlDbType.VarChar or MySqlDbType.VarString => ColumnType.VarString,
diff --git a/src/MySqlConnector/MySqlBulkCopy.cs b/src/MySqlConnector/MySqlBulkCopy.cs
@@ -265,7 +265,7 @@ private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationTo
 					else
 					{
 						var type = schema[i].DataType;
-						if (type == typeof(byte[]) || (type == typeof(Guid) && (m_connection.GuidFormat == MySqlGuidFormat.Binary16 || m_connection.GuidFormat == MySqlGuidFormat.LittleEndianBinary16 || m_connection.GuidFormat == MySqlGuidFormat.TimeSwapBinary16)))
+						if (type == typeof(byte[]) || (type == typeof(Guid) && (m_connection.GuidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.LittleEndianBinary16 or MySqlGuidFormat.TimeSwapBinary16)))
 						{
 							AddColumnMapping(columnMappings, addDefaultMappings, i, destinationColumn, $"@`\uE002\bcol{i}`", $"%COL% = UNHEX(%VAR%)");
 						}
@@ -479,13 +479,16 @@ static bool WriteValue(MySqlConnection connection, object value, ref int inputIn
 				{
 					return Utf8Formatter.TryFormat(decimalValue, output, out bytesWritten);
 				}
-				else if (value is byte[] || value is ReadOnlyMemory<byte> || value is Memory<byte> || value is ArraySegment<byte> || value is MySqlGeometry)
+				else if (value is byte[] or ReadOnlyMemory<byte> or Memory<byte> or ArraySegment<byte> or MySqlGeometry)
 				{
-					var inputSpan = value is byte[] byteArray ? byteArray.AsSpan() :
-						value is ArraySegment<byte> arraySegment ? arraySegment.AsSpan() :
-						value is Memory<byte> memory ? memory.Span :
-						value is MySqlGeometry geometry ? geometry.ValueSpan :
-						((ReadOnlyMemory<byte>) value).Span;
+					var inputSpan = value switch
+					{
+						byte[] byteArray => byteArray.AsSpan(),
+						ArraySegment<byte> arraySegment => arraySegment.AsSpan(),
+						Memory<byte> memory => memory.Span,
+						MySqlGeometry geometry => geometry.ValueSpan,
+						_ => ((ReadOnlyMemory<byte>) value).Span,
+					};
 
 					return WriteBytes(inputSpan, ref inputIndex, output, out bytesWritten);
 				}
@@ -500,7 +503,7 @@ static bool WriteValue(MySqlConnection connection, object value, ref int inputIn
 					bytesWritten = 1;
 					return true;
 				}
-				else if (value is float || value is double)
+				else if (value is float or double)
 				{
 					// NOTE: Utf8Formatter doesn't support "R"
 					return WriteString("{0:R}".FormatInvariant(value), ref utf8Encoder, output, out bytesWritten);
@@ -538,9 +541,7 @@ static bool WriteValue(MySqlConnection connection, object value, ref int inputIn
 				}
 				else if (value is Guid guidValue)
 				{
-					if (connection.GuidFormat == MySqlGuidFormat.Binary16 ||
-						connection.GuidFormat == MySqlGuidFormat.TimeSwapBinary16 ||
-						connection.GuidFormat == MySqlGuidFormat.LittleEndianBinary16)
+					if (connection.GuidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16)
 					{
 						var bytes = guidValue.ToByteArray();
 						if (connection.GuidFormat != MySqlGuidFormat.LittleEndianBinary16)
diff --git a/src/MySqlConnector/MySqlConnectionStringBuilder.cs b/src/MySqlConnector/MySqlConnectionStringBuilder.cs
@@ -587,13 +587,13 @@ static MySqlConnectionStringOption()
 						if (!match.Success)
 							throw new ArgumentException($"Unrecognized TlsVersion protocol version '{part}'; permitted versions are: TLS 1.0, TLS 1.1, TLS 1.2, TLS 1.3.");
 						var version = match.Groups[2].Value;
-						if (version == "" || version == "1" || version == "10" || version == "1.0")
+						if (version is "" or "1" or "10" or "1.0")
 							versions[0] = true;
-						else if (version == "11" || version == "1.1")
+						else if (version is "11" or "1.1")
 							versions[1] = true;
-						else if (version == "12" || version == "1.2")
+						else if (version is "12" or "1.2")
 							versions[2] = true;
-						else if (version == "13" || version == "1.3")
+						else if (version is "13" or "1.3")
 							versions[3] = true;
 					}
 
diff --git a/src/MySqlConnector/MySqlDataReader.cs b/src/MySqlConnector/MySqlDataReader.cs
@@ -143,7 +143,7 @@ private ValueTask<int> ScanResultSetAsync(IOBehavior ioBehavior, ResultSet resul
 			if (!m_hasMoreResults)
 				return default;
 
-			if (resultSet.BufferState == ResultSetState.NoMoreData || resultSet.BufferState == ResultSetState.None)
+			if (resultSet.BufferState is ResultSetState.NoMoreData or ResultSetState.None)
 			{
 				m_hasMoreResults = false;
 				return default;
diff --git a/src/MySqlConnector/MySqlDbColumn.cs b/src/MySqlConnector/MySqlDbColumn.cs
@@ -69,10 +69,10 @@ internal MySqlDbColumn(int ordinal, ColumnDefinitionPayload column, bool allowZe
 			IsHidden = false;
 			IsKey = (column.ColumnFlags & ColumnFlags.PrimaryKey) != 0;
 			IsLong = column.ColumnLength > 255 &&
-				((column.ColumnFlags & ColumnFlags.Blob) != 0 || column.ColumnType == ColumnType.TinyBlob || column.ColumnType == ColumnType.Blob || column.ColumnType == ColumnType.MediumBlob || column.ColumnType == ColumnType.LongBlob);
+				((column.ColumnFlags & ColumnFlags.Blob) != 0 || column.ColumnType is ColumnType.TinyBlob or ColumnType.Blob or ColumnType.MediumBlob or ColumnType.LongBlob);
 			IsReadOnly = false;
 			IsUnique = (column.ColumnFlags & ColumnFlags.UniqueKey) != 0;
-			if (column.ColumnType == ColumnType.Decimal || column.ColumnType == ColumnType.NewDecimal)
+			if (column.ColumnType is ColumnType.Decimal or ColumnType.NewDecimal)
 			{
 				NumericPrecision = (int) column.ColumnLength;
 				if ((column.ColumnFlags & ColumnFlags.Unsigned) == 0)
diff --git a/src/MySqlConnector/MySqlHelper.cs b/src/MySqlConnector/MySqlHelper.cs
@@ -20,7 +20,7 @@ public static string EscapeString(string value)
 			int last = -1;
 			for (int i = 0; i < value.Length; i++)
 			{
-				if (value[i] == '\'' || value[i] == '\"' || value[i] == '\\')
+				if (value[i] is '\'' or '\"' or '\\')
 				{
 					sb ??= new();
 					sb.Append(value, last + 1, i - (last + 1));
diff --git a/src/MySqlConnector/MySqlParameter.cs b/src/MySqlConnector/MySqlParameter.cs
diff --git a/src/MySqlConnector/Protocol/Serialization/ByteArrayReader.cs b/src/MySqlConnector/Protocol/Serialization/ByteArrayReader.cs
diff --git a/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs b/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinition`
`115`	`115`	`if (columnDefinition.CharacterSet == CharacterSet.Binary)`
`116`	`116`	`{`
`117`	`117`	`var guidFormat = Connection.GuidFormat;`
`118`		`- if ((guidFormat == MySqlGuidFormat.Binary16 \|\| guidFormat == MySqlGuidFormat.TimeSwapBinary16 \|\| guidFormat == MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)`
	`118`	`+ if ((guidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)`
`119`	`119`	`return CreateGuidFromBytes(guidFormat, data);`
`120`	`120`
`121`	`121`	`return data.ToArray();`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static async Task<MySqlDataReader> ExecuteReaderAsync(IReadOnlyList<IMySq`
`64`	`64`	`Log.Warn("Session{0} query was interrupted", connection.Session.Id);`
`65`	`65`	`throw new OperationCanceledException(ex. Message, ex, cancellationToken);`
`66`	`66`	`}`
`67`		`- catch (Exception ex) when (payload.Span.Length > 4_194_304 && (ex is SocketException \|\| ex is IOException \|\| ex is MySqlProtocolException))`
	`67`	`+ catch (Exception ex) when (payload.Span.Length > 4_194_304 && (ex is SocketException or IOException or MySqlProtocolException))`
`68`	`68`	`{`
`69`	`69`	`// the default MySQL Server value for max_allowed_packet (in MySQL 5.7) is 4MiB: https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_max_allowed_packet`
`70`	`70`	`// use "decimal megabytes" (to round up) when creating the exception message`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private bool IsHostVerified(MySqlConnection connection)`
`182`	`182`
`183`	`183`	`public async Task ReadEntireAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)`
`184`	`184`	`{`
`185`		`- while (State == ResultSetState.ReadingRows \|\| State == ResultSetState.ReadResultSetHeader)`
	`185`	`+ while (State is ResultSetState.ReadingRows or ResultSetState.ReadResultSetHeader)`
`186`	`186`	`await ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false);`
`187`	`187`	`}`
`188`	`188`
`@@ -227,7 +227,7 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance`
`227`	`227`	`private ValueTask<Row?> ScanRowAsync(IOBehavior ioBehavior, Row? row, CancellationToken cancellationToken)`
`228`	`228`	`{`
`229`	`229`	`// if we've already read past the end of this resultset, Read returns false`
`230`		`- if (BufferState == ResultSetState.HasMoreData \|\| BufferState == ResultSetState.NoMoreData \|\| BufferState == ResultSetState.None)`
	`230`	`+ if (BufferState is ResultSetState.HasMoreData or ResultSetState.NoMoreData or ResultSetState.None)`
`231`	`231`	`return new ValueTask<Row?>(default(Row?));`
`232`	`232`
`233`	`233`	`using var registration = Command.CancellableCommand.RegisterCancel(cancellationToken); // lgtm[cs/useless-assignment-to-local]`
Original file line number	Diff line number	Diff line change
`@@ -211,17 +211,13 @@ public int GetInt32(int ordinal)`
`211`	`211`	`throw new InvalidCastException();`
`212`	`212`
`213`	`213`	`var columnDefinition = ResultSet.ColumnDefinitions[ordinal];`
`214`		`- if (columnDefinition.ColumnType == ColumnType.Decimal \|\| columnDefinition.ColumnType == ColumnType.NewDecimal)`
	`214`	`+ if (columnDefinition.ColumnType is ColumnType.Decimal or ColumnType.NewDecimal)`
`215`	`215`	`{`
`216`	`216`	`return (int) (decimal) GetValue(ordinal);`
`217`	`217`	`}`
`218`		`- else if (columnDefinition.ColumnType != ColumnType.Tiny &&`
`219`		`- columnDefinition.ColumnType != ColumnType.Short &&`
`220`		`- columnDefinition.ColumnType != ColumnType.Int24 &&`
`221`		`- columnDefinition.ColumnType != ColumnType.Long &&`
`222`		`- columnDefinition.ColumnType != ColumnType.Longlong &&`
`223`		`- columnDefinition.ColumnType != ColumnType.Bit &&`
`224`		`- columnDefinition.ColumnType != ColumnType.Year)`
	`218`	`+ else if (columnDefinition.ColumnType is not ColumnType.Tiny and not ColumnType.Short`
	`219`	`+ and not ColumnType.Int24 and not ColumnType.Long and not ColumnType.Longlong`
	`220`	`+ and not ColumnType.Bit and not ColumnType.Year)`
`225`	`221`	`{`
`226`	`222`	`throw new InvalidCastException("Can't convert {0} to Int32".FormatInvariant(ResultSet.ColumnTypes![ordinal]));`
`227`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public void StartQuerying(ICancellableCommand command)`
`246`	`246`	`{`
`247`	`247`	`lock (m_lock)`
`248`	`248`	`{`
`249`		`- if (m_state == State.Querying \|\| m_state == State.CancelingQuery)`
	`249`	`+ if (m_state is State.Querying or State.CancelingQuery)`
`250`	`250`	`{`
`251`	`251`	`m_logArguments[1] = m_state;`
`252`	`252`	`Log.Error("Session{0} can't execute new command when in SessionState: {1}", m_logArguments[0], m_state);`
`@@ -289,7 +289,7 @@ public void FinishQuerying()`
`289`	`289`
`290`	`290`	`lock (m_lock)`
`291`	`291`	`{`
`292`		`- if (m_state == State.Querying \|\| m_state == State.ClearingPendingCancellation)`
	`292`	`+ if (m_state is State.Querying or State.ClearingPendingCancellation)`
`293`	`293`	`m_state = State.Connected;`
`294`	`294`	`else`
`295`	`295`	`VerifyState(State.Failed);`
`@@ -307,7 +307,7 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella`
`307`	`307`	`State state;`
`308`	`308`	`lock (m_lock)`
`309`	`309`	`{`
`310`		`- if (m_state == State.Connected \|\| m_state == State.Failed)`
	`310`	`+ if (m_state is State.Connected or State.Failed)`
`311`	`311`	`m_state = State.Closing;`
`312`	`312`	`state = m_state;`
`313`	`313`	`}`
`@@ -1099,7 +1099,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect`
`1099`	`1099`	`}`
`1100`	`1100`	`else`
`1101`	`1101`	`{`
`1102`		`- var requireValid = cs.SslMode == MySqlSslMode.VerifyCA \|\| cs.SslMode == MySqlSslMode.VerifyFull;`
	`1102`	`+ var requireValid = cs.SslMode is MySqlSslMode.VerifyCA or MySqlSslMode.VerifyFull;`
`1103`	`1103`	`var foundCertificates = store.Certificates.Find(X509FindType.FindByThumbprint, cs.CertificateThumbprint, requireValid);`
`1104`	`1104`	`if (foundCertificates.Count == 0)`
`1105`	`1105`	`{`
`@@ -1290,7 +1290,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect`
`1290`	`1290`
`1291`	`1291`	`bool ValidateRemoteCertificate(object rcbSender, X509Certificate? rcbCertificate, X509Chain? rcbChain, SslPolicyErrors rcbPolicyErrors)`
`1292`	`1292`	`{`
`1293`		`- if (cs.SslMode == MySqlSslMode.Preferred \|\| cs.SslMode == MySqlSslMode.Required)`
	`1293`	`+ if (cs.SslMode is MySqlSslMode.Preferred or MySqlSslMode.Required)`
`1294`	`1294`	`return true;`
`1295`	`1295`
`1296`	`1296`	`if ((rcbPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) != 0 && caCertificateChain is not null && rcbCertificate is not null)`
`@@ -1412,7 +1412,7 @@ internal sealed class SslClientAuthenticationOptions`
`1412`	`1412`	`private bool ShouldGetRealServerDetails(ConnectionSettings cs)`
`1413`	`1413`	`{`
`1414`	`1414`	`// currently hardcoded to the version(s) returned by the Azure Database for MySQL proxy`
`1415`		`- if (ServerVersion.OriginalString == "5.6.42.0" \|\| ServerVersion.OriginalString == "5.6.39.0" \|\| ServerVersion.OriginalString == "5.6.26.0")`
	`1415`	`+ if (ServerVersion.OriginalString is "5.6.42.0" or "5.6.39.0" or "5.6.26.0")`
`1416`	`1416`	`return true;`
`1417`	`1417`
`1418`	`1418`	`// detect Azure Database for MySQL DNS suffixes`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public void Parse(string sql)`
`270`	`270`	`states \|= FinalParseStates.NeedsNewline;`
`271`	`271`	`state = beforeCommentState;`
`272`	`272`	`}`
`273`		`- else if (state == State.SingleQuotedStringSingleQuote \|\| state == State.DoubleQuotedStringDoubleQuote \|\| state == State.BacktickQuotedStringBacktick)`
	`273`	`+ else if (state is State.SingleQuotedStringSingleQuote or State.DoubleQuotedStringDoubleQuote or State.BacktickQuotedStringBacktick)`
`274`	`274`	`{`
`275`	`275`	`state = State.Statement;`
`276`	`276`	`}`
`@@ -334,9 +334,9 @@ protected enum FinalParseStates`
`334`	`334`	`NeedsSemicolon = 4,`
`335`	`335`	`}`
`336`	`336`
`337`		`- private static bool IsWhitespace(char ch) => ch == ' ' \|\| ch == '\t' \|\| ch == '\r' \|\| ch == '\n';`
	`337`	`+ private static bool IsWhitespace(char ch) => ch is ' ' or '\t' or '\r' or '\n';`
`338`	`338`
`339`		`- private static bool IsVariableName(char ch) => (ch >= 'a' && ch <= 'z') \|\| (ch >= 'A' && ch <= 'Z') \|\| (ch >= '0' && ch <= '9') \|\| ch == '.' \|\| ch == '_' \|\| ch == '$' \|\| (ch >= 0x0080 && ch <= 0xFFFF); // lgtm[cs/constant-comparison]`
	`339`	`+ private static bool IsVariableName(char ch) => ch is (>= 'a' and <= 'z') or (>= 'A' and <= 'Z') or (>= '0' and <= '9') or '.' or '_' or '$' or (>= (char) 0x0080 and <= (char) 0xFFFF);`
`340`	`340`
`341`	`341`	`private enum State`
`342`	`342`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinition`
`71`	`71`	`if (columnDefinition.CharacterSet == CharacterSet.Binary)`
`72`	`72`	`{`
`73`	`73`	`var guidFormat = Connection.GuidFormat;`
`74`		`- if ((guidFormat == MySqlGuidFormat.Binary16 \|\| guidFormat == MySqlGuidFormat.TimeSwapBinary16 \|\| guidFormat == MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)`
	`74`	`+ if ((guidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16) && columnDefinition.ColumnLength == 16)`
`75`	`75`	`return CreateGuidFromBytes(guidFormat, data);`
`76`	`76`
`77`	`77`	`return data.ToArray();`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationTo`
`265`	`265`	`else`
`266`	`266`	`{`
`267`	`267`	`var type = schema[i].DataType;`
`268`		`- if (type == typeof(byte[]) \|\| (type == typeof(Guid) && (m_connection.GuidFormat == MySqlGuidFormat.Binary16 \|\| m_connection.GuidFormat == MySqlGuidFormat.LittleEndianBinary16 \|\| m_connection.GuidFormat == MySqlGuidFormat.TimeSwapBinary16)))`
	`268`	`+ if (type == typeof(byte[]) \|\| (type == typeof(Guid) && (m_connection.GuidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.LittleEndianBinary16 or MySqlGuidFormat.TimeSwapBinary16)))`
`269`	`269`	`{`
`270`	`270`	AddColumnMapping(columnMappings, addDefaultMappings, i, destinationColumn, $"@`\uE002\bcol{i}`", $"%COL% = UNHEX(%VAR%)");
`271`	`271`	`}`
`@@ -479,13 +479,16 @@ static bool WriteValue(MySqlConnection connection, object value, ref int inputIn`
`479`	`479`	`{`
`480`	`480`	`return Utf8Formatter.TryFormat(decimalValue, output, out bytesWritten);`
`481`	`481`	`}`
`482`		`- else if (value is byte[] \|\| value is ReadOnlyMemory<byte> \|\| value is Memory<byte> \|\| value is ArraySegment<byte> \|\| value is MySqlGeometry)`
	`482`	`+ else if (value is byte[] or ReadOnlyMemory<byte> or Memory<byte> or ArraySegment<byte> or MySqlGeometry)`
`483`	`483`	`{`
`484`		`- var inputSpan = value is byte[] byteArray ? byteArray.AsSpan() :`
`485`		`- value is ArraySegment<byte> arraySegment ? arraySegment.AsSpan() :`
`486`		`- value is Memory<byte> memory ? memory.Span :`
`487`		`- value is MySqlGeometry geometry ? geometry.ValueSpan :`
`488`		`- ((ReadOnlyMemory<byte>) value).Span;`
	`484`	`+ var inputSpan = value switch`
	`485`	`+ {`
	`486`	`+ byte[] byteArray => byteArray.AsSpan(),`
	`487`	`+ ArraySegment<byte> arraySegment => arraySegment.AsSpan(),`
	`488`	`+ Memory<byte> memory => memory.Span,`
	`489`	`+ MySqlGeometry geometry => geometry.ValueSpan,`
	`490`	`+ _ => ((ReadOnlyMemory<byte>) value).Span,`
	`491`	`+ };`
`489`	`492`
`490`	`493`	`return WriteBytes(inputSpan, ref inputIndex, output, out bytesWritten);`
`491`	`494`	`}`
`@@ -500,7 +503,7 @@ static bool WriteValue(MySqlConnection connection, object value, ref int inputIn`
`500`	`503`	`bytesWritten = 1;`
`501`	`504`	`return true;`
`502`	`505`	`}`
`503`		`- else if (value is float \|\| value is double)`
	`506`	`+ else if (value is float or double)`
`504`	`507`	`{`
`505`	`508`	`// NOTE: Utf8Formatter doesn't support "R"`
`506`	`509`	`return WriteString("{0:R}".FormatInvariant(value), ref utf8Encoder, output, out bytesWritten);`
`@@ -538,9 +541,7 @@ static bool WriteValue(MySqlConnection connection, object value, ref int inputIn`
`538`	`541`	`}`
`539`	`542`	`else if (value is Guid guidValue)`
`540`	`543`	`{`
`541`		`- if (connection.GuidFormat == MySqlGuidFormat.Binary16 \|\|`
`542`		`- connection.GuidFormat == MySqlGuidFormat.TimeSwapBinary16 \|\|`
`543`		`- connection.GuidFormat == MySqlGuidFormat.LittleEndianBinary16)`
	`544`	`+ if (connection.GuidFormat is MySqlGuidFormat.Binary16 or MySqlGuidFormat.TimeSwapBinary16 or MySqlGuidFormat.LittleEndianBinary16)`
`544`	`545`	`{`
`545`	`546`	`var bytes = guidValue.ToByteArray();`
`546`	`547`	`if (connection.GuidFormat != MySqlGuidFormat.LittleEndianBinary16)`