From d8c088e0f6572887d3fb039116c40e9b5296e36e Mon Sep 17 00:00:00 2001 From: AlexFsmn Date: Tue, 18 Sep 2018 23:34:00 +0200 Subject: [PATCH] Fixed correct max column labels for varbinary, nvarchar and varchar (#692) --- .../SmoModel/SmoColumnCustomNode.cs | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoColumnCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoColumnCustomNode.cs index ed7b4274..9933acbc 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoColumnCustomNode.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoColumnCustomNode.cs @@ -108,25 +108,16 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel } } - // These types support Length + // These types supports detailed information switch (dataType.SqlDataType) { case SqlDataType.Char: case SqlDataType.NChar: case SqlDataType.Binary: - case SqlDataType.VarChar: // Supports Max Length - case SqlDataType.NVarChar: // Supports Max Length - case SqlDataType.VarBinary: // Supports Max Length - typeName += "("; - if (dataType.MaximumLength == 0) - { - typeName += "max"; - } - else - { - typeName += dataType.MaximumLength; - } - typeName += ")"; + case SqlDataType.VarChar: + case SqlDataType.NVarChar: + case SqlDataType.VarBinary: + typeName += $"({dataType.MaximumLength})"; break; case SqlDataType.Numeric: case SqlDataType.Decimal: @@ -137,6 +128,11 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel case SqlDataType.DateTimeOffset: typeName += $"({dataType.NumericScale})"; break; + case SqlDataType.VarBinaryMax: + case SqlDataType.NVarCharMax: + case SqlDataType.VarCharMax: + typeName += "(max)"; + break; } } return typeName;