fix decimal datatype handling (#1352)

* Revert "Revert query execution changes (#1341)"

This reverts commit cb290cdbb5.

* fix decimal and money

* timestamp

* fix code and tests

* add sql variant test

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamReader.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.SqlTypes;
 using System.IO;
 using System.Text;
@@ -40,6 +41,8 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
 
         private readonly Dictionary<Type, ReadMethod> readMethods;
 
+        private readonly Dictionary<SqlDbType, Type> sqlDBTypeMap;
+
         #endregion
 
         /// <summary>
@@ -98,6 +101,37 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
                 {typeof(SqlGuid),        (o, id, col) => ReadGuid(o, id)},
                 {typeof(SqlMoney),       (o, id, col) => ReadMoney(o, id)},
             };
+
+            sqlDBTypeMap = new Dictionary<SqlDbType, Type> {
+                {SqlDbType.BigInt, typeof(SqlInt64)},
+                {SqlDbType.Binary, typeof(SqlBinary)},
+                {SqlDbType.Bit, typeof(SqlBoolean)},
+                {SqlDbType.Char, typeof(SqlString)},
+                {SqlDbType.Date, typeof(SqlDateTime)},
+                {SqlDbType.DateTime, typeof(SqlDateTime)},
+                {SqlDbType.DateTime2, typeof(SqlDateTime)},
+                {SqlDbType.DateTimeOffset, typeof(DateTimeOffset)},
+                {SqlDbType.Decimal, typeof(SqlDecimal)},
+                {SqlDbType.Float, typeof(SqlDouble)},
+                {SqlDbType.Image, typeof(SqlBinary)},
+                {SqlDbType.Int, typeof(SqlInt32)},
+                {SqlDbType.Money, typeof(SqlMoney)},
+                {SqlDbType.NChar, typeof(SqlString)},
+                {SqlDbType.NText, typeof(SqlString)},
+                {SqlDbType.NVarChar, typeof(SqlString)},
+                {SqlDbType.Real, typeof(SqlSingle)},
+                {SqlDbType.SmallDateTime, typeof(SqlDateTime)},
+                {SqlDbType.SmallInt, typeof(SqlInt16)},
+                {SqlDbType.SmallMoney, typeof(SqlMoney)},
+                {SqlDbType.Text, typeof(SqlString)},
+                {SqlDbType.Time, typeof(TimeSpan)},
+                {SqlDbType.Timestamp, typeof(SqlBinary)},
+                {SqlDbType.TinyInt, typeof(SqlByte)},
+                {SqlDbType.UniqueIdentifier, typeof(SqlGuid)},
+                {SqlDbType.VarBinary, typeof(SqlBinary)},
+                {SqlDbType.VarChar, typeof(SqlString)},
+                {SqlDbType.Xml, typeof(SqlString)}
+            };
         }
 
         #region IFileStreamStorage Implementation
@@ -134,19 +168,25 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
                         continue;
                     }
 
-                    // The typename is stored in the string
-                    colType = Type.GetType(sqlVariantType);
-
-                    // Workaround .NET bug, see sqlbu# 440643 and vswhidbey# 599834
-                    // TODO: Is this workaround necessary for .NET Core?
-                    if (colType == null && sqlVariantType == "System.Data.SqlTypes.SqlSingle")
+                    // We need to specify the assembly name for SQL types in order to resolve the type correctly.
+                    if (sqlVariantType.StartsWith("System.Data.SqlTypes."))
                     {
-                        colType = typeof(SqlSingle);
+                        sqlVariantType = sqlVariantType + ", System.Data.Common";
+                    }
+                    colType = Type.GetType(sqlVariantType);
+                    if (colType == null)
+                    {
+                        throw new ArgumentException(SR.QueryServiceUnsupportedSqlVariantType(sqlVariantType, column.ColumnName));
                     }
                 }
                 else
                 {
-                    colType = column.DataType;
+                    Type type;
+                    if (!sqlDBTypeMap.TryGetValue(column.SqlDbType, out type))
+                    {
+                        type = typeof(SqlString);
+                    }
+                    colType = type;
                 }
 
                 // Use the right read function for the type to read the data from the file

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamWriter.cs

@@ -92,19 +92,19 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
                 {typeof(byte[]), val => WriteBytes((byte[]) val)},
                 {typeof(Guid), val => WriteGuid((Guid) val)},
 
-                {typeof(SqlString), val => WriteNullable((SqlString) val, obj => WriteString((string) obj))},
-                {typeof(SqlInt16), val => WriteNullable((SqlInt16) val, obj => WriteInt16((short) obj))},
-                {typeof(SqlInt32), val => WriteNullable((SqlInt32) val, obj => WriteInt32((int) obj))},
-                {typeof(SqlInt64), val => WriteNullable((SqlInt64) val, obj => WriteInt64((long) obj)) },
-                {typeof(SqlByte), val => WriteNullable((SqlByte) val, obj => WriteByte((byte) obj)) },
-                {typeof(SqlBoolean), val => WriteNullable((SqlBoolean) val, obj => WriteBoolean((bool) obj)) },
-                {typeof(SqlDouble), val => WriteNullable((SqlDouble) val, obj => WriteDouble((double) obj)) },
-                {typeof(SqlSingle), val => WriteNullable((SqlSingle) val, obj => WriteSingle((float) obj)) },
+                {typeof(SqlString), val => WriteNullable((SqlString) val, obj => WriteString(((SqlString) obj).Value))},
+                {typeof(SqlInt16), val => WriteNullable((SqlInt16) val, obj => WriteInt16(((SqlInt16) obj).Value))},
+                {typeof(SqlInt32), val => WriteNullable((SqlInt32) val, obj => WriteInt32(((SqlInt32)obj).Value))},
+                {typeof(SqlInt64), val => WriteNullable((SqlInt64) val, obj => WriteInt64(((SqlInt64) obj).Value)) },
+                {typeof(SqlByte), val => WriteNullable((SqlByte) val, obj => WriteByte(((SqlByte) obj).Value)) },
+                {typeof(SqlBoolean), val => WriteNullable((SqlBoolean) val, obj => WriteBoolean(((SqlBoolean) obj).Value)) },
+                {typeof(SqlDouble), val => WriteNullable((SqlDouble) val, obj => WriteDouble(((SqlDouble) obj).Value)) },
+                {typeof(SqlSingle), val => WriteNullable((SqlSingle) val, obj => WriteSingle(((SqlSingle) obj).Value)) },
                 {typeof(SqlDecimal), val => WriteNullable((SqlDecimal) val, obj => WriteSqlDecimal((SqlDecimal) obj)) },
-                {typeof(SqlDateTime), val => WriteNullable((SqlDateTime) val, obj => WriteDateTime((DateTime) obj)) },
-                {typeof(SqlBytes), val => WriteNullable((SqlBytes) val, obj => WriteBytes((byte[]) obj)) },
-                {typeof(SqlBinary), val => WriteNullable((SqlBinary) val, obj => WriteBytes((byte[]) obj)) },
-                {typeof(SqlGuid), val => WriteNullable((SqlGuid) val, obj => WriteGuid((Guid) obj)) },
+                {typeof(SqlDateTime), val => WriteNullable((SqlDateTime) val, obj => WriteDateTime(((SqlDateTime) obj).Value)) },
+                {typeof(SqlBytes), val => WriteNullable((SqlBytes) val, obj => WriteBytes(((SqlBytes) obj).Value)) },
+                {typeof(SqlBinary), val => WriteNullable((SqlBinary) val, obj => WriteBytes(((SqlBinary) obj).Value)) },
+                {typeof(SqlGuid), val => WriteNullable((SqlGuid) val, obj => WriteGuid(((SqlGuid) obj).Value)) },
                 {typeof(SqlMoney), val => WriteNullable((SqlMoney) val, obj => WriteMoney((SqlMoney) obj)) }
             };
         }
@@ -299,7 +299,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
         internal int WriteBoolean(bool val)
         {
             byteBuffer[0] = 0x01; // length
-            byteBuffer[1] = (byte) (val ? 0x01 : 0x00);
+            byteBuffer[1] = (byte)(val ? 0x01 : 0x00);
             return FileUtilities.WriteWithLength(fileStream, byteBuffer, 2);
         }
 

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs

@@ -98,7 +98,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
         /// <returns>The value of the given column</returns>
         public object GetValue(int i)
         {
-            return sqlDataReader == null ? DbDataReader.GetValue(i) : sqlDataReader.GetValue(i);
+            return sqlDataReader == null ? DbDataReader.GetValue(i) : sqlDataReader.GetSqlValue(i);
         }
 
         /// <summary>
@@ -113,7 +113,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
             }
             else
             {
-                sqlDataReader.GetValues(values);
+                sqlDataReader.GetSqlValues(values);
             }
         }