Skip to content

Commit 9cde0c4

Browse files
johnnyphamjohnnypham
committed
Addressing comments
1 parent 985662f commit 9cde0c4

9 files changed

Lines changed: 16 additions & 65 deletions

File tree

‎doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Transact-SQL `INSERT … SELECT` statement to copy the data.
138138
<Insert>
139139
<param name="index">Integer value of the location within the <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHintCollection" /> at which to insert the new
140140
<see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" />.</param>
141-
<param name="value">
141+
<param name="columnOrderHint">
142142
<see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> object to be inserted in the collection.</param>
143143
<summary>Insert a new <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> at the index specified.</summary>
144144
<remarks>The order in which column order hints can be added is arbitrary.</remarks>
@@ -150,7 +150,7 @@ Transact-SQL `INSERT … SELECT` statement to copy the data.
150150
<remarks>To be added.</remarks>
151151
</Item>
152152
<Remove>
153-
<param name="value">
153+
<param name="columnOrderHint">
154154
<see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> object to be removed from the collection.</param>
155155
<summary>Removes the specified <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> element from the <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHintCollection" />.</summary>
156156
<remarks>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -852,10 +852,6 @@ internal static Exception BulkLoadInvalidOrderHint()
852852
{
853853
return ADP.Argument(System.SRHelper.GetString(SR.SQL_BulkLoadInvalidOrderHint));
854854
}
855-
internal static Exception BulkLoadOrderHintInaccessible()
856-
{
857-
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_BulkLoadOrderHintInaccessible));
858-
}
859855
internal static Exception BulkLoadOrderHintInvalidColumn(string columnName)
860856
{
861857
return ADP.InvalidOperation(string.Format(System.SRHelper.GetString(SR.SQL_BulkLoadOrderHintInvalidColumn), columnName));

‎src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,9 +1866,6 @@
18661866
<data name="SQL_BulkLoadUnspecifiedSortOrder" xml:space="preserve">
18671867
<value>A column order hint cannot have an unspecified sort order.</value>
18681868
</data>
1869-
<data name="SQL_BulkLoadOrderHintInaccessible" xml:space="preserve">
1870-
<value>The order hint collection is in use and cannot be accessed at this time.</value>
1871-
</data>
18721869
<data name="SQL_BulkLoadInvalidOrderHint" xml:space="preserve">
18731870
<value>The given column order hint is not valid.</value>
18741871
</data>
@@ -1878,4 +1875,4 @@
18781875
<data name="SQL_BulkLoadOrderHintInvalidColumn" xml:space="preserve">
18791876
<value>The sorted column '{0}' is not valid in the destination table.</value>
18801877
</data>
1881-
</root>
1878+
</root>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlUtil.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,10 +1005,6 @@ internal static Exception BulkLoadInvalidOrderHint()
10051005
{
10061006
return ADP.Argument(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidOrderHint));
10071007
}
1008-
internal static Exception BulkLoadOrderHintInaccessible()
1009-
{
1010-
return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintInaccessible));
1011-
}
10121008
internal static Exception BulkLoadOrderHintInvalidColumn(string columnName)
10131009
{
10141010
return ADP.InvalidOperation(string.Format(StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintInvalidColumn), columnName));

‎src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4536,13 +4536,10 @@
45364536
<data name="SQL_BulkLoadOrderHintDuplicateColumn" xml:space="preserve">
45374537
<value>The column '{0}' was specified more than once.</value>
45384538
</data>
4539-
<data name="SQL_BulkLoadOrderHintInaccessible" xml:space="preserve">
4540-
<value>The order hint collection is in use and cannot be accessed at this time.</value>
4541-
</data>
45424539
<data name="SQL_BulkLoadOrderHintInvalidColumn" xml:space="preserve">
45434540
<value>The sorted column '{0}' is not valid in the destination table.</value>
45444541
</data>
45454542
<data name="SQL_BulkLoadUnspecifiedSortOrder" xml:space="preserve">
45464543
<value>A column order hint cannot have an unspecified sort order.</value>
45474544
</data>
4548-
</root>
4545+
</root>

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopyColumnOrderHintCollection.cs‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ namespace Microsoft.Data.SqlClient
1111
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/SqlBulkCopyColumnOrderHintCollection/*'/>
1212
public sealed class SqlBulkCopyColumnOrderHintCollection : CollectionBase
1313
{
14-
internal bool ReadOnly { get; set; }
15-
1614
private readonly HashSet<string> _columnNames = new HashSet<string>();
1715

1816
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Item/*'/>
@@ -21,10 +19,9 @@ public sealed class SqlBulkCopyColumnOrderHintCollection : CollectionBase
2119
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Add[@name="columnOrderHintParameter"]/*'/>
2220
public SqlBulkCopyColumnOrderHint Add(SqlBulkCopyColumnOrderHint columnOrderHint)
2321
{
24-
AssertWriteAccess();
2522
if (columnOrderHint == null)
2623
{
27-
throw new ArgumentNullException();
24+
throw new ArgumentNullException(nameof(columnOrderHint));
2825
}
2926
if (string.IsNullOrEmpty(columnOrderHint.Column) ||
3027
columnOrderHint.SortOrder == SortOrder.Unspecified)
@@ -39,22 +36,12 @@ public SqlBulkCopyColumnOrderHint Add(SqlBulkCopyColumnOrderHint columnOrderHint
3936
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Add[@name="columnStringAndsortOrderSortOrder"]/*'/>
4037
public SqlBulkCopyColumnOrderHint Add(string column, SortOrder sortOrder)
4138
{
42-
AssertWriteAccess();
4339
return Add(new SqlBulkCopyColumnOrderHint(column, sortOrder));
4440
}
4541

46-
private void AssertWriteAccess()
47-
{
48-
if (ReadOnly)
49-
{
50-
throw SQL.BulkLoadOrderHintInaccessible();
51-
}
52-
}
53-
5442
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Clear/*'/>
5543
public new void Clear()
5644
{
57-
AssertWriteAccess();
5845
foreach (SqlBulkCopyColumnOrderHint orderHint in InnerList)
5946
{
6047
UnregisterColumnName(orderHint, orderHint.Column);
@@ -72,38 +59,35 @@ private void AssertWriteAccess()
7259
public int IndexOf(SqlBulkCopyColumnOrderHint value) => InnerList.IndexOf(value);
7360

7461
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Insert/*'/>
75-
public void Insert(int index, SqlBulkCopyColumnOrderHint value)
62+
public void Insert(int index, SqlBulkCopyColumnOrderHint columnOrderHint)
7663
{
77-
AssertWriteAccess();
7864
// Try inserting into an invalid index to throw an exception
7965
if (index < 0 || index > InnerList.Count)
8066
{
81-
InnerList.Insert(index, value);
67+
InnerList.Insert(index, columnOrderHint);
8268
}
83-
if (value == null)
69+
if (columnOrderHint == null)
8470
{
85-
throw new ArgumentNullException();
71+
throw new ArgumentNullException(nameof(columnOrderHint));
8672
}
87-
RegisterColumnName(value, value.Column);
88-
InnerList.Insert(index, value);
73+
RegisterColumnName(columnOrderHint, columnOrderHint.Column);
74+
InnerList.Insert(index, columnOrderHint);
8975
}
9076

9177
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Remove/*'/>
92-
public void Remove(SqlBulkCopyColumnOrderHint value)
78+
public void Remove(SqlBulkCopyColumnOrderHint columnOrderHint)
9379
{
94-
AssertWriteAccess();
95-
if (value == null)
80+
if (columnOrderHint == null)
9681
{
97-
throw new ArgumentNullException();
82+
throw new ArgumentNullException(nameof(columnOrderHint));
9883
}
99-
UnregisterColumnName(value, value.Column);
100-
InnerList.Remove(value);
84+
UnregisterColumnName(columnOrderHint, columnOrderHint.Column);
85+
InnerList.Remove(columnOrderHint);
10186
}
10287

10388
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/RemoveAt/*'/>
10489
public new void RemoveAt(int index)
10590
{
106-
AssertWriteAccess();
10791
var orderHint = (SqlBulkCopyColumnOrderHint)InnerList[index];
10892
UnregisterColumnName(orderHint, orderHint.Column);
10993
base.RemoveAt(index);

‎src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlBulkCopyColumnOrderHintCollectionTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ private static SqlBulkCopyColumnOrderHintCollection CreateCollection(params SqlB
2323

2424
foreach (SqlBulkCopyColumnOrderHint orderHint in orderHints)
2525
{
26-
Debug.Assert(orderHints != null);
2726
collection.Add(orderHint);
2827
}
2928

0 commit comments

Comments
 (0)