-Formatting

-Build
This commit is contained in:
James Newton-King
2015-12-04 23:54:38 +13:00
parent c96779dc10
commit eb0cbd6a75
334 changed files with 3952 additions and 514 deletions
@@ -508,7 +508,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(new System.Data.SqlTypes.SqlDateTime(2015, 11, 28), ds.TestTable[0].DateTimeValue);
Assert.AreEqual(System.Data.SqlTypes.SqlDateTime.Null, ds.TestTable[1].DateTimeValue);
string json2 = JsonConvert.SerializeObject(ds, Formatting.Indented, new SqlDateTimeConverter());
StringAssert.AreEqual(json, json2);
@@ -524,20 +524,29 @@ namespace Newtonsoft.Json.Tests.Converters
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
if (reader.Value == null || reader.Value == DBNull.Value)
{
return System.Data.SqlTypes.SqlDateTime.Null;
}
else
{
return new System.Data.SqlTypes.SqlDateTime((DateTime)serializer.Deserialize(reader));
}
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
if (((System.Data.SqlTypes.SqlDateTime)value).IsNull)
{
writer.WriteNull();
}
else
{
writer.WriteValue(((System.Data.SqlTypes.SqlDateTime)value).Value);
}
}
}
#endif
}
}
#endif