Skip to content

Commit

Permalink
Addressing comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnnypham
johnnypham committed May 29, 2020
1 parent 985662f commit 9cde0c4
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 65 deletions.
4 changes: 2 additions & 2 deletions doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Transact-SQL `INSERT … SELECT` statement to copy the data.
<Insert>
<param name="index">Integer value of the location within the <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHintCollection" /> at which to insert the new
<see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" />.</param>
<param name="value">
<param name="columnOrderHint">
<see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> object to be inserted in the collection.</param>
<summary>Insert a new <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> at the index specified.</summary>
<remarks>The order in which column order hints can be added is arbitrary.</remarks>
Expand All @@ -150,7 +150,7 @@ Transact-SQL `INSERT … SELECT` statement to copy the data.
<remarks>To be added.</remarks>
</Item>
<Remove>
<param name="value">
<param name="columnOrderHint">
<see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> object to be removed from the collection.</param>
<summary>Removes the specified <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHint" /> element from the <see cref="T:Microsoft.Data.SqlClient.SqlBulkCopyColumnOrderHintCollection" />.</summary>
<remarks>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,10 +852,6 @@ internal static Exception BulkLoadInvalidOrderHint()
{
return ADP.Argument(System.SRHelper.GetString(SR.SQL_BulkLoadInvalidOrderHint));
}
internal static Exception BulkLoadOrderHintInaccessible()
{
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_BulkLoadOrderHintInaccessible));
}
internal static Exception BulkLoadOrderHintInvalidColumn(string columnName)
{
return ADP.InvalidOperation(string.Format(System.SRHelper.GetString(SR.SQL_BulkLoadOrderHintInvalidColumn), columnName));
Expand Down
9 changes: 0 additions & 9 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1866,9 +1866,6 @@
<data name="SQL_BulkLoadUnspecifiedSortOrder" xml:space="preserve">
<value>A column order hint cannot have an unspecified sort order.</value>
</data>
<data name="SQL_BulkLoadOrderHintInaccessible" xml:space="preserve">
<value>The order hint collection is in use and cannot be accessed at this time.</value>
</data>
<data name="SQL_BulkLoadInvalidOrderHint" xml:space="preserve">
<value>The given column order hint is not valid.</value>
</data>
Expand All @@ -1878,4 +1875,4 @@
<data name="SQL_BulkLoadOrderHintInvalidColumn" xml:space="preserve">
<value>The sorted column '{0}' is not valid in the destination table.</value>
</data>
</root>
</root>
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,10 +1005,6 @@ internal static Exception BulkLoadInvalidOrderHint()
{
return ADP.Argument(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidOrderHint));
}
internal static Exception BulkLoadOrderHintInaccessible()
{
return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintInaccessible));
}
internal static Exception BulkLoadOrderHintInvalidColumn(string columnName)
{
return ADP.InvalidOperation(string.Format(StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintInvalidColumn), columnName));
Expand Down
9 changes: 0 additions & 9 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4536,13 +4536,10 @@
<data name="SQL_BulkLoadOrderHintDuplicateColumn" xml:space="preserve">
<value>The column '{0}' was specified more than once.</value>
</data>
<data name="SQL_BulkLoadOrderHintInaccessible" xml:space="preserve">
<value>The order hint collection is in use and cannot be accessed at this time.</value>
</data>
<data name="SQL_BulkLoadOrderHintInvalidColumn" xml:space="preserve">
<value>The sorted column '{0}' is not valid in the destination table.</value>
</data>
<data name="SQL_BulkLoadUnspecifiedSortOrder" xml:space="preserve">
<value>A column order hint cannot have an unspecified sort order.</value>
</data>
</root>
</root>
40 changes: 12 additions & 28 deletions ...osoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopyColumnOrderHintCollection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ namespace Microsoft.Data.SqlClient
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/SqlBulkCopyColumnOrderHintCollection/*'/>
public sealed class SqlBulkCopyColumnOrderHintCollection : CollectionBase
{
internal bool ReadOnly { get; set; }

private readonly HashSet<string> _columnNames = new HashSet<string>();

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Item/*'/>
Expand All @@ -21,10 +19,9 @@ public sealed class SqlBulkCopyColumnOrderHintCollection : CollectionBase
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Add[@name="columnOrderHintParameter"]/*'/>
public SqlBulkCopyColumnOrderHint Add(SqlBulkCopyColumnOrderHint columnOrderHint)
{
AssertWriteAccess();
if (columnOrderHint == null)
{
throw new ArgumentNullException();
throw new ArgumentNullException(nameof(columnOrderHint));
}
if (string.IsNullOrEmpty(columnOrderHint.Column) ||
columnOrderHint.SortOrder == SortOrder.Unspecified)
Expand All @@ -39,22 +36,12 @@ public SqlBulkCopyColumnOrderHint Add(SqlBulkCopyColumnOrderHint columnOrderHint
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Add[@name="columnStringAndsortOrderSortOrder"]/*'/>
public SqlBulkCopyColumnOrderHint Add(string column, SortOrder sortOrder)
{
AssertWriteAccess();
return Add(new SqlBulkCopyColumnOrderHint(column, sortOrder));
}

private void AssertWriteAccess()
{
if (ReadOnly)
{
throw SQL.BulkLoadOrderHintInaccessible();
}
}

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Clear/*'/>
public new void Clear()
{
AssertWriteAccess();
foreach (SqlBulkCopyColumnOrderHint orderHint in InnerList)
{
UnregisterColumnName(orderHint, orderHint.Column);
Expand All @@ -72,38 +59,35 @@ private void AssertWriteAccess()
public int IndexOf(SqlBulkCopyColumnOrderHint value) => InnerList.IndexOf(value);

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Insert/*'/>
public void Insert(int index, SqlBulkCopyColumnOrderHint value)
public void Insert(int index, SqlBulkCopyColumnOrderHint columnOrderHint)
{
AssertWriteAccess();
// Try inserting into an invalid index to throw an exception
if (index < 0 || index > InnerList.Count)
{
InnerList.Insert(index, value);
InnerList.Insert(index, columnOrderHint);
}
if (value == null)
if (columnOrderHint == null)
{
throw new ArgumentNullException();
throw new ArgumentNullException(nameof(columnOrderHint));
}
RegisterColumnName(value, value.Column);
InnerList.Insert(index, value);
RegisterColumnName(columnOrderHint, columnOrderHint.Column);
InnerList.Insert(index, columnOrderHint);
}

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/Remove/*'/>
public void Remove(SqlBulkCopyColumnOrderHint value)
public void Remove(SqlBulkCopyColumnOrderHint columnOrderHint)
{
AssertWriteAccess();
if (value == null)
if (columnOrderHint == null)
{
throw new ArgumentNullException();
throw new ArgumentNullException(nameof(columnOrderHint));
}
UnregisterColumnName(value, value.Column);
InnerList.Remove(value);
UnregisterColumnName(columnOrderHint, columnOrderHint.Column);
InnerList.Remove(columnOrderHint);
}

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml' path='docs/members[@name="SqlBulkCopyColumnOrderHintCollection"]/RemoveAt/*'/>
public new void RemoveAt(int index)
{
AssertWriteAccess();
var orderHint = (SqlBulkCopyColumnOrderHint)InnerList[index];
UnregisterColumnName(orderHint, orderHint.Column);
base.RemoveAt(index);
Expand Down
1 change: 0 additions & 1 deletion ...icrosoft.Data.SqlClient/tests/FunctionalTests/SqlBulkCopyColumnOrderHintCollectionTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ private static SqlBulkCopyColumnOrderHintCollection CreateCollection(params SqlB

foreach (SqlBulkCopyColumnOrderHint orderHint in orderHints)
{
Debug.Assert(orderHints != null);
collection.Add(orderHint);
}

Expand Down

0 comments on commit 9cde0c4

Please sign in to comment.