-Fixed DataTable and DataColumn names not being modified by CamelCasePropertyNamesContractResolver

This commit is contained in:
JamesNK
2011-08-03 00:50:44 +00:00
parent 18c9400054
commit 44ab7f71df
10 changed files with 106 additions and 10 deletions
@@ -26,6 +26,7 @@
#if !SILVERLIGHT
using System;
using System.Data;
using Newtonsoft.Json.Serialization;
namespace Newtonsoft.Json.Converters
{
@@ -43,6 +44,7 @@ namespace Newtonsoft.Json.Converters
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
DataSet dataSet = (DataSet)value;
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
DataTableConverter converter = new DataTableConverter();
@@ -50,7 +52,7 @@ namespace Newtonsoft.Json.Converters
foreach (DataTable table in dataSet.Tables)
{
writer.WritePropertyName(table.TableName);
writer.WritePropertyName((resolver != null) ? resolver.ResolvePropertyName(table.TableName) : table.TableName);
converter.WriteJson(writer, table, serializer);
}
@@ -26,6 +26,7 @@
#if !SILVERLIGHT
using System;
using System.Data;
using Newtonsoft.Json.Serialization;
namespace Newtonsoft.Json.Converters
{
@@ -43,6 +44,7 @@ namespace Newtonsoft.Json.Converters
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
DataTable table = (DataTable)value;
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
writer.WriteStartArray();
@@ -51,7 +53,7 @@ namespace Newtonsoft.Json.Converters
writer.WriteStartObject();
foreach (DataColumn column in row.Table.Columns)
{
writer.WritePropertyName(column.ColumnName);
writer.WritePropertyName((resolver != null) ? resolver.ResolvePropertyName(column.ColumnName) : column.ColumnName);
serializer.Serialize(writer, row[column]);
}
writer.WriteEndObject();