Add MySqlException.ErrorCode. Fixes #830

bgrainger · bgrainger · commit 1ea13627e6e2 · 2020-06-13T13:49:45.000-07:00
diff --git a/src/MySqlConnector/Core/CachedProcedure.cs b/src/MySqlConnector/Core/CachedProcedure.cs
@@ -53,7 +53,7 @@ internal sealed class CachedProcedure
 				catch (MySqlException ex)
 				{
 					Log.Warn("Session{0} failed to retrieve metadata for Schema={1} Component={2}; falling back to INFORMATION_SCHEMA. Error: {3}", connection.Session.Id, schema, component, ex.Message);
-					if ((MySqlErrorCode) ex.Number == MySqlErrorCode.TableAccessDenied)
+					if (ex.ErrorCode == MySqlErrorCode.TableAccessDenied)
 						connection.Session.ProcAccessDenied = true;
 				}
 			}
diff --git a/src/MySqlConnector/Core/CommandExecutor.cs b/src/MySqlConnector/Core/CommandExecutor.cs
@@ -61,7 +61,7 @@ public static async Task<MySqlDataReader> ExecuteReaderAsync(IReadOnlyList<IMySq
 				await connection.Session.SendAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
 				return await MySqlDataReader.CreateAsync(commandListPosition, payloadCreator, cachedProcedures, command, behavior, ioBehavior, cancellationToken).ConfigureAwait(false);
 			}
-			catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted && cancellationToken.IsCancellationRequested)
+			catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.QueryInterrupted && cancellationToken.IsCancellationRequested)
 			{
 				Log.Warn("Session{0} query was interrupted", connection.Session.Id);
 				throw new OperationCanceledException(cancellationToken);
diff --git a/src/MySqlConnector/Core/ResultSet.cs b/src/MySqlConnector/Core/ResultSet.cs
@@ -248,7 +248,7 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance
 				catch (MySqlException ex)
 				{
 					this_.BufferState = this_.State = ResultSetState.NoMoreData;
-					if (ex.Number == (int) MySqlErrorCode.QueryInterrupted)
+					if (ex.ErrorCode == MySqlErrorCode.QueryInterrupted)
 						token.ThrowIfCancellationRequested();
 					throw;
 				}
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -768,7 +768,7 @@ public ValueTask<PayloadData> ReceiveReplyAsync(IOBehavior ioBehavior, Cancellat
 			catch (Exception ex)
 			{
 				Log.Info(ex, "Session{0} failed in ReceiveReplyAsync", m_logArguments);
-				if ((ex as MySqlException)?.Number == (int) MySqlErrorCode.CommandTimeoutExpired)
+				if ((ex as MySqlException)?.ErrorCode == MySqlErrorCode.CommandTimeoutExpired)
 					HandleTimeout();
 				task = ValueTaskExtensions.FromException<ArraySegment<byte>>(ex);
 			}
@@ -796,7 +796,7 @@ private async ValueTask<PayloadData> ReceiveReplyAsyncAwaited(ValueTask<ArraySeg
 			catch (Exception ex)
 			{
 				SetFailed(ex);
-				if (ex is MySqlException msex && msex.Number == (int) MySqlErrorCode.CommandTimeoutExpired)
+				if (ex is MySqlException msex && msex.ErrorCode == MySqlErrorCode.CommandTimeoutExpired)
 					HandleTimeout();
 				throw;
 			}
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs
@@ -746,7 +746,7 @@ private async ValueTask<ServerSession> CreateSessionAsync(ConnectionPool? pool,
 				var messageSuffix = (pool?.IsEmpty ?? false) ? " All pooled connections are in use." : "";
 				throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired." + messageSuffix, ex);
 			}
-			catch (MySqlException ex) when ((timeoutSource?.IsCancellationRequested ?? false) || ((MySqlErrorCode)ex.Number == MySqlErrorCode.CommandTimeoutExpired))
+			catch (MySqlException ex) when ((timeoutSource?.IsCancellationRequested ?? false) || (ex.ErrorCode == MySqlErrorCode.CommandTimeoutExpired))
 			{
 				throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired.", ex);
 			}
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlDataReader.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlDataReader.cs
@@ -123,7 +123,7 @@ private void ActivateResultSet()
 					Command!.Connection!.SetSessionFailed(m_resultSet.ReadResultSetHeaderException);
 
 				throw mySqlException is not null ?
-					new MySqlException(mySqlException.Number, mySqlException.SqlState, mySqlException.Message, mySqlException) :
+					new MySqlException(mySqlException.ErrorCode, mySqlException.SqlState, mySqlException.Message, mySqlException) :
 					new MySqlException("Failed to read the result set.", m_resultSet.ReadResultSetHeaderException);
 			}
 
@@ -159,7 +159,7 @@ private async Task<int> ScanResultSetAsyncAwaited(IOBehavior ioBehavior, ResultS
 					m_hasMoreResults = resultSet.BufferState != ResultSetState.NoMoreData;
 					return 0;
 				}
-				catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted)
+				catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.QueryInterrupted)
 				{
 					m_hasMoreResults = false;
 					cancellationToken.ThrowIfCancellationRequested();
@@ -530,7 +530,7 @@ internal async ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken c
 						{
 						}
 					}
-					catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted)
+					catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.QueryInterrupted)
 					{
 						// ignore "Query execution was interrupted" exceptions when closing a data reader
 					}
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlException.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlException.cs
@@ -7,12 +7,33 @@
 
 namespace MySql.Data.MySqlClient
 {
+	/// <summary>
+	/// <see cref="MySqlException"/> is thrown when MySQL Server returns an error code, or there is a
+	/// communication error with the server.
+	/// </summary>
 #if !NETSTANDARD1_3
 	[Serializable]
 #endif
 	public sealed class MySqlException : DbException
 	{
+		/// <summary>
+		/// A <see cref="MySqlErrorCode"/> value identifying the kind of error. Prefer to use the <see cref="ErrorCode"/> property.
+		/// </summary>
 		public int Number { get; }
+
+		/// <summary>
+		/// A <see cref="MySqlErrorCode"/> value identifying the kind of error.
+		/// </summary>
+#if NETSTANDARD1_3
+		public MySqlErrorCode ErrorCode { get; }
+#else
+		public new MySqlErrorCode ErrorCode { get; }
+#endif
+
+		/// <summary>
+		/// A <c>SQLSTATE</c> code identifying the kind of error.
+		/// </summary>
+		/// <remarks>See <a href="https://en.wikipedia.org/wiki/SQLSTATE">SQLSTATE</a> for more information.</remarks>
 		public string? SqlState { get; }
 
 #if !NETSTANDARD1_3
@@ -51,29 +72,30 @@ internal MySqlException(string message)
 		}
 
 		internal MySqlException(string message, Exception? innerException)
-			: this(0, null, message, innerException)
+			: this(default, null, message, innerException)
 		{
 		}
 
 		internal MySqlException(MySqlErrorCode errorCode, string message)
-			: this((int) errorCode, null, message, null)
+			: this(errorCode, null, message, null)
 		{
 		}
 
 		internal MySqlException(MySqlErrorCode errorCode, string message, Exception? innerException)
-			: this((int) errorCode, null, message, innerException)
+			: this(errorCode, null, message, innerException)
 		{
 		}
 
-		internal MySqlException(int errorNumber, string sqlState, string message)
-			: this(errorNumber, sqlState, message, null)
+		internal MySqlException(MySqlErrorCode errorCode, string sqlState, string message)
+			: this(errorCode, sqlState, message, null)
 		{
 		}
 
-		internal MySqlException(int errorNumber, string? sqlState, string message, Exception? innerException)
+		internal MySqlException(MySqlErrorCode errorCode, string? sqlState, string message, Exception? innerException)
 			: base(message, innerException)
 		{
-			Number = errorNumber;
+			ErrorCode = errorCode;
+			Number = (int) errorCode;
 			SqlState = sqlState;
 		}
 
diff --git a/src/MySqlConnector/Protocol/Payloads/ErrorPayload.cs b/src/MySqlConnector/Protocol/Payloads/ErrorPayload.cs
@@ -13,7 +13,7 @@ internal sealed class ErrorPayload
 		public string State { get; }
 		public string Message { get; }
 
-		public MySqlException ToException() => new MySqlException(ErrorCode, State, Message);
+		public MySqlException ToException() => new MySqlException((MySqlErrorCode) ErrorCode, State, Message);
 
 		public static ErrorPayload Create(ReadOnlySpan<byte> span)
 		{
diff --git a/tests/MySqlConnector.Tests/MySqlExceptionTests.cs b/tests/MySqlConnector.Tests/MySqlExceptionTests.cs
@@ -10,7 +10,7 @@ public class MySqlExceptionTests
 		[Fact]
 		public void IsSerializable()
 		{
-			var exception = new MySqlException(1, "two", "three");
+			var exception = new MySqlException(MySqlErrorCode.No, "two", "three");
 			MySqlException copy;
 
 			using (var stream = new MemoryStream())
@@ -29,8 +29,8 @@ public void IsSerializable()
 		[Fact]
 		public void Data()
 		{
-			var exception = new MySqlException(1, "two", "three");
-			Assert.Equal(1, exception.Data["Server Error Code"]);
+			var exception = new MySqlException(MySqlErrorCode.No, "two", "three");
+			Assert.Equal(1002, exception.Data["Server Error Code"]);
 			Assert.Equal("two", exception.Data["SqlState"]);
 		}
 	}
diff --git a/tests/SideBySide/BatchTests.cs b/tests/SideBySide/BatchTests.cs
@@ -228,7 +228,7 @@ public void ExecuteInvalidSqlBatch()
 			}
 			catch (MySqlException ex)
 			{
-				Assert.Equal(MySqlErrorCode.ParseError, (MySqlErrorCode) ex.Number);
+				Assert.Equal(MySqlErrorCode.ParseError, ex.ErrorCode);
 			}
 		}
 
diff --git a/tests/SideBySide/BulkLoaderSync.cs b/tests/SideBySide/BulkLoaderSync.cs
@@ -949,7 +949,7 @@ public void BulkCopyDoesNotInsertAllRows()
 			};
 
 			var ex = Assert.Throws<MySqlException>(() => bcp.WriteToServer(dataTable));
-			Assert.Equal(MySqlErrorCode.BulkCopyFailed, (MySqlErrorCode) ex.Number);
+			Assert.Equal(MySqlErrorCode.BulkCopyFailed, ex.ErrorCode);
 		}
 #endif
 
diff --git a/tests/SideBySide/CancelTests.cs b/tests/SideBySide/CancelTests.cs
@@ -443,7 +443,7 @@ public void CancelBatchReaderAsynchronously()
 				}
 				catch (MySqlException ex)
 				{
-					Assert.Equal((int) MySqlErrorCode.QueryInterrupted, ex.Number);
+					Assert.Equal(MySqlErrorCode.QueryInterrupted, ex.ErrorCode);
 				}
 
 				// query returns 25 billion rows; we shouldn't have read many of them
@@ -475,7 +475,7 @@ public void CancelBatchBeforeRead()
 			}
 			catch (MySqlException ex)
 			{
-				Assert.Equal((int) MySqlErrorCode.QueryInterrupted, ex.Number);
+				Assert.Equal(MySqlErrorCode.QueryInterrupted, ex.ErrorCode);
 			}
 			Assert.False(reader.NextResult());
 			TestUtilities.AssertDuration(stopwatch, 0, 1000);
@@ -514,7 +514,7 @@ public void CancelMultiCommandBatchReader()
 				}
 				catch (MySqlException ex)
 				{
-					Assert.Equal((int) MySqlErrorCode.QueryInterrupted, ex.Number);
+					Assert.Equal(MySqlErrorCode.QueryInterrupted, ex.ErrorCode);
 				}
 
 				// query returns 25 billion rows; we shouldn't have read many of them
diff --git a/tests/SideBySide/ConnectSync.cs b/tests/SideBySide/ConnectSync.cs
@@ -65,8 +65,8 @@ public void ConnectBadDatabase()
 			using var connection = new MySqlConnection(csb.ConnectionString);
 			var ex = Assert.Throws<MySqlException>(connection.Open);
 #if !BASELINE // https://bugs.mysql.com/bug.php?id=78426
-			if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.ErrorCodes) || ex.Number != 0)
-				Assert.Equal((int) MySqlErrorCode.UnknownDatabase, ex.Number);
+			if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.ErrorCodes) || ex.ErrorCode != default)
+				Assert.Equal(MySqlErrorCode.UnknownDatabase, ex.ErrorCode);
 #endif
 			Assert.Equal(ConnectionState.Closed, connection.State);
 		}
@@ -79,8 +79,8 @@ public void ConnectBadPassword()
 			using var connection = new MySqlConnection(csb.ConnectionString);
 			var ex = Assert.Throws<MySqlException>(connection.Open);
 #if !BASELINE // https://bugs.mysql.com/bug.php?id=78426
-			if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.ErrorCodes) || ex.Number != 0)
-				Assert.Equal((int) MySqlErrorCode.AccessDenied, ex.Number);
+			if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.ErrorCodes) || ex.ErrorCode != default)
+				Assert.Equal(MySqlErrorCode.AccessDenied, ex.ErrorCode);
 #endif
 			Assert.Equal(ConnectionState.Closed, connection.State);
 		}
diff --git a/tests/SideBySide/Transaction.cs b/tests/SideBySide/Transaction.cs
@@ -135,15 +135,15 @@ public void ReadOnlyTransaction()
 		{
 			using var trans = m_connection.BeginTransaction(IsolationLevel.Serializable, isReadOnly: true);
 			var exception = Assert.Throws<MySqlException>(() => m_connection.Execute("insert into transactions_test values(1), (2)", transaction: trans));
-			Assert.Equal(MySqlErrorCode.CannotExecuteInReadOnlyTransaction, (MySqlErrorCode) exception.Number);
+			Assert.Equal(MySqlErrorCode.CannotExecuteInReadOnlyTransaction, exception.ErrorCode);
 		}
 
 		[Fact]
 		public void ReadOnlySnapshotTransaction()
 		{
 			using var trans = m_connection.BeginTransaction(IsolationLevel.Snapshot, isReadOnly: true);
 			var exception = Assert.Throws<MySqlException>(() => m_connection.Execute("insert into transactions_test values(1), (2)", transaction: trans));
-			Assert.Equal(MySqlErrorCode.CannotExecuteInReadOnlyTransaction, (MySqlErrorCode) exception.Number);
+			Assert.Equal(MySqlErrorCode.CannotExecuteInReadOnlyTransaction, exception.ErrorCode);
 		}
 
 		[Fact]
@@ -163,7 +163,7 @@ public async Task ReadOnlyTransactionAsync()
 		{
 			using var trans = await m_connection.BeginTransactionAsync(IsolationLevel.Serializable, isReadOnly: true);
 			var exception = await Assert.ThrowsAsync<MySqlException>(async () => await m_connection.ExecuteAsync("insert into transactions_test values(1), (2)", transaction: trans));
-			Assert.Equal(MySqlErrorCode.CannotExecuteInReadOnlyTransaction, (MySqlErrorCode) exception.Number);
+			Assert.Equal(MySqlErrorCode.CannotExecuteInReadOnlyTransaction, exception.ErrorCode);
 		}
 
 		[Fact]
@@ -301,15 +301,15 @@ public void SavepointRollbackUnknownName()
 		{
 			using var transaction = m_connection.BeginTransaction();
 			var ex = Assert.Throws<MySqlException>(() => transaction.Rollback("a"));
-			Assert.Equal(MySqlErrorCode.StoredProcedureDoesNotExist, (MySqlErrorCode)ex.Number);
+			Assert.Equal(MySqlErrorCode.StoredProcedureDoesNotExist, ex.ErrorCode);
 		}
 
 		[Fact]
 		public void SavepointReleaseUnknownName()
 		{
 			using var transaction = m_connection.BeginTransaction();
 			var ex = Assert.Throws<MySqlException>(() => transaction.Release("a"));
-			Assert.Equal(MySqlErrorCode.StoredProcedureDoesNotExist, (MySqlErrorCode)ex.Number);
+			Assert.Equal(MySqlErrorCode.StoredProcedureDoesNotExist, ex.ErrorCode);
 		}
 
 		[Fact]
@@ -319,7 +319,7 @@ public void SavepointRollbackReleasedName()
 			transaction.Save("a");
 			transaction.Release("a");
 			var ex = Assert.Throws<MySqlException>(() => transaction.Rollback("a"));
-			Assert.Equal(MySqlErrorCode.StoredProcedureDoesNotExist, (MySqlErrorCode) ex.Number);
+			Assert.Equal(MySqlErrorCode.StoredProcedureDoesNotExist, ex.ErrorCode);
 		}
 
 		[Fact]

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ internal sealed class CachedProcedure`
`53`	`53`	`catch (MySqlException ex)`
`54`	`54`	`{`
`55`	`55`	`Log.Warn("Session{0} failed to retrieve metadata for Schema={1} Component={2}; falling back to INFORMATION_SCHEMA. Error: {3}", connection.Session.Id, schema, component, ex.Message);`
`56`		`- if ((MySqlErrorCode) ex.Number == MySqlErrorCode.TableAccessDenied)`
	`56`	`+ if (ex.ErrorCode == MySqlErrorCode.TableAccessDenied)`
`57`	`57`	`connection.Session.ProcAccessDenied = true;`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static async Task<MySqlDataReader> ExecuteReaderAsync(IReadOnlyList<IMySq`
`61`	`61`	`await connection.Session.SendAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);`
`62`	`62`	`return await MySqlDataReader.CreateAsync(commandListPosition, payloadCreator, cachedProcedures, command, behavior, ioBehavior, cancellationToken).ConfigureAwait(false);`
`63`	`63`	`}`
`64`		`- catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted && cancellationToken.IsCancellationRequested)`
	`64`	`+ catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.QueryInterrupted && cancellationToken.IsCancellationRequested)`
`65`	`65`	`{`
`66`	`66`	`Log.Warn("Session{0} query was interrupted", connection.Session.Id);`
`67`	`67`	`throw new OperationCanceledException(cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance`
`248`	`248`	`catch (MySqlException ex)`
`249`	`249`	`{`
`250`	`250`	`this_.BufferState = this_.State = ResultSetState.NoMoreData;`
`251`		`- if (ex.Number == (int) MySqlErrorCode.QueryInterrupted)`
	`251`	`+ if (ex.ErrorCode == MySqlErrorCode.QueryInterrupted)`
`252`	`252`	`token.ThrowIfCancellationRequested();`
`253`	`253`	`throw;`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ public ValueTask<PayloadData> ReceiveReplyAsync(IOBehavior ioBehavior, Cancellat`
`768`	`768`	`catch (Exception ex)`
`769`	`769`	`{`
`770`	`770`	`Log.Info(ex, "Session{0} failed in ReceiveReplyAsync", m_logArguments);`
`771`		`- if ((ex as MySqlException)?.Number == (int) MySqlErrorCode.CommandTimeoutExpired)`
	`771`	`+ if ((ex as MySqlException)?.ErrorCode == MySqlErrorCode.CommandTimeoutExpired)`
`772`	`772`	`HandleTimeout();`
`773`	`773`	`task = ValueTaskExtensions.FromException<ArraySegment<byte>>(ex);`
`774`	`774`	`}`
`@@ -796,7 +796,7 @@ private async ValueTask<PayloadData> ReceiveReplyAsyncAwaited(ValueTask<ArraySeg`
`796`	`796`	`catch (Exception ex)`
`797`	`797`	`{`
`798`	`798`	`SetFailed(ex);`
`799`		`- if (ex is MySqlException msex && msex.Number == (int) MySqlErrorCode.CommandTimeoutExpired)`
	`799`	`+ if (ex is MySqlException msex && msex.ErrorCode == MySqlErrorCode.CommandTimeoutExpired)`
`800`	`800`	`HandleTimeout();`
`801`	`801`	`throw;`
`802`	`802`	`}`
Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ private async ValueTask<ServerSession> CreateSessionAsync(ConnectionPool? pool,`
`746`	`746`	`var messageSuffix = (pool?.IsEmpty ?? false) ? " All pooled connections are in use." : "";`
`747`	`747`	`throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired." + messageSuffix, ex);`
`748`	`748`	`}`
`749`		`- catch (MySqlException ex) when ((timeoutSource?.IsCancellationRequested ?? false) \|\| ((MySqlErrorCode)ex.Number == MySqlErrorCode.CommandTimeoutExpired))`
	`749`	`+ catch (MySqlException ex) when ((timeoutSource?.IsCancellationRequested ?? false) \|\| (ex.ErrorCode == MySqlErrorCode.CommandTimeoutExpired))`
`750`	`750`	`{`
`751`	`751`	`throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired.", ex);`
`752`	`752`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private void ActivateResultSet()`
`123`	`123`	`Command!.Connection!.SetSessionFailed(m_resultSet.ReadResultSetHeaderException);`
`124`	`124`
`125`	`125`	`throw mySqlException is not null ?`
`126`		`- new MySqlException(mySqlException.Number, mySqlException.SqlState, mySqlException.Message, mySqlException) :`
	`126`	`+ new MySqlException(mySqlException.ErrorCode, mySqlException.SqlState, mySqlException.Message, mySqlException) :`
`127`	`127`	`new MySqlException("Failed to read the result set.", m_resultSet.ReadResultSetHeaderException);`
`128`	`128`	`}`
`129`	`129`
`@@ -159,7 +159,7 @@ private async Task<int> ScanResultSetAsyncAwaited(IOBehavior ioBehavior, ResultS`
`159`	`159`	`m_hasMoreResults = resultSet.BufferState != ResultSetState.NoMoreData;`
`160`	`160`	`return 0;`
`161`	`161`	`}`
`162`		`- catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted)`
	`162`	`+ catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.QueryInterrupted)`
`163`	`163`	`{`
`164`	`164`	`m_hasMoreResults = false;`
`165`	`165`	`cancellationToken.ThrowIfCancellationRequested();`
`@@ -530,7 +530,7 @@ internal async ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken c`
`530`	`530`	`{`
`531`	`531`	`}`
`532`	`532`	`}`
`533`		`- catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted)`
	`533`	`+ catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.QueryInterrupted)`
`534`	`534`	`{`
`535`	`535`	`// ignore "Query execution was interrupted" exceptions when closing a data reader`
`536`	`536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,33 @@`
`7`	`7`
`8`	`8`	`namespace MySql.Data.MySqlClient`
`9`	`9`	`{`
	`10`	`+ /// <summary>`
	`11`	`+ /// <see cref="MySqlException"/> is thrown when MySQL Server returns an error code, or there is a`
	`12`	`+ /// communication error with the server.`
	`13`	`+ /// </summary>`
`10`	`14`	`#if !NETSTANDARD1_3`
`11`	`15`	`[Serializable]`
`12`	`16`	`#endif`
`13`	`17`	`public sealed class MySqlException : DbException`
`14`	`18`	`{`
	`19`	`+ /// <summary>`
	`20`	`+ /// A <see cref="MySqlErrorCode"/> value identifying the kind of error. Prefer to use the <see cref="ErrorCode"/> property.`
	`21`	`+ /// </summary>`
`15`	`22`	`public int Number { get; }`
	`23`	`+`
	`24`	`+ /// <summary>`
	`25`	`+ /// A <see cref="MySqlErrorCode"/> value identifying the kind of error.`
	`26`	`+ /// </summary>`
	`27`	`+#if NETSTANDARD1_3`
	`28`	`+ public MySqlErrorCode ErrorCode { get; }`
	`29`	`+#else`
	`30`	`+ public new MySqlErrorCode ErrorCode { get; }`
	`31`	`+#endif`
	`32`	`+`
	`33`	`+ /// <summary>`
	`34`	`+ /// A <c>SQLSTATE</c> code identifying the kind of error.`
	`35`	`+ /// </summary>`
	`36`	`+ /// <remarks>See <a href="https://en.wikipedia.org/wiki/SQLSTATE">SQLSTATE</a> for more information.</remarks>`
`16`	`37`	`public string? SqlState { get; }`
`17`	`38`
`18`	`39`	`#if !NETSTANDARD1_3`
`@@ -51,29 +72,30 @@ internal MySqlException(string message)`
`51`	`72`	`}`
`52`	`73`
`53`	`74`	`internal MySqlException(string message, Exception? innerException)`
`54`		`- : this(0, null, message, innerException)`
	`75`	`+ : this(default, null, message, innerException)`
`55`	`76`	`{`
`56`	`77`	`}`
`57`	`78`
`58`	`79`	`internal MySqlException(MySqlErrorCode errorCode, string message)`
`59`		`- : this((int) errorCode, null, message, null)`
	`80`	`+ : this(errorCode, null, message, null)`
`60`	`81`	`{`
`61`	`82`	`}`
`62`	`83`
`63`	`84`	`internal MySqlException(MySqlErrorCode errorCode, string message, Exception? innerException)`
`64`		`- : this((int) errorCode, null, message, innerException)`
	`85`	`+ : this(errorCode, null, message, innerException)`
`65`	`86`	`{`
`66`	`87`	`}`
`67`	`88`
`68`		`- internal MySqlException(int errorNumber, string sqlState, string message)`
`69`		`- : this(errorNumber, sqlState, message, null)`
	`89`	`+ internal MySqlException(MySqlErrorCode errorCode, string sqlState, string message)`
	`90`	`+ : this(errorCode, sqlState, message, null)`
`70`	`91`	`{`
`71`	`92`	`}`
`72`	`93`
`73`		`- internal MySqlException(int errorNumber, string? sqlState, string message, Exception? innerException)`
	`94`	`+ internal MySqlException(MySqlErrorCode errorCode, string? sqlState, string message, Exception? innerException)`
`74`	`95`	`: base(message, innerException)`
`75`	`96`	`{`
`76`		`- Number = errorNumber;`
	`97`	`+ ErrorCode = errorCode;`
	`98`	`+ Number = (int) errorCode;`
`77`	`99`	`SqlState = sqlState;`
`78`	`100`	`}`
`79`	`101`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ internal sealed class ErrorPayload`
`13`	`13`	`public string State { get; }`
`14`	`14`	`public string Message { get; }`
`15`	`15`
`16`		`- public MySqlException ToException() => new MySqlException(ErrorCode, State, Message);`
	`16`	`+ public MySqlException ToException() => new MySqlException((MySqlErrorCode) ErrorCode, State, Message);`
`17`	`17`
`18`	`18`	`public static ErrorPayload Create(ReadOnlySpan<byte> span)`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class MySqlExceptionTests`
`10`	`10`	`[Fact]`
`11`	`11`	`public void IsSerializable()`
`12`	`12`	`{`
`13`		`- var exception = new MySqlException(1, "two", "three");`
	`13`	`+ var exception = new MySqlException(MySqlErrorCode.No, "two", "three");`
`14`	`14`	`MySqlException copy;`
`15`	`15`
`16`	`16`	`using (var stream = new MemoryStream())`
`@@ -29,8 +29,8 @@ public void IsSerializable()`
`29`	`29`	`[Fact]`
`30`	`30`	`public void Data()`
`31`	`31`	`{`
`32`		`- var exception = new MySqlException(1, "two", "three");`
`33`		`- Assert.Equal(1, exception.Data["Server Error Code"]);`
	`32`	`+ var exception = new MySqlException(MySqlErrorCode.No, "two", "three");`
	`33`	`+ Assert.Equal(1002, exception.Data["Server Error Code"]);`
`34`	`34`	`Assert.Equal("two", exception.Data["SqlState"]);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public void ExecuteInvalidSqlBatch()`
`228`	`228`	`}`
`229`	`229`	`catch (MySqlException ex)`
`230`	`230`	`{`
`231`		`- Assert.Equal(MySqlErrorCode.ParseError, (MySqlErrorCode) ex.Number);`
	`231`	`+ Assert.Equal(MySqlErrorCode.ParseError, ex.ErrorCode);`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`