ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-15 17:23:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Date & Time Type Fixes (#196)

Browse Source 
This basically is a replacement to the fix for Adding Milliseconds to DateTime fields. I didn't take into consideration that `DATE` columns would report as DateTime type. Date columns have a numeric scale set to 255, leading to the formatting string for the date time to include 255 millisecond places, which is invalid.

This change also reverses the change to store DateTime precision in the buffer file. Instead, the column metadata is now used when deserializing the rows from the db. `DATETIME` and `DATETIME2` columns are differentiated by their numeric scale while `DATE` columns are differentiated by their datatype name field.

More unit tests were added. Additionally, this fixes an unreported bug that `DATE` columns were being displayed with times, which is incorrect.

* Revert "Adding Milliseconds to DateTime fields (#173)"

This reverts commit 431dfa4156.

* Reworking the reader to use the column metadata for date types

* DbColumn -> DbColumnWrapper

* Fina tweaks to support DATETIME2(0)

* Removing the unused arguments
This commit is contained in:
Benjamin Russell
2016-12-20 11:22:00 -08:00
committed by GitHub
parent 1ada659a8a
commit 0f19de38fb
4 changed files with 217 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/IFileStreamReader.cs
View File

@@ -15,22 +15,5 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
public interface IFileStreamReader : IDisposable
{
IList<DbCellValue> ReadRow(long offset, IEnumerable<DbColumnWrapper> columns);
FileStreamReadResult ReadInt16(long i64Offset);
FileStreamReadResult ReadInt32(long i64Offset);
FileStreamReadResult ReadInt64(long i64Offset);
FileStreamReadResult ReadByte(long i64Offset);
FileStreamReadResult ReadChar(long i64Offset);
FileStreamReadResult ReadBoolean(long i64Offset);
FileStreamReadResult ReadSingle(long i64Offset);
FileStreamReadResult ReadDouble(long i64Offset);
FileStreamReadResult ReadSqlDecimal(long i64Offset);
FileStreamReadResult ReadDecimal(long i64Offset);
FileStreamReadResult ReadDateTime(long i64Offset);
FileStreamReadResult ReadTimeSpan(long i64Offset);
FileStreamReadResult ReadString(long i64Offset);
FileStreamReadResult ReadBytes(long i64Offset);
FileStreamReadResult ReadDateTimeOffset(long i64Offset);
FileStreamReadResult ReadGuid(long offset);
FileStreamReadResult ReadMoney(long offset);
}
}

140
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamReader.cs
View File

@@ -17,7 +17,14 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
public class ServiceBufferFileStreamReader : IFileStreamReader
{
#region Constants
private const int DefaultBufferSize = 8192;
private const string DateFormatString = "yyyy-MM-dd";
private const string TimeFormatString = "HH:mm:ss";
#endregion
#region Member Variables
@@ -25,7 +32,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
private readonly Stream fileStream;
private readonly Dictionary<Type, Func<long, FileStreamReadResult>> readMethods;
private readonly Dictionary<Type, Func<long, DbColumnWrapper, FileStreamReadResult>> readMethods;
#endregion
@@ -46,37 +53,37 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
buffer = new byte[DefaultBufferSize];
// Create the methods that will be used to read back
readMethods = new Dictionary<Type, Func<long, FileStreamReadResult>>
readMethods = new Dictionary<Type, Func<long, DbColumnWrapper, FileStreamReadResult>>
{
{typeof(string), ReadString},
{typeof(short), ReadInt16},
{typeof(int), ReadInt32},
{typeof(long), ReadInt64},
{typeof(byte), ReadByte},
{typeof(char), ReadChar},
{typeof(bool), ReadBoolean},
{typeof(double), ReadDouble},
{typeof(float), ReadSingle},
{typeof(decimal), ReadDecimal},
{typeof(DateTime), ReadDateTime},
{typeof(DateTimeOffset), ReadDateTimeOffset},
{typeof(TimeSpan), ReadTimeSpan},
{typeof(byte[]), ReadBytes},
{typeof(string), (o, col) => ReadString(o)},
{typeof(short), (o, col) => ReadInt16(o)},
{typeof(int), (o, col) => ReadInt32(o)},
{typeof(long), (o, col) => ReadInt64(o)},
{typeof(byte), (o, col) => ReadByte(o)},
{typeof(char), (o, col) => ReadChar(o)},
{typeof(bool), (o, col) => ReadBoolean(o)},
{typeof(double), (o, col) => ReadDouble(o)},
{typeof(float), (o, col) => ReadSingle(o)},
{typeof(decimal), (o, col) => ReadDecimal(o)},
{typeof(DateTime), ReadDateTime},
{typeof(DateTimeOffset), (o, col) => ReadDateTimeOffset(o)},
{typeof(TimeSpan), (o, col) => ReadTimeSpan(o)},
{typeof(byte[]), (o, col) => ReadBytes(o)},
{typeof(SqlString), ReadString},
{typeof(SqlInt16), ReadInt16},
{typeof(SqlInt32), ReadInt32},
{typeof(SqlInt64), ReadInt64},
{typeof(SqlByte), ReadByte},
{typeof(SqlBoolean), ReadBoolean},
{typeof(SqlDouble), ReadDouble},
{typeof(SqlSingle), ReadSingle},
{typeof(SqlDecimal), ReadSqlDecimal},
{typeof(SqlDateTime), ReadDateTime},
{typeof(SqlBytes), ReadBytes},
{typeof(SqlBinary), ReadBytes},
{typeof(SqlGuid), ReadGuid},
{typeof(SqlMoney), ReadMoney},
{typeof(SqlString), (o, col) => ReadString(o)},
{typeof(SqlInt16), (o, col) => ReadInt16(o)},
{typeof(SqlInt32), (o, col) => ReadInt32(o)},
{typeof(SqlInt64), (o, col) => ReadInt64(o)},
{typeof(SqlByte), (o, col) => ReadByte(o)},
{typeof(SqlBoolean), (o, col) => ReadBoolean(o)},
{typeof(SqlDouble), (o, col) => ReadDouble(o)},
{typeof(SqlSingle), (o, col) => ReadSingle(o)},
{typeof(SqlDecimal), (o, col) => ReadSqlDecimal(o)},
{typeof(SqlDateTime), ReadDateTime},
{typeof(SqlBytes), (o, col) => ReadBytes(o)},
{typeof(SqlBinary), (o, col) => ReadBytes(o)},
{typeof(SqlGuid), (o, col) => ReadGuid(o)},
{typeof(SqlMoney), (o, col) => ReadMoney(o)},
};
}
@@ -129,13 +136,13 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
}
// Use the right read function for the type to read the data from the file
Func<long, FileStreamReadResult> readFunc;
Func<long, DbColumnWrapper, FileStreamReadResult> readFunc;
if(!readMethods.TryGetValue(colType, out readFunc))
{
// Treat everything else as a string
readFunc = ReadString;
readFunc = readMethods[typeof(string)];
}
FileStreamReadResult result = readFunc(currentFileOffset);
FileStreamReadResult result = readFunc(currentFileOffset, column);
currentFileOffset += result.TotalLength;
results.Add(result.Value);
}
@@ -148,7 +155,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the short from</param>
/// <returns>A short</returns>
public FileStreamReadResult ReadInt16(long fileOffset)
internal FileStreamReadResult ReadInt16(long fileOffset)
{
return ReadCellHelper(fileOffset, length => BitConverter.ToInt16(buffer, 0));
}
@@ -158,7 +165,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the int from</param>
/// <returns>An int</returns>
public FileStreamReadResult ReadInt32(long fileOffset)
internal FileStreamReadResult ReadInt32(long fileOffset)
{
return ReadCellHelper(fileOffset, length => BitConverter.ToInt32(buffer, 0));
}
@@ -168,7 +175,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the long from</param>
/// <returns>A long</returns>
public FileStreamReadResult ReadInt64(long fileOffset)
internal FileStreamReadResult ReadInt64(long fileOffset)
{
return ReadCellHelper(fileOffset, length => BitConverter.ToInt64(buffer, 0));
}
@@ -178,7 +185,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the byte from</param>
/// <returns>A byte</returns>
public FileStreamReadResult ReadByte(long fileOffset)
internal FileStreamReadResult ReadByte(long fileOffset)
{
return ReadCellHelper(fileOffset, length => buffer[0]);
}
@@ -188,7 +195,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the char from</param>
/// <returns>A char</returns>
public FileStreamReadResult ReadChar(long fileOffset)
internal FileStreamReadResult ReadChar(long fileOffset)
{
return ReadCellHelper(fileOffset, length => BitConverter.ToChar(buffer, 0));
}
@@ -198,7 +205,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the bool from</param>
/// <returns>A bool</returns>
public FileStreamReadResult ReadBoolean(long fileOffset)
internal FileStreamReadResult ReadBoolean(long fileOffset)
{
return ReadCellHelper(fileOffset, length => buffer[0] == 0x1);
}
@@ -208,7 +215,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the single from</param>
/// <returns>A single</returns>
public FileStreamReadResult ReadSingle(long fileOffset)
internal FileStreamReadResult ReadSingle(long fileOffset)
{
return ReadCellHelper(fileOffset, length => BitConverter.ToSingle(buffer, 0));
}
@@ -218,7 +225,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="fileOffset">Offset into the file to read the double from</param>
/// <returns>A double</returns>
public FileStreamReadResult ReadDouble(long fileOffset)
internal FileStreamReadResult ReadDouble(long fileOffset)
{
return ReadCellHelper(fileOffset, length => BitConverter.ToDouble(buffer, 0));
}
@@ -228,7 +235,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the SqlDecimal from</param>
/// <returns>A SqlDecimal</returns>
public FileStreamReadResult ReadSqlDecimal(long offset)
internal FileStreamReadResult ReadSqlDecimal(long offset)
{
return ReadCellHelper(offset, length =>
{
@@ -243,7 +250,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the decimal from</param>
/// <returns>A decimal</returns>
public FileStreamReadResult ReadDecimal(long offset)
internal FileStreamReadResult ReadDecimal(long offset)
{
return ReadCellHelper(offset, length =>
{
@@ -257,13 +264,44 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// Reads a DateTime from the file at the offset provided
/// </summary>
/// <param name="offset">Offset into the file to read the DateTime from</param>
/// <param name="col">Column metadata, used for determining what precision to output</param>
/// <returns>A DateTime</returns>
public FileStreamReadResult ReadDateTime(long offset)
internal FileStreamReadResult ReadDateTime(long offset, DbColumnWrapper col)
{
return ReadCellHelper(offset, length =>
{
long ticks = BitConverter.ToInt64(buffer, 0);
return new DateTime(ticks);
}, null, dt =>
{
// Switch based on the type of column
string formatString;
if (col.DataTypeName.Equals("DATE", StringComparison.OrdinalIgnoreCase))
{
// DATE columns should only show the date
formatString = DateFormatString;
}
else if (col.DataTypeName.StartsWith("DATETIME", StringComparison.OrdinalIgnoreCase))
{
// DATETIME and DATETIME2 columns should show date, time, and a variable number
// of milliseconds (for DATETIME, it is fixed at 3, but returned as null)
// If for some strange reason a scale > 7 is sent, we will cap it at 7 to avoid
// an exception from invalid date/time formatting
int scale = Math.Min(col.NumericScale ?? 3, 7);
formatString = $"{DateFormatString} {TimeFormatString}";
if (scale > 0)
{
string millisecondString = new string('f', scale);
formatString += $".{millisecondString}";
}
}
else
{
// For anything else that returns as a CLR DateTime, just show date and time
formatString = $"{DateFormatString} {TimeFormatString}";
}
return dt.ToString(formatString);
});
}
@@ -272,7 +310,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the DateTimeOffset from</param>
/// <returns>A DateTimeOffset</returns>
public FileStreamReadResult ReadDateTimeOffset(long offset)
internal FileStreamReadResult ReadDateTimeOffset(long offset)
{
// DateTimeOffset is represented by DateTime.Ticks followed by TimeSpan.Ticks
// both as Int64 values
@@ -288,7 +326,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the TimeSpan from</param>
/// <returns>A TimeSpan</returns>
public FileStreamReadResult ReadTimeSpan(long offset)
internal FileStreamReadResult ReadTimeSpan(long offset)
{
return ReadCellHelper(offset, length =>
{
@@ -302,7 +340,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the string from</param>
/// <returns>A string</returns>
public FileStreamReadResult ReadString(long offset)
internal FileStreamReadResult ReadString(long offset)
{
return ReadCellHelper(offset, length =>
length > 0
@@ -315,7 +353,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the bytes from</param>
/// <returns>A byte array</returns>
public FileStreamReadResult ReadBytes(long offset)
internal FileStreamReadResult ReadBytes(long offset)
{
return ReadCellHelper(offset, length =>
{
@@ -339,7 +377,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// </summary>
/// <param name="offset">Offset into the file to read the bytes from</param>
/// <returns>A guid type object</returns>
public FileStreamReadResult ReadGuid(long offset)
internal FileStreamReadResult ReadGuid(long offset)
{
return ReadCellHelper(offset, length =>
{
@@ -353,9 +391,9 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
/// Reads a SqlMoney type from the offset provided
/// into a
/// </summary>
/// <param name="offset"></param>
/// <param name="offset">Offset into the file to read the value</param>
/// <returns>A sql money type object</returns>
public FileStreamReadResult ReadMoney(long offset)
internal FileStreamReadResult ReadMoney(long offset)
{
return ReadCellHelper(offset, length =>
{