Skip to content

Commit

Permalink
Merge branch 'release/6.0.0' of https://github.com/DbUp/dbup-mysql in…
Browse files Browse the repository at this point in the history
…to release/6.0.0
  • Loading branch information
droyad committed Jul 20, 2024
2 parents 49da633 + bd35774 commit 34e8f36
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/dbup-mysql/MySqlConnectionManager.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using DbUp.Engine.Transactions;
using MySql.Data.MySqlClient;
using MySqlConnector;


namespace DbUp.MySql
{
Expand Down
2 changes: 1 addition & 1 deletion src/dbup-mysql/MySqlExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using DbUp.Engine.Output;
using DbUp.Engine.Transactions;
using DbUp.MySql;
using MySql.Data.MySqlClient;
using MySqlConnector;

/// <summary>
/// Configuration extension methods for MySql.
Expand Down
4 changes: 2 additions & 2 deletions src/dbup-mysql/MySqlScriptExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using DbUp.Engine.Output;
using DbUp.Engine.Transactions;
using DbUp.Support;
using MySql.Data.MySqlClient;
using MySqlConnector;

namespace DbUp.MySql
{
Expand Down Expand Up @@ -41,7 +41,7 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
}
catch (MySqlException exception)
{
var code = exception.Code;
var code = exception.ErrorCode;
Log().LogInformation("MySql exception has occurred in script: '{0}'", script.Name);
Log().LogError("Script block number: {0}; MySql error code: {1}; Number {2}; Message: {3}", index, code, exception.Number, exception.Message);
Log().LogError(exception.ToString());
Expand Down
5 changes: 2 additions & 3 deletions src/dbup-mysql/dbup-mysql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources> <!-- Embed source files that are not tracked by the source control manager in the PDB -->
<DebugType>embedded</DebugType> <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="dbup-core" Version="6.0.0-beta.108"/>
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="MySql.Data" Version="8.3.0" />
<PackageReference Include="MySqlConnector" Version="2.3.5"/>
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 34e8f36

Please sign in to comment.