Skip to content
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

Improve truncation error message #258

Merged
merged 6 commits into from
Oct 22, 2019
Merged

Improve truncation error message #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bed2d61
Improve truncation error message, fixes #256
Suchiman Oct 11, 2019
b5f530b
Improve netfx truncation message as well
Suchiman Oct 12, 2019
f0f1ece
Match SQL Servers truncation behavior
Suchiman Oct 15, 2019
804ecfc
Add comment about truncation limit
Suchiman Oct 15, 2019
3973cd1
Do not output truncated value if column is encrypted
Suchiman Oct 17, 2019
fb4ef35
Fix typo
Suchiman Oct 17, 2019
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
17 changes: 14 additions & 3 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,10 +1518,21 @@ private object ConvertValue(object value, _SqlMetaData metadata, bool isNull, re
value = SqlParameter.CoerceValue(value, mt, out coercedToDataFeed, out typeChanged, false);
if (!coercedToDataFeed)
{ // We do not need to test for TextDataFeed as it is only assigned to (N)VARCHAR(MAX)
int len = ((isSqlType) && (!typeChanged)) ? ((SqlString)value).Value.Length : ((string)value).Length;
if (len > length / 2)
string str = ((isSqlType) && (!typeChanged)) ? ((SqlString)value).Value : ((string)value);
int maxStringLength = length / 2;
if (str.Length > maxStringLength)
{
throw SQL.BulkLoadStringTooLong();
if (metadata.isEncrypted)
{
str = "<encrypted>";
}
else
{
// We truncate to at most 100 characters to match SQL Servers behavior as described in
// https://blogs.msdn.microsoft.com/sql_server_team/string-or-binary-data-would-be-truncated-replacing-the-infamous-error-8152/
str = str.Remove(Math.Min(maxStringLength, 100));
}
throw SQL.BulkLoadStringTooLong(_destinationTableName, metadata.column, str);
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
}
}
break;
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,9 +822,9 @@ internal static Exception BulkLoadNonMatchingColumnName(string columnName, Excep
{
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_BulkLoadNonMatchingColumnName, columnName), e);
}
internal static Exception BulkLoadStringTooLong()
internal static Exception BulkLoadStringTooLong(string tableName, string columnName, string truncatedValue)
{
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_BulkLoadStringTooLong));
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_BulkLoadStringTooLong, tableName, columnName, truncatedValue));
}
internal static Exception BulkLoadInvalidVariantValue()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@
<value>The given ColumnName '{0}' does not match up with any column in data source.</value>
</data>
<data name="SQL_BulkLoadStringTooLong" xml:space="preserve">
<value>String or binary data would be truncated.</value>
<value>String or binary data would be truncated in table '{0}', column '{1}'. Truncated value: '{2}'.</value>
</data>
<data name="SQL_BulkLoadInvalidTimeout" xml:space="preserve">
<value>Timeout Value '{0}' is less than 0.</value>
Expand Down
19 changes: 15 additions & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,11 +1669,22 @@ private object ConvertValue(object value, _SqlMetaData metadata, bool isNull, re
mt = MetaType.GetMetaTypeFromSqlDbType(type.SqlDbType, false);
value = SqlParameter.CoerceValue(value, mt, out coercedToDataFeed, out typeChanged, false);
if (!coercedToDataFeed)
{ // We do not need to test for TextDataFeed as it is only assigned to (N)VARCHAR(MAX)
int len = ((isSqlType) && (!typeChanged)) ? ((SqlString)value).Value.Length : ((string)value).Length;
if (len > length / 2)
{ // We do not need to test for TextDataFeed as it is only assigned to (N)VARCHAR(MAX)
string str = ((isSqlType) && (!typeChanged)) ? ((SqlString)value).Value : ((string)value);
int maxStringLength = length / 2;
if (str.Length > maxStringLength)
{
throw SQL.BulkLoadStringTooLong();
if (metadata.isEncrypted)
{
str = "<encrypted>";
}
else
{
// We truncate to at most 100 characters to match SQL Servers behavior as described in
// https://blogs.msdn.microsoft.com/sql_server_team/string-or-binary-data-would-be-truncated-replacing-the-infamous-error-8152/
str = str.Remove(Math.Min(maxStringLength, 100));
}
throw SQL.BulkLoadStringTooLong(_destinationTableName, metadata.column, str);
}
}
break;
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,9 +975,9 @@ static internal Exception BulkLoadNonMatchingColumnName(string columnName, Excep
{
return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadNonMatchingColumnName, columnName), e);
}
static internal Exception BulkLoadStringTooLong()
static internal Exception BulkLoadStringTooLong(string tableName, string columnName, string truncatedValue)
{
return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadStringTooLong));
return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadStringTooLong, tableName, columnName, truncatedValue));
}
static internal Exception BulkLoadInvalidVariantValue()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2818,7 +2818,7 @@
<value>The given ColumnName '{0}' does not match up with any column in data source.</value>
</data>
<data name="SQL_BulkLoadStringTooLong" xml:space="preserve">
<value>String or binary data would be truncated.</value>
<value>String or binary data would be truncated in table '{0}', column '{1}'. Truncated value: '{2}'.</value>
</data>
<data name="SQL_BulkLoadInvalidTimeout" xml:space="preserve">
<value>Timeout Value '{0}' is less than 0.</value>
Expand Down