Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Serialization of DataColumn Type Corrected #27286

Merged
merged 3 commits into from
Feb 21, 2018
Merged

Serialization of DataColumn Type Corrected #27286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c975d
Serialization of dataType Corrected
Anipik Feb 20, 2018
b9b9ad1
throw exception if type not resolvable
Anipik Feb 20, 2018
cbba925
Change Serialization info key
Anipik Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/System.Data.Common/src/System/Data/DataTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,7 @@ internal void SerializeTableSchema(SerializationInfo info, StreamingContext cont
info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.DefaultValue", i), Columns[i].DefaultValue);
info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.ReadOnly", i), Columns[i].ReadOnly);
info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.MaxLength", i), Columns[i].MaxLength);
info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.DataType", i), Columns[i].DataType);

info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.DataType_AssemblyQualifiedName", i), Columns[i].DataType.AssemblyQualifiedName);
info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.XmlDataType", i), Columns[i].XmlDataType);
info.AddValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.SimpleType", i), Columns[i].SimpleType);

Expand Down Expand Up @@ -442,7 +441,8 @@ internal void DeserializeTableSchema(SerializationInfo info, StreamingContext co
dc._columnUri = info.GetString(string.Format(formatProvider, "DataTable.DataColumn_{0}.Namespace", i));
dc.Prefix = info.GetString(string.Format(formatProvider, "DataTable.DataColumn_{0}.Prefix", i));

dc.DataType = (Type)info.GetValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.DataType", i), typeof(Type));
string typeName = (string)info.GetValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.DataType_AssemblyQualifiedName", i), typeof(string));
dc.DataType = Type.GetType(typeName, throwOnError: true);
dc.XmlDataType = (string)info.GetValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.XmlDataType", i), typeof(string));
dc.SimpleType = (SimpleType)info.GetValue(string.Format(formatProvider, "DataTable.DataColumn_{0}.SimpleType", i), typeof(SimpleType));

Expand Down
20 changes: 20 additions & 0 deletions src/System.Data.Common/tests/System/Data/DataTableTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Runtime.Serialization.Formatters.Tests;
using System.Xml;
using Xunit;
Expand Down Expand Up @@ -388,6 +389,25 @@ public void SelectOperators()

}

[Fact]
public void DataColumnTypeSerialization()
{
DataTable dt = new DataTable("MyTable");
DataColumn dc = new DataColumn("dc", typeof(int));
dt.Columns.Add(dc);
dt.RemotingFormat = SerializationFormat.Binary;

DataTable dtDeserialized;
using (MemoryStream ms = new MemoryStream())
{
BinaryFormatter bf = new BinaryFormatter();
bf.Serialize(ms, dt);
ms.Seek(0, SeekOrigin.Begin);
dtDeserialized = (DataTable)bf.Deserialize(ms);
}
Assert.Equal(dc.DataType, dtDeserialized.Columns[0].DataType);
}

[Fact]
public void SelectExceptions()
{
Expand Down