Skip to content

Commit c0fd7d2

Browse files
Move to shared - SmiMetaDataProperty (#1320)
1 parent 47ff527 commit c0fd7d2

File tree

9 files changed

+33
-370
lines changed

9 files changed

+33
-370
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@
163163
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs">
164164
<Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs</Link>
165165
</Compile>
166+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
167+
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
168+
</Compile>
166169
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
167170
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
168171
</Compile>
@@ -503,7 +506,6 @@
503506
</EmbeddedResource>
504507
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />
505508
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
506-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
507509
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
508510
<Compile Include="Microsoft\Data\SqlClient\SqlDbColumn.cs" />
509511
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlParameter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
12461246
hasDefault = true;
12471247
}
12481248

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

1266-
sort[i].SortOrdinal = colMeta.SortOrdinal;
1266+
sort[i]._sortOrdinal = colMeta.SortOrdinal;
12671267
sortOrdinalSpecified[colMeta.SortOrdinal] = true;
12681268
if (colMeta.SortOrdinal > maxSortOrdinal)
12691269
{

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10124,11 +10124,11 @@ private void WriteTvpOrderUnique(SmiExtendedMetaData metaData, TdsParserStateObj
1012410124
// Add appropriate SortOrder flag
1012510125
byte flags = 0;
1012610126
SmiOrderProperty.SmiColumnOrder columnOrder = orderProperty[i];
10127-
if (SortOrder.Ascending == columnOrder.Order)
10127+
if (SortOrder.Ascending == columnOrder._order)
1012810128
{
1012910129
flags = TdsEnums.TVP_ORDERASC_FLAG;
1013010130
}
10131-
else if (SortOrder.Descending == columnOrder.Order)
10131+
else if (SortOrder.Descending == columnOrder._order)
1013210132
{
1013310133
flags = TdsEnums.TVP_ORDERDESC_FLAG;
1013410134
}

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@
240240
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ValueUtilsSmi.netfx.cs">
241241
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.netfx.cs</Link>
242242
</Compile>
243+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
244+
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
245+
</Compile>
243246
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
244247
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
245248
</Compile>
@@ -604,7 +607,6 @@
604607
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventStream.cs" />
605608
<Compile Include="Microsoft\Data\SqlClient\Server\SmiExecuteType.cs" />
606609
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
607-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
608610
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
609611
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
610612
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/SmiMetaDataProperty.cs

Lines changed: 0 additions & 310 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlParameter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
12381238
MethodInfo getter = serverTypeNameProperty.GetGetMethod(nonPublic: true);
12391239
SortOrder sortOrder = (SortOrder)getter.Invoke(colMeta, null);
12401240

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

1258-
sort[i].SortOrdinal = colMeta.SortOrdinal;
1258+
sort[i]._sortOrdinal = colMeta.SortOrdinal;
12591259
sortOrdinalSpecified[colMeta.SortOrdinal] = true;
12601260
if (colMeta.SortOrdinal > maxSortOrdinal)
12611261
{

0 commit comments

Comments
 (0)