Skip to content

Fix | Build DataTypes table in code, add json data type #3858

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

Merged
apoorvdeshmukh merged 10 commits into from
May 14, 2026
Merged

Fix | Build DataTypes table in code, add json data type #3858

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
de2b12e
Create structure of DataTypes static population
edwardneal Dec 19, 2025
3414a47
Remove redundant data types from metadata
edwardneal Dec 19, 2025
2f907ed
Populate DataTypes table from MetaType information
edwardneal Dec 21, 2025
cb37678
Add test to verify presence of data types
edwardneal Dec 22, 2025
2ac0623
Add json data type to DataTypes schema collection
edwardneal Dec 22, 2025
81aed9d
Use IsJsonSupported more widely
edwardneal Dec 22, 2025
219824b
Plumb minimum version logic to AddStringOrBinaryType
edwardneal Dec 22, 2025
8daf49f
Merge main
edwardneal Jan 22, 2026
ce78109
Merge main
edwardneal May 6, 2026
1215739
Address MARS JSON test failure
edwardneal May 13, 2026
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
3 changes: 3 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.DataTypes.cs">
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.DataTypes.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
<Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
</Compile>
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.DataTypes.cs">
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.DataTypes.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
<Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
</Compile>
Expand Down
438 changes: 438 additions & 0 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs
View file
Open in desktop
Comment thread
paulmedynski marked this conversation as resolved.

Large diffs are not rendered by default.

40 changes: 4 additions & 36 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace Microsoft.Data.SqlClient
{
internal sealed class SqlMetaDataFactory : IDisposable
internal sealed partial class SqlMetaDataFactory : IDisposable
{
// Well-known column names
private const string CollectionNameKey = "CollectionName";
Expand Down Expand Up @@ -689,6 +689,9 @@ private DataSet LoadDataSetFromXml(Stream XmlStream)
{
Locale = CultureInfo.InvariantCulture
};

LoadDataTypesDataTables(metaDataCollectionsDataSet);

XmlReaderSettings settings = new()
{
XmlResolver = null,
Expand Down Expand Up @@ -738,9 +741,6 @@ private DataSet LoadDataSetFromXml(Stream XmlStream)
dataTable = CreateDataSourceInformationDataTable();
rowFixup = FixUpDataSourceInformationRow;
break;
case "DataTypesTable":
dataTable = CreateDataTypesDataTable();
break;
case "ReservedWordsTable":
dataTable = CreateReservedWordsDataTable();
break;
Expand Down Expand Up @@ -874,38 +874,6 @@ private static DataTable CreateDataSourceInformationDataTable()
}
};

private static DataTable CreateDataTypesDataTable()
=> new(DbMetaDataCollectionNames.DataTypes)
{
Columns =
{
new DataColumn(DbMetaDataColumnNames.TypeName, typeof(string)),
new DataColumn(DbMetaDataColumnNames.ProviderDbType, typeof(int)),
new DataColumn(DbMetaDataColumnNames.ColumnSize, typeof(long)),
new DataColumn(DbMetaDataColumnNames.CreateFormat, typeof(string)),
new DataColumn(DbMetaDataColumnNames.CreateParameters, typeof(string)),
new DataColumn(DbMetaDataColumnNames.DataType, typeof(string)),
new DataColumn(DbMetaDataColumnNames.IsAutoIncrementable, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsBestMatch, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsCaseSensitive, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsFixedLength, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsFixedPrecisionScale, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsLong, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsNullable, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsSearchable, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsSearchableWithLike, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.IsUnsigned, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.MaximumScale, typeof(short)),
new DataColumn(DbMetaDataColumnNames.MinimumScale, typeof(short)),
new DataColumn(DbMetaDataColumnNames.IsConcurrencyType, typeof(bool)),
new DataColumn(MaximumVersionKey, typeof(string)),
new DataColumn(MinimumVersionKey, typeof(string)),
new DataColumn(DbMetaDataColumnNames.IsLiteralSupported, typeof(bool)),
new DataColumn(DbMetaDataColumnNames.LiteralPrefix, typeof(string)),
new DataColumn(DbMetaDataColumnNames.LiteralSuffix, typeof(string))
}
};

private static DataTable CreateReservedWordsDataTable()
=> new(DbMetaDataCollectionNames.ReservedWords)
{
Expand Down
Loading
Loading