This commit is contained in:
kay.one 2013-02-16 15:29:21 -08:00
parent 6c289f4482
commit 2903d5d581
11 changed files with 78 additions and 39 deletions

View File

@ -36,6 +36,11 @@ namespace NzbDrone.Common
}
}
public static bool IsMono
{
get { return Type.GetType("Mono.Runtime") != null; }
}
public static bool IsDebug
{
get
@ -60,6 +65,12 @@ namespace NzbDrone.Common
{
get
{
if(IsMono)
{
return AppDomain.CurrentDomain.BaseDirectory;
}
string applicationPath;
applicationPath = CrawlToRoot(StartUpPath);

View File

@ -5,6 +5,7 @@ using Autofac;
using FluentAssertions;
using NCrunch.Framework;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Jobs;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.ExternalNotification;
@ -28,9 +29,10 @@ namespace NzbDrone.Core.Test
public CentralDispatchFixture()
{
#if __MonoCS__
throw new IgnoreException("SqlCe is not supported");
#endif
if (EnvironmentProvider.IsMono)
{
throw new IgnoreException("SqlCe is not supported");
}
InitLogging();
var dispatch = new CentralDispatch();

View File

@ -1,6 +1,7 @@
using System;
using System.IO;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers.Core;
@ -16,10 +17,10 @@ namespace NzbDrone.Core.Test.Framework
[SetUp]
public void CoreTestSetup()
{
#if __MonoCS__
throw new IgnoreException("SqlCe is not supported in mono.");
#endif
if (EnvironmentProvider.IsMono)
{
throw new IgnoreException("SqlCe is not supported in mono.");
}
if (NCrunch.Framework.NCrunchEnvironment.NCrunchIsResident())
{

View File

@ -440,8 +440,9 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PreBuildEvent>if not exist "$(TargetDir)x86" md "$(TargetDir)x86"
xcopy /s /y "$(SolutionDir)\SqlCe\*.*" "$(TargetDir)"</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>if not exist "$(TargetDir)x86" md "$(TargetDir)x86"

View File

@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data.Common;
using System.Data.OleDb;
using System.Data.SqlClient;
using System.Reflection;
using NLog;
using NzbDrone.Common;
@ -21,22 +19,16 @@ namespace NzbDrone.Core.Datastore
{
Database.Mapper = new CustomeMapper();
#if __MonoCS__
#else
if (EnvironmentProvider.IsMono) return;
var dataSet = (System.Data.DataSet)ConfigurationManager.GetSection("system.data");
dataSet.Tables[0].Rows.Add("Microsoft SQL Server Compact Data Provider 4.0"
, "System.Data.SqlServerCe.4.0"
, ".NET Framework Data Provider for Microsoft SQL Server Compact"
, "System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91");
var proxyType = Assembly.Load("NzbDrone.SqlCe").GetExportedTypes()[0];
var instance = Activator.CreateInstance(proxyType);
var factoryMethod = proxyType.GetMethod("GetSqlCeProviderFactory");
_factory = (DbProviderFactory)factoryMethod.Invoke(instance, null);
#endif
, "System.Data.SqlServerCe.4.0"
, ".NET Framework Data Provider for Microsoft SQL Server Compact"
,
"System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91");
_factory = SqlCeProxy.GetSqlCeProviderFactory();
}
@ -83,9 +75,10 @@ namespace NzbDrone.Core.Datastore
public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true)
{
#if __MonoCS__
throw new NotSupportedException("SqlCe is not supported in mono");
#endif
if (EnvironmentProvider.IsMono)
{
throw new NotSupportedException("SqlCe is not supported in mono");
}
lock (initilized)
{

View File

@ -1,6 +1,8 @@
using System;
using System.Data.Common;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
using Migrator.Framework;
using NzbDrone.Common;
@ -35,8 +37,8 @@ namespace NzbDrone.Core.Datastore.Migrations
protected EloqueraDb GetObjectDb()
{
var sqlCeConnection = new SqlConnection(Database.ConnectionString);
var sqlCeConnection = SqlCeProxy.EnsureDatabase(Database.ConnectionString);
var eqPath = sqlCeConnection.Database.Replace(".sdf", ".eq");
return new EloqueraDbFactory(new EnvironmentProvider()).Create(eqPath);
}

View File

@ -1,6 +1,5 @@
using System.Linq;
using System;
using System.IO;
using System.Reflection;
using NLog;
@ -13,7 +12,7 @@ namespace NzbDrone.Core.Datastore
public static void Run(string connectionString, bool trace)
{
EnsureDatabase(connectionString);
SqlCeProxy.EnsureDatabase(connectionString);
logger.Trace("Preparing to run database migration");
@ -29,8 +28,6 @@ namespace NzbDrone.Core.Datastore
migrator = new Migrator.Migrator("sqlserverce", connectionString, Assembly.GetAssembly(typeof(MigrationsHelper)));
}
migrator.MigrateToLastVersion();
logger.Info("Database migration completed");
@ -43,10 +40,7 @@ namespace NzbDrone.Core.Datastore
}
}
private static void EnsureDatabase(string constr)
{
}
public static string GetIndexName(string tableName, params string[] columns)
{

View File

@ -0,0 +1,32 @@
using System;
using System.Data.Common;
using System.Linq;
using System.Reflection;
namespace NzbDrone.Core.Datastore
{
public static class SqlCeProxy
{
private static readonly object instance;
private static readonly Type proxyType;
static SqlCeProxy()
{
proxyType = Assembly.Load("NzbDrone.SqlCe").GetExportedTypes()[0];
instance = Activator.CreateInstance(proxyType);
}
public static DbConnection EnsureDatabase(string connectionString)
{
var factoryMethod = proxyType.GetMethod("EnsureDatabase");
return (DbConnection)factoryMethod.Invoke(instance, new object[] { connectionString });
}
public static DbProviderFactory GetSqlCeProviderFactory()
{
var factoryMethod = proxyType.GetMethod("GetSqlCeProviderFactory");
return (DbProviderFactory)factoryMethod.Invoke(instance, null);
}
}
}

View File

@ -297,6 +297,7 @@
<Compile Include="Datastore\Migrations\SchemaInfo.cs" />
<Compile Include="Datastore\PetaPoco\EpisodeSeasonRelator.cs" />
<Compile Include="Datastore\PetaPoco\PetaPoco.cs" />
<Compile Include="Datastore\SqlCeProxy.cs" />
<Compile Include="Fluent.cs" />
<Compile Include="Helpers\Converters\EpochDateTimeConverter.cs" />
<Compile Include="Helpers\SabnzbdQueueTimeConverter.cs" />

View File

@ -6,15 +6,17 @@ namespace NzbDrone.SqlCe
{
public class SqlCeProxy
{
public void EnsureDatabase(string constr)
public SqlCeConnection EnsureDatabase(string connectionString)
{
var connection = new SqlCeConnection(constr);
var connection = new SqlCeConnection(connectionString);
if (!File.Exists(connection.Database))
{
var engine = new SqlCeEngine(constr);
var engine = new SqlCeEngine(connectionString);
engine.CreateDatabase();
}
return connection;
}
public DbProviderFactory GetSqlCeProviderFactory()

Binary file not shown.