-Removed unused INullable conversion code
This commit is contained in:
@@ -578,7 +578,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_ADO_NET
|
#if HAVE_ADO_NET
|
||||||
// handle DBNull and INullable
|
// handle DBNull
|
||||||
if (initialValue == DBNull.Value)
|
if (initialValue == DBNull.Value)
|
||||||
{
|
{
|
||||||
if (ReflectionUtils.IsNullable(targetType))
|
if (ReflectionUtils.IsNullable(targetType))
|
||||||
@@ -592,14 +592,6 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return ConvertResult.CannotConvertNull;
|
return ConvertResult.CannotConvertNull;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_ADO_NET
|
|
||||||
INullable nullable = initialValue as INullable;
|
|
||||||
if (nullable != null)
|
|
||||||
{
|
|
||||||
value = EnsureTypeAssignable(ToValue(nullable), initialType, targetType);
|
|
||||||
return ConvertResult.Success;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (targetType.IsInterface() || targetType.IsGenericTypeDefinition() || targetType.IsAbstract())
|
if (targetType.IsInterface() || targetType.IsGenericTypeDefinition() || targetType.IsAbstract())
|
||||||
{
|
{
|
||||||
@@ -675,38 +667,6 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
throw new ArgumentException("Could not cast or convert from {0} to {1}.".FormatWith(CultureInfo.InvariantCulture, initialType?.ToString() ?? "{null}", targetType));
|
throw new ArgumentException("Could not cast or convert from {0} to {1}.".FormatWith(CultureInfo.InvariantCulture, initialType?.ToString() ?? "{null}", targetType));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAVE_ADO_NET
|
|
||||||
public static object ToValue(INullable nullableValue)
|
|
||||||
{
|
|
||||||
if (nullableValue == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
else if (nullableValue is SqlInt32)
|
|
||||||
{
|
|
||||||
return ToValue((SqlInt32)nullableValue);
|
|
||||||
}
|
|
||||||
else if (nullableValue is SqlInt64)
|
|
||||||
{
|
|
||||||
return ToValue((SqlInt64)nullableValue);
|
|
||||||
}
|
|
||||||
else if (nullableValue is SqlBoolean)
|
|
||||||
{
|
|
||||||
return ToValue((SqlBoolean)nullableValue);
|
|
||||||
}
|
|
||||||
else if (nullableValue is SqlString)
|
|
||||||
{
|
|
||||||
return ToValue((SqlString)nullableValue);
|
|
||||||
}
|
|
||||||
else if (nullableValue is SqlDateTime)
|
|
||||||
{
|
|
||||||
return ToValue((SqlDateTime)nullableValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ArgumentException("Unsupported INullable type: {0}".FormatWith(CultureInfo.InvariantCulture, nullableValue.GetType()));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
public static bool VersionTryParse(string input, out Version result)
|
public static bool VersionTryParse(string input, out Version result)
|
||||||
{
|
{
|
||||||
#if HAVE_VERSION_TRY_PARSE
|
#if HAVE_VERSION_TRY_PARSE
|
||||||
|
|||||||
Reference in New Issue
Block a user