MontoyaTech/MySqlPlus
MontoyaTech/MySqlPlus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new MySqlCommandException and improved exception handling for ExecuteReader and ExecuteNonQuery for ManagedConnections. Bumped package version to 1.0.8

Browse Source
This commit is contained in:
MattMo 2023-02-01 10:10:08 -08:00
parent b6a47ce023
commit 621d9c74fb
3 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
MySqlPlus/MySqlCommandException.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MySql.Data.MySqlClient;
namespace MontoyaTech.MySqlPlus
{
/// <summary>
/// The outline of a MySqlCommandException.
/// </summary>
public class MySqlCommandException : Exception
{
/// <summary>
/// The MySqlCommand that failed to execute.
/// </summary>
public MySqlCommand Command = null;
/// <summary>
/// Creates a new MySqlCommandException with a command.
/// </summary>
/// <param name="command"></param>
public MySqlCommandException(MySqlCommand command) : base($"Failed to execute MySqlCommand. Query: {command.CommandText}")
{
this.Command = command;
}
/// <summary>
/// Creates a new MySqlCommandException with a command and inner exception if any.
/// </summary>
/// <param name="command"></param>
/// <param name="inner"></param>
public MySqlCommandException(MySqlCommand command, Exception inner) : base($"Failed to execute MySqlCommand. Query: {command.CommandText}", inner)
{
this.Command = command;
}
}
}

29
MySqlPlus/MySqlManagedConnection.cs
View File

@ -156,8 +156,10 @@ namespace MontoyaTech.MySqlPlus
/// <returns></returns>
public MySqlDataReader ExecuteReader(MySqlCommand command, int maxRetrys = 5, bool exponentialBackoff = true, bool retry = true)
{
if (string.IsNullOrWhiteSpace(command.CommandText))
throw new ArgumentException("Given command must have CommandText set.");
if (command == null)
throw new ArgumentNullException(nameof(command));
else if (string.IsNullOrWhiteSpace(command.CommandText))
throw new ArgumentException("MySqlCommand must have CommandText set.");
int backoffSleep = 2000;
command.CommandTimeout = 60; //Time in seconds
@ -169,6 +171,7 @@ namespace MontoyaTech.MySqlPlus
try
{
command.Connection = this.MySqlConnection;
return command.ExecuteReader();
}
catch (Exception ex)
@ -185,7 +188,7 @@ namespace MontoyaTech.MySqlPlus
//See if we have reached our max retry.
if (i + 1 >= maxRetrys || !retry)
throw;
throw new MySqlCommandException(command, ex);
//See if the connection was invalid
if (innerException.GetType().IsAssignableFrom(typeof(System.Net.Sockets.SocketException)) ||
@ -197,12 +200,12 @@ namespace MontoyaTech.MySqlPlus
{
//Attempt to reconnect, but if this fails, it means we can't try any more since the reconnect retrys more than once.
if (!this.Reconnect(maxRetrys, exponentialBackoff))
throw;
throw new MySqlCommandException(command, ex);
}
//See if we should retry or just throw.
else if (!ShouldRetryBasedOnMySqlErrorNum(code))
{
throw;
throw new MySqlCommandException(command, ex);
}
else
{
@ -216,7 +219,7 @@ namespace MontoyaTech.MySqlPlus
}
}
throw new Exception($"MySql ExecuteReader failed. Max timeout reached. Query: {command.CommandText}");
throw new MySqlCommandException(command);
}
/// <summary>
@ -230,8 +233,10 @@ namespace MontoyaTech.MySqlPlus
/// <exception cref="Exception"></exception>
public int ExecuteNonQuery(MySqlCommand command, int maxRetrys = 5, bool exponentialBackoff = true, bool retry = true)
{
if (string.IsNullOrWhiteSpace(command.CommandText))
throw new ArgumentException("Given command must have CommandText set.");
if (command == null)
throw new ArgumentNullException(nameof(command));
else if (string.IsNullOrWhiteSpace(command.CommandText))
throw new ArgumentException("MySqlCommand must have CommandText set.");
int backoffSleep = 2000;
command.CommandTimeout = 60; // time in seconds
@ -260,7 +265,7 @@ namespace MontoyaTech.MySqlPlus
//See if we have reached our max retry.
if (i + 1 >= maxRetrys || !retry)
throw;
throw new MySqlCommandException(command, ex);
//See if the connection was invalid
if (innerException.GetType().IsAssignableFrom(typeof(System.Net.Sockets.SocketException)) ||
@ -272,12 +277,12 @@ namespace MontoyaTech.MySqlPlus
{
//Attempt to reconnect, but if this fails, it means we can't try any more since the reconnect retrys more than once.
if (!this.Reconnect(maxRetrys, exponentialBackoff))
throw;
throw new MySqlCommandException(command, ex);
}
//See if we should retry or just throw.
else if (!ShouldRetryBasedOnMySqlErrorNum(code))
{
throw;
throw new MySqlCommandException(command, ex);
}
else
{
@ -291,7 +296,7 @@ namespace MontoyaTech.MySqlPlus
}
}
throw new Exception($"MySql ExecuteNonQuery failed. Max timeout reached. Query: {command.CommandText}");
throw new MySqlCommandException(command);
}
/// <summary>

2
MySqlPlus/MySqlPlus.csproj
View File

@ -7,7 +7,7 @@
<AssemblyName>MontoyaTech.MySqlPlus</AssemblyName>
<RootNamespace>MontoyaTech.MySqlPlus</RootNamespace>
<Title>MontoyaTech.MySqlPlus</Title>
<Version>1.0.7</Version>
<Version>1.0.8</Version>
<Company>MontoyaTech</Company>
<Description>A simple C# library to help work with MySql.</Description>
<Copyright>MontoyaTech 2023</Copyright>