DataTableConverter is using Serializer for cell data.

This commit is contained in:
pischke
2015-03-26 23:17:27 +01:00
parent c565d56fdf
commit 00bbd96718
7 changed files with 700 additions and 4 deletions
@@ -102,7 +102,7 @@ namespace Newtonsoft.Json.Converters
while (reader.TokenType != JsonToken.EndArray)
{
CreateRow(reader, dt);
CreateRow(reader, dt, serializer);
CheckedRead(reader);
}
@@ -110,7 +110,7 @@ namespace Newtonsoft.Json.Converters
return dt;
}
private static void CreateRow(JsonReader reader, DataTable dt)
private static void CreateRow(JsonReader reader, DataTable dt, JsonSerializer serializer)
{
DataRow dr = dt.NewRow();
CheckedRead(reader);
@@ -138,7 +138,7 @@ namespace Newtonsoft.Json.Converters
while (reader.TokenType != JsonToken.EndArray)
{
CreateRow(reader, nestedDt);
CreateRow(reader, nestedDt, serializer);
CheckedRead(reader);
}
@@ -165,7 +165,7 @@ namespace Newtonsoft.Json.Converters
}
else
{
dr[columnName] = reader.Value ?? DBNull.Value;
dr[columnName] = reader.Value != null ? serializer.Deserialize(reader, column.DataType) : DBNull.Value;
}
CheckedRead(reader);