replaced compile time with runtime mono check.

This commit is contained in:
kay.one 2013-02-16 14:24:58 -08:00
parent 88b06e8747
commit 2873fc9f6d
7 changed files with 35 additions and 30 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

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,19 @@ 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");
, "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
}
@ -83,9 +78,10 @@ namespace NzbDrone.Core.Datastore
public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true)
{
#if __MonoCS__
if (EnvironmentProvider.IsMono)
{
throw new NotSupportedException("SqlCe is not supported in mono");
#endif
}
lock (initilized)
{

View File

@ -1,6 +1,5 @@
using System.Linq;
using System;
using System.IO;
using System.Reflection;
using NLog;
@ -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");
@ -45,7 +42,10 @@ namespace NzbDrone.Core.Datastore
private static void EnsureDatabase(string constr)
{
var proxyType = Assembly.Load("NzbDrone.SqlCe").GetExportedTypes()[0];
var instance = Activator.CreateInstance(proxyType);
var factoryMethod = proxyType.GetMethod("EnsureDatabase");
factoryMethod.Invoke(instance, new object[] { constr });
}
public static string GetIndexName(string tableName, params string[] columns)

View File

@ -6,13 +6,13 @@ namespace NzbDrone.SqlCe
{
public class SqlCeProxy
{
public void EnsureDatabase(string constr)
public void 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();
}
}