yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix database debugging tools

Browse Source
This commit is contained in:
Stephan
2018-05-30 16:40:25 +02:00
parent 632e401d33
commit 825f785a2b
4 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
View File

@@ -5,6 +5,7 @@ using System.Data.SqlClient;
using System.Data.SqlServerCe;
using System.Linq;
using MySql.Data.MySqlClient;
using StackExchange.Profiling.Data;
using Umbraco.Core.Composing;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence.FaultHandling;
@@ -78,18 +79,13 @@ namespace Umbraco.Core.Persistence
/// OnConnectionOpened); this unwraps and returns the original database connection.</remarks>
internal static IDbConnection UnwrapUmbraco(this IDbConnection connection)
{
IDbConnection unwrapped;
var c = connection;
var unwrapped = connection;
IDbConnection c;
do
{
unwrapped = c;
var profiled = unwrapped as StackExchange.Profiling.Data.ProfiledDbConnection;
if (profiled != null) unwrapped = profiled.InnerConnection;
var retrying = unwrapped as RetryDbConnection;
if (retrying != null) unwrapped = retrying.Inner;
c = unwrapped;
if (unwrapped is ProfiledDbConnection profiled) unwrapped = profiled.InnerConnection;
if (unwrapped is RetryDbConnection retrying) unwrapped = retrying.Inner;
} while (c != unwrapped);
@@ -100,22 +96,23 @@ namespace Umbraco.Core.Persistence
{
try
{
if (connection is SqlConnection)
switch (connection)
{
var builder = new SqlConnectionStringBuilder(connection.ConnectionString);
return $"DataSource: {builder.DataSource}, InitialCatalog: {builder.InitialCatalog}";
}
if (connection is SqlCeConnection)
{
var builder = new SqlCeConnectionStringBuilder(connection.ConnectionString);
return $"DataSource: {builder.DataSource}";
}
if (connection is MySqlConnection)
{
var builder = new MySqlConnectionStringBuilder(connection.ConnectionString);
return $"Server: {builder.Server}, Database: {builder.Database}";
case SqlConnection _:
{
var builder = new SqlConnectionStringBuilder(connection.ConnectionString);
return $"DataSource: {builder.DataSource}, InitialCatalog: {builder.InitialCatalog}";
}
case SqlCeConnection _:
{
var builder = new SqlCeConnectionStringBuilder(connection.ConnectionString);
return $"DataSource: {builder.DataSource}";
}
case MySqlConnection _:
{
var builder = new MySqlConnectionStringBuilder(connection.ConnectionString);
return $"Server: {builder.Server}, Database: {builder.Database}";
}
}
}
catch (Exception ex)