ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Edit Data exceptions on spatial types (#619)

Browse Source 
* Fix Edit Data exceptions on spatial types

* One more code convention cleanup.
This commit is contained in:
Karl Burtram
2018-05-18 15:54:30 -07:00
committed by GitHub
parent 5cfb4fa9dc
commit 34275c6a6d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
View File

@@ -420,7 +420,10 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
private void ExtendResultMetadata(List<DbColumn[]> columnSchemas, List<ResultSet> results) private void ExtendResultMetadata(List<DbColumn[]> columnSchemas, List<ResultSet> results)
{ {
if (columnSchemas.Count != results.Count) return; if (columnSchemas.Count != results.Count)
{
return;
}
for (int i = 0; i < results.Count; i++) for (int i = 0; i < results.Count; i++)
{ {
@@ -436,7 +439,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
DbColumnWrapper resultCol = result.Columns[j]; DbColumnWrapper resultCol = result.Columns[j];
DbColumn schemaCol = columnSchema[j]; DbColumn schemaCol = columnSchema[j];
if(!string.Equals(resultCol.DataTypeName, schemaCol.DataTypeName) if (!string.Equals(resultCol.DataTypeName, schemaCol.DataTypeName, StringComparison.OrdinalIgnoreCase)
|| (!string.Equals(resultCol.ColumnName, schemaCol.ColumnName) || (!string.Equals(resultCol.ColumnName, schemaCol.ColumnName)
&& !string.IsNullOrEmpty(schemaCol.ColumnName) && !string.IsNullOrEmpty(schemaCol.ColumnName)
&& !string.Equals(resultCol, SR.QueryServiceColumnNull))) && !string.Equals(resultCol, SR.QueryServiceColumnNull)))