Fixed enum mapping issue

pull/3113/head
kay.one 14 years ago
parent 0e86653d8a
commit 5629d68645

@ -23,17 +23,6 @@ namespace NzbDrone.Core.Test.Framework
get { return new[] { "c:\\tv\\the simpsons", "c:\\tv\\family guy", "c:\\tv\\southpark", "c:\\tv\\24" }; }
}
public static ConfigProvider StandardConfig
{
get
{
var mock = new Mock<ConfigProvider>();
mock.SetupGet(c => c.SeriesRoot).Returns("C:\\");
return mock.Object;
}
}
public static IDatabase GetEmptyDatabase(bool enableLogging = false, string fileName = "")
{
Console.WriteLine("Creating an empty PetaPoco database");
@ -83,14 +72,5 @@ namespace NzbDrone.Core.Test.Framework
.With(c => c.CleanTitle = Parser.NormalizeTitle(title))
.Build();
}
public static IList<Episode> GetFakeEpisodes(int seriesId)
{
var epNumber = new SequentialGenerator<int>();
return Builder<Episode>.CreateListOfSize(10)
.WhereAll().Have(c => c.SeriesId = seriesId)
.WhereAll().Have(c => c.EpisodeNumber = epNumber.Generate())
.Build();
}
}
}

@ -5,10 +5,10 @@ namespace NzbDrone.Core.Datastore
{
public class CustomeMapper : DefaultMapper
{
public override Func<object, object> GetFromDbConverter(DestinationInfo destinationInfo, Type SourceType)
public override Func<object, object> GetFromDbConverter(DestinationInfo destinationInfo, Type sourceType)
{
if ((SourceType == typeof(Int32) || SourceType == typeof(Int64)) && destinationInfo.Type.IsGenericType && destinationInfo.Type.GetGenericTypeDefinition() == typeof(Nullable<>))
if ((sourceType == typeof(Int32) || sourceType == typeof(Int64)) && destinationInfo.Type.IsGenericType && destinationInfo.Type.GetGenericTypeDefinition() == typeof(Nullable<>))
{
// If it is NULLABLE, then get the underlying type. eg if "Nullable<int>" then this will return just "int"
Type genericArgument = destinationInfo.Type.GetGenericArguments()[0];
@ -18,31 +18,19 @@ namespace NzbDrone.Core.Datastore
{
int value;
Int32.TryParse(s.ToString(), out value);
if (value == 0)
{
return null;
}
return (Nullable<DayOfWeek>)value;
return (DayOfWeek?)value;
};
}
else
{
return delegate(object s)
{
int value;
Int32.TryParse(s.ToString(), out value);
if (value == 0)
{
return null;
}
return value;
};
}
return delegate(object s)
{
int value;
Int32.TryParse(s.ToString(), out value);
return value;
};
}
return base.GetFromDbConverter(destinationInfo, SourceType);
return base.GetFromDbConverter(destinationInfo, sourceType);
}
}
}

Binary file not shown.
Loading…
Cancel
Save