Skip to content

Move to shared - SmiMetaDataProperty #1320

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 8 commits into from
Oct 15, 2021
Merged

Move to shared - SmiMetaDataProperty #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3af003
Move to shared - SmiMetaDataProperty
Kaur-Parminder Oct 6, 2021
e2d58fd
Merge branch 'dotnet:main' into Move-To-Shared-SmiMetaDataProperty
Kaur-Parminder Oct 6, 2021
a3895e2
Addressed review comments
Kaur-Parminder Oct 8, 2021
cf6cf77
Resolve merge conflicts
Kaur-Parminder Oct 8, 2021
4ed35a9
Addressing reviewer's comment
Kaur-Parminder Oct 8, 2021
42245bd
Resolving merge conflict
Kaur-Parminder Oct 14, 2021
57f15a3
Merge branch 'main' into Move-To-Shared-SmiMetaDataProperty
Kaur-Parminder Oct 14, 2021
83eaff0
Resolving merge conflicts
Kaur-Parminder Oct 15, 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 @@ -163,6 +163,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -503,7 +506,6 @@
</EmbeddedResource>
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDbColumn.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
hasDefault = true;
}

sort[i].Order = colMeta.SortOrder;
sort[i]._order = colMeta.SortOrder;
if (SortOrder.Unspecified != colMeta.SortOrder)
{
// SqlMetaData takes care of checking for negative sort ordinals with specified sort order
Expand All @@ -1263,7 +1263,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
throw SQL.DuplicateSortOrdinal(colMeta.SortOrdinal);
}

sort[i].SortOrdinal = colMeta.SortOrdinal;
sort[i]._sortOrdinal = colMeta.SortOrdinal;
sortOrdinalSpecified[colMeta.SortOrdinal] = true;
if (colMeta.SortOrdinal > maxSortOrdinal)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10124,11 +10124,11 @@ private void WriteTvpOrderUnique(SmiExtendedMetaData metaData, TdsParserStateObj
// Add appropriate SortOrder flag
byte flags = 0;
SmiOrderProperty.SmiColumnOrder columnOrder = orderProperty[i];
if (SortOrder.Ascending == columnOrder.Order)
if (SortOrder.Ascending == columnOrder._order)
{
flags = TdsEnums.TVP_ORDERASC_FLAG;
}
else if (SortOrder.Descending == columnOrder.Order)
else if (SortOrder.Descending == columnOrder._order)
{
flags = TdsEnums.TVP_ORDERDESC_FLAG;
}
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 @@ -240,6 +240,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ValueUtilsSmi.netfx.cs">
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.netfx.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -604,7 +607,6 @@
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiExecuteType.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
Expand Down
310 changes: 0 additions & 310 deletions ...Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SmiMetaDataProperty.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
MethodInfo getter = serverTypeNameProperty.GetGetMethod(nonPublic: true);
SortOrder sortOrder = (SortOrder)getter.Invoke(colMeta, null);

sort[i].Order = sortOrder;
sort[i]._order = sortOrder;
if (SortOrder.Unspecified != sortOrder)
{
// SqlMetaData takes care of checking for negative sort ordinals with specified sort order
Expand All @@ -1255,7 +1255,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
throw SQL.DuplicateSortOrdinal(colMeta.SortOrdinal);
}

sort[i].SortOrdinal = colMeta.SortOrdinal;
sort[i]._sortOrdinal = colMeta.SortOrdinal;
sortOrdinalSpecified[colMeta.SortOrdinal] = true;
if (colMeta.SortOrdinal > maxSortOrdinal)
{
Expand Down
Loading