1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 23:42:33 +01:00

Fixed petapoco's craptastic connection management.

This commit is contained in:
kay.one 2011-08-28 10:43:33 -07:00
parent 52e6d09325
commit a5527df584
4 changed files with 47 additions and 27 deletions

View File

@ -45,19 +45,17 @@ namespace NzbDrone.Core.Datastore
public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true)
{
MigrationsHelper.Run(connectionString, true);
var sqliteConnection = new SqlCeConnection(connectionString);
DbConnection connection = sqliteConnection;
if (profiled)
var factory = new PetaDbProviderFactory
{
connection = ProfiledDbConnection.Get(sqliteConnection);
}
IsProfiled = profiled
};
var db = new Database(connection, Database.DBType.SqlServerCE);
db.ForceDateTimesToUtc = false;
if (connection.State != ConnectionState.Open)
connection.Open();
var db = new Database(connectionString, factory, Database.DBType.SqlServerCE)
{
KeepConnectionAlive = true,
ForceDateTimesToUtc = false,
};
return db;
}

View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Data.SqlServerCe;
using System.Linq;
using System.Text;
using MvcMiniProfiler.Data;
namespace NzbDrone.Core.Datastore
{
class PetaDbProviderFactory : DbProviderFactory
{
public Boolean IsProfiled { get; set; }
public override DbConnection CreateConnection()
{
var sqliteConnection = new SqlCeConnection();
DbConnection connection = sqliteConnection;
if (IsProfiled)
{
connection = ProfiledDbConnection.Get(sqliteConnection);
}
return connection;
}
}
}

View File

@ -282,7 +282,7 @@ namespace PetaPoco
{
_sharedConnection = connection;
_connectionString = connection.ConnectionString;
_sharedConnectionDepth = 2; // Prevent closing external connection
_dbType = dbType;
CommonConstruct();
}
@ -294,10 +294,11 @@ namespace PetaPoco
CommonConstruct();
}
public Database(string connectionString, DbProviderFactory provider)
public Database(string connectionString, DbProviderFactory provider, DBType dbType)
{
_connectionString = connectionString;
_factory = provider;
_dbType = dbType;
CommonConstruct();
}
@ -375,6 +376,7 @@ namespace PetaPoco
{
// Automatically close one open connection reference
// (Works with KeepConnectionAlive and manually opening a shared connection)
KeepConnectionAlive = false;
CloseSharedConnection();
}
@ -384,18 +386,14 @@ namespace PetaPoco
// Open a connection (can be nested)
public void OpenSharedConnection()
{
if (_sharedConnectionDepth == 0)
if (_sharedConnection == null || _sharedConnection.State == ConnectionState.Closed || _sharedConnection.State == ConnectionState.Broken)
{
_sharedConnection = _factory.CreateConnection();
_sharedConnection.ConnectionString = _connectionString;
_sharedConnection.Open();
_sharedConnection = OnConnectionOpened(_sharedConnection);
if (KeepConnectionAlive)
_sharedConnectionDepth++; // Make sure you call Dispose
}
_sharedConnectionDepth++;
}
/// <summary>
@ -404,17 +402,13 @@ namespace PetaPoco
// Close a previously opened connection
public void CloseSharedConnection()
{
if (_sharedConnectionDepth > 0)
{
_sharedConnectionDepth--;
if (_sharedConnectionDepth == 0)
if (!KeepConnectionAlive && _sharedConnection != null)
{
OnConnectionClosing(_sharedConnection);
_sharedConnection.Dispose();
_sharedConnection = null;
}
}
}
// Access to our shared connection
public IDbConnection Connection
@ -2530,7 +2524,6 @@ namespace PetaPoco
DbProviderFactory _factory;
IDbConnection _sharedConnection;
IDbTransaction _transaction;
int _sharedConnectionDepth;
int _transactionDepth;
bool _transactionCancelled;
string _lastSql;

View File

@ -178,6 +178,7 @@
<Compile Include="Datastore\CustomeMapper.cs" />
<Compile Include="Datastore\Migrations\Migration20110726.cs" />
<Compile Include="Datastore\Migrations\Migration20110707.cs" />
<Compile Include="Datastore\PetaDbProviderFactory.cs" />
<Compile Include="Fluent.cs" />
<Compile Include="Helpers\EpisodeSortingHelper.cs" />
<Compile Include="Helpers\FileSizeFormatHelpercs.cs" />