ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for deleting text columns (#928)

Browse Source 
* Added handling for deleting problematic rows

* minor formatting changes

* Null checks and executereader implemented

* minor formatting

* Fix for column deletion for text

* minor space format

* more format changes

* Removal of top 200 and change of text comparison

* space fix

* minor commit

* Added new tests for single clause

* simplified regex

* spacing fix

* some polish for RowEditBaseTests

* space fix

* loc update (#914)

* loc update

* loc updates

* Warning for multiple delete (#931)

* Fix for multiple delete bug

* minor space removal

* removed catch error in RowDelete

* small optimizations

* space adding

* WIP on creating test

* Some cleanup

* removed spaces

* Fix for verifytext

* Added check for command format correctness.

* tidying up

* added working test for command exception

* simplification of TestDbDataReader getint

* Corrections made

* spacing and naming issues

* minor space

* one more space issue

* Revert "Support ActiveDirectoryPassword authentication (#899)" (#915)

This reverts commit b786a14c03.

* revert changes to connectionService

* fix for asserts

* fix clauses

Co-authored-by: khoiph1 <khoiph@microsoft.com>
Co-authored-by: Amir Omidi <amir@aaomidi.com>
This commit is contained in:
Alex Ma
2021-07-16 14:11:32 -07:00
committed by GitHub
parent 0032cc684b
commit c731744298
2 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowEditBase.cs
View File

@@ -181,38 +181,60 @@ namespace Microsoft.SqlTools.ServiceLayer.EditData.UpdateManagement
}
else
{
if (cellData.RawObject is byte[] ||
col.DbColumn.DataTypeName.Equals("TEXT", StringComparison.OrdinalIgnoreCase) ||
col.DbColumn.DataTypeName.Equals("NTEXT", StringComparison.OrdinalIgnoreCase))
if (parameterize)
{
// Special cases for byte[] and TEXT/NTEXT types
cellDataClause = "IS NOT NULL";
}
else
{
// General case is to just use the value from the cell
if (parameterize)
// Add a parameter and parameterized clause component
// NOTE: We include the row ID to make sure the parameter is unique if
// we execute multiple row edits at once.
string paramName = $"@Param{RowId}{col.Ordinal}";
if (cellData.RawObject is byte[])
{
// Add a parameter and parameterized clause component
// NOTE: We include the row ID to make sure the parameter is unique if
// we execute multiple row edits at once.
string paramName = $"@Param{RowId}{col.Ordinal}";
cellDataClause = $"= {paramName}";
SqlParameter parameter = new SqlParameter(paramName, col.DbColumn.SqlDbType)
{
Value = cellData.RawObject
};
output.Parameters.Add(parameter);
cellDataClause = $"= CONVERT (VARBINARY(MAX), {paramName})";
}
else if (col.DbColumn.DataTypeName.Equals("TEXT", StringComparison.OrdinalIgnoreCase) || (col.DbColumn.DataTypeName.Equals("TEXT", StringComparison.OrdinalIgnoreCase) ||
col.DbColumn.DataTypeName.Equals("NTEXT", StringComparison.OrdinalIgnoreCase)))
{
// Special case for TEXT/NTEXT types.
//NOTE: the types are not compatible with n/varchar so direct comparison
// will not work for these types, must convert first.
cellDataClause = $"= CONVERT (NVARCHAR(MAX), {paramName})";
}
else
{
// Add the clause component with the formatted value
cellDataClause = $"= {ToSqlScript.FormatValue(cellData, col.DbColumn)}";
cellDataClause = $"= {paramName}";
}
SqlParameter parameter = new SqlParameter(paramName, col.DbColumn.SqlDbType)
{
Value = cellData.RawObject
};
output.Parameters.Add(parameter);
}
else
{
// Add the clause component with the formatted value
cellDataClause = $"= {ToSqlScript.FormatValue(cellData, col.DbColumn)}";
}
}
string completeComponent = $"({col.EscapedName} {cellDataClause})";
string completeComponent;
if (cellData.RawObject is byte[])
{
completeComponent = $"(CONVERT (VARBINARY(MAX), {col.EscapedName}) {cellDataClause})";
}
else if (col.DbColumn.DataTypeName.Equals("TEXT", StringComparison.OrdinalIgnoreCase) ||
col.DbColumn.DataTypeName.Equals("NTEXT", StringComparison.OrdinalIgnoreCase))
{
// Special case for TEXT/NTEXT types as explained on line 197.
completeComponent = $"(CONVERT (NVARCHAR(MAX), {col.EscapedName}) {cellDataClause})";
}
else
{
completeComponent = $"({col.EscapedName} {cellDataClause})";
}
output.ClauseComponents.Add(completeComponent);
}

40
test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/RowEditBaseTests.cs
View File

@@ -80,7 +80,14 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
EditTableMetadata etm = Common.GetCustomEditTableMetadata(cols);
RowEditTester rt = new RowEditTester(rs, etm);
rt.ValidateWhereClauseSingleKey(nullClause);
if (val == DBNull.Value)
{
rt.ValidateWhereClauseNullKey(nullClause);
}
else
{
rt.ValidateWhereClauseSingleKey(nullClause);
}
}
public static IEnumerable<object[]> GetWhereClauseIsNotNullData
@@ -95,7 +102,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
DataType = typeof(byte[])
},
new byte[5],
"IS NOT NULL"
"= 0x0000000000"
};
yield return new object[]
{
@@ -105,7 +112,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
DataTypeName = "TEXT"
},
"abc",
"IS NOT NULL"
"= N'abc'"
};
yield return new object[]
{
@@ -116,7 +123,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
},
"abc",
"IS NOT NULL"
"= N'abc'"
};
}
}
@@ -252,11 +259,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
}
// ReSharper disable once UnusedParameter.Local
public void ValidateWhereClauseSingleKey(string nullValue)
public void ValidateWhereClauseNullKey(string nullValue)
{
// If: I generate a where clause with one is null column value
WhereClause wc = GetWhereClause(false);
// Then:
// ... There should only be one component
Assert.AreEqual(1, wc.ClauseComponents.Count);
@@ -272,6 +279,27 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
Assert.AreEqual($"WHERE {wc.ClauseComponents[0]}", wc.CommandText);
}
public void ValidateWhereClauseSingleKey(string clauseValue)
{
// If: I generate a where clause with one is null column value
WhereClause wc = GetWhereClause(false);
// Then:
// ... There should only be one component
Assert.AreEqual(1, wc.ClauseComponents.Count);
// ... Parameterization should be empty
Assert.IsEmpty(wc.Parameters);
// ... The component should contain the name of the column and the value
Assert.True(wc.ClauseComponents[0].Contains(AssociatedObjectMetadata.Columns.First().EscapedName));
Regex r = new Regex($@"\(CONVERT \([A-Z]*\(MAX\), {AssociatedObjectMetadata.Columns.First().EscapedName}\) {clauseValue}\)");
Assert.True(r.IsMatch(wc.ClauseComponents[0]));
// ... The complete clause should contain a single WHERE
Assert.AreEqual($"WHERE {wc.ClauseComponents[0]}", wc.CommandText);
}
public void ValidateWhereClauseMultipleKeys()
{
// If: I generate a where clause with multiple key columns