Skip to content

Move into Shared SqlMetaDataFactory.cs #1315

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
merged 6 commits into from
Oct 18, 2021
Merged

Move into Shared SqlMetaDataFactory.cs #1315

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b345ce
Move the netcore version of SqlMetaDataFactory.cs into shared src and…
lcheunglci Oct 4, 2021
8888c95
Update file to conform to coding style removing IDE1006, IDE1059, IDE…
lcheunglci Oct 4, 2021
c835b9d
Remove sqlmetadatafactory.cs in the netfx src
lcheunglci Oct 6, 2021
9c4a049
Merge branch 'main' into MergeShared-SqlMetadataFactory
lcheunglci Oct 6, 2021
163b837
Resolve merge conflict with csprojs
lcheunglci Oct 16, 2021
b029cea
Fix the linux compiler error with netcore due to case senstitivity wi…
lcheunglci Oct 18, 2021
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
4 changes: 3 additions & 1 deletion 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 @@ -226,6 +226,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -518,7 +521,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlMetadataFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlReferenceCollection.cs" />
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -300,6 +300,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -480,7 +483,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\sqlinternaltransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\sqlmetadatafactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs" />
Expand Down
19 changes: 8 additions & 11 deletions ...soft/Data/SqlClient/SqlMetadataFactory.cs → ...soft/Data/SqlClient/SqlMetadataFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ namespace Microsoft.Data.SqlClient
internal sealed class SqlMetaDataFactory : DbMetaDataFactory
{

private const string _serverVersionNormalized90 = "09.00.0000";
private const string _serverVersionNormalized90782 = "09.00.0782";
private const string _serverVersionNormalized10 = "10.00.0000";
private const string ServerVersionNormalized90 = "09.00.0000";
private const string ServerVersionNormalized10 = "10.00.0000";


public SqlMetaDataFactory(Stream XMLStream,
Expand Down Expand Up @@ -45,15 +44,14 @@ private void addUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnection con
"on assemblies.assembly_id = types.assembly_id ";

// pre 9.0/Yukon servers do not have UDTs
if (0 > string.Compare(ServerVersion, _serverVersionNormalized90, StringComparison.OrdinalIgnoreCase))
if (0 > string.Compare(ServerVersion, ServerVersionNormalized90, StringComparison.OrdinalIgnoreCase))
{
return;
}

// Execute the SELECT statement
SqlCommand command = connection.CreateCommand();
command.CommandText = sqlCommand;
DataRow newRow = null;
DataColumn providerDbtype = dataTypesTable.Columns[DbMetaDataColumnNames.ProviderDbType];
DataColumn columnSize = dataTypesTable.Columns[DbMetaDataColumnNames.ColumnSize];
DataColumn isFixedLength = dataTypesTable.Columns[DbMetaDataColumnNames.IsFixedLength];
Expand Down Expand Up @@ -94,7 +92,7 @@ private void addUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnection con
{

reader.GetValues(values);
newRow = dataTypesTable.NewRow();
DataRow newRow = dataTypesTable.NewRow();

newRow[providerDbtype] = SqlDbType.Udt;

Expand Down Expand Up @@ -123,7 +121,7 @@ private void addUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnection con
(values[versionRevisionIndex] != DBNull.Value))
{

StringBuilder nameString = new StringBuilder();
StringBuilder nameString = new();
nameString.Append(values[assemblyClassIndex].ToString());
nameString.Append(", ");
nameString.Append(values[assemblyNameIndex].ToString());
Expand All @@ -148,7 +146,7 @@ private void addUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnection con

nameString.Append(", PublicKeyToken=");

StringBuilder resultString = new StringBuilder();
StringBuilder resultString = new();
byte[] byteArrayValue = (byte[])values[publicKeyIndex];
foreach (byte b in byteArrayValue)
{
Expand Down Expand Up @@ -179,15 +177,14 @@ private void AddTVPsToDataTypesTable(DataTable dataTypesTable, SqlConnection con

// TODO: update this check once the server upgrades major version number!!!
// pre 9.0/Yukon servers do not have Table types
if (0 > string.Compare(ServerVersion, _serverVersionNormalized10, StringComparison.OrdinalIgnoreCase))
if (0 > string.Compare(ServerVersion, ServerVersionNormalized10, StringComparison.OrdinalIgnoreCase))
{
return;
}

// Execute the SELECT statement
SqlCommand command = connection.CreateCommand();
command.CommandText = sqlCommand;
DataRow newRow = null;
DataColumn providerDbtype = dataTypesTable.Columns[DbMetaDataColumnNames.ProviderDbType];
DataColumn columnSize = dataTypesTable.Columns[DbMetaDataColumnNames.ColumnSize];
DataColumn isSearchable = dataTypesTable.Columns[DbMetaDataColumnNames.IsSearchable];
Expand Down Expand Up @@ -217,7 +214,7 @@ private void AddTVPsToDataTypesTable(DataTable dataTypesTable, SqlConnection con
{

reader.GetValues(values);
newRow = dataTypesTable.NewRow();
DataRow newRow = dataTypesTable.NewRow();

newRow[providerDbtype] = SqlDbType.Structured;

Expand Down