Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update DataSetConverter.cs #2818

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

Update DataSetConverter.cs #2818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions Src/Newtonsoft.Json/Converters/DataSetConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
DataSet ds = (objectType == typeof(DataSet))
? new DataSet()
: (DataSet)Activator.CreateInstance(objectType)!;

ds.EnforceConstraints = false; // necessary in case the typed dataset contains foreign key constraints and the tables were serialized out of order

DataTableConverter converter = new DataTableConverter();

reader.ReadAndAssert();
Expand All @@ -105,6 +106,9 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
reader.ReadAndAssert();
}

// once all tables are populated there should be no foreign key constraint violations so reset EnforceConstraints
ds.EnforceConstraints = true;

return ds;
}

Expand All @@ -122,4 +126,4 @@ public override bool CanConvert(Type valueType)
}
}

#endif
#endif