improving OE tables expand (#555)

llali · web-flow · commit 1ec297efe2be · 2017-12-01T14:49:42.000-08:00
* improving OE tables expand for dw database
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/ChildFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/ChildFactory.cs
@@ -45,12 +45,12 @@ public abstract class ChildFactory
         /// <summary>
         /// Returns the node sub type if the object can have sub types otehr wise returns empty string
         /// </summary>
-        public abstract string GetNodeSubType(object context);
+        public abstract string GetNodeSubType(object smoObject, SmoQueryContext smoContext);
 
         /// <summary>
         /// Returns the status of the object assigned to node. If the object doesn't spport status returns empty string
         /// </summary>
-        public abstract string GetNodeStatus(object context);
+        public abstract string GetNodeStatus(object smoObject, SmoQueryContext smoContext);
 
         /// <summary>
         /// Returns the custom name of the object assigned to the node. If the object doesn't have custom name, returns empty string
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeObservableCollection.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeObservableCollection.cs
@@ -3,6 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -29,6 +30,15 @@ public bool IsPopulating
             get { return numInits.HasValue && numInits != 0; }
         }
 
+        public bool IsSorted
+        {
+            get
+            {
+                // SMO objects are already sorted so no need to sort them again
+                return this.FirstOrDefault() is SmoTreeNode;
+            }
+        }
+
         public void BeginInit()
         {
             if (!numInits.HasValue)
@@ -54,7 +64,10 @@ public void EndInit(TreeNode parent, ref IList<TreeNode> deferredChildren)
             {
                 try
                 {
-                    DoSort();
+                    if (!IsSorted)
+                    {
+                        DoSort();
+                    }
 
                     if (deferredChildren != null)
                     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoChildFactoryBase.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoChildFactoryBase.cs
@@ -17,6 +17,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
 {
     public class SmoChildFactoryBase : ChildFactory
     {
+        private IEnumerable<NodeSmoProperty> smoProperties;
         public override IEnumerable<string> ApplicableParents()
         {
             return null;
@@ -230,6 +231,7 @@ protected virtual void InitializeChild(TreeNode parent, TreeNode child, object c
             }
             else
             {
+                smoProperties = SmoProperties;
                 SmoTreeNode childAsMeItem = (SmoTreeNode)child;
                 childAsMeItem.CacheInfoFromModel(smoObj);
                 SmoQueryContext smoContext = parent.GetContextAs<SmoQueryContext>();
@@ -241,8 +243,8 @@ protected virtual void InitializeChild(TreeNode parent, TreeNode child, object c
                     childAsMeItem.NodeValue = customizedName;
                 }
 
-                childAsMeItem.NodeSubType = GetNodeSubType(context);
-                childAsMeItem.NodeStatus = GetNodeStatus(context);
+                childAsMeItem.NodeSubType = GetNodeSubType(context, smoContext);
+                childAsMeItem.NodeStatus = GetNodeStatus(context, smoContext);
             }
         }
 
@@ -270,6 +272,14 @@ public override IEnumerable<NodeSmoProperty> SmoProperties
             }
         }
 
+        internal IEnumerable<NodeSmoProperty> CachedSmoProperties
+        {
+            get
+            {
+                return smoProperties == null ? SmoProperties : smoProperties;
+            }
+        }
+
         /// <summary>
         /// Returns true if any final validation of the object to be added passes, and false
         /// if validation fails. This provides a chance to filter specific items out of a list 
@@ -282,16 +292,31 @@ public virtual bool PassesFinalFilters(TreeNode parent, object context)
             return true;
         }
 
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
             return string.Empty;
         }
 
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
             return string.Empty;
         }
 
+        public static bool IsPropertySupported(string propertyName, SmoQueryContext context, NamedSmoObject smoObj, IEnumerable<NodeSmoProperty> supportedProperties)
+        {
+            var property = supportedProperties.FirstOrDefault(x => string.Compare(x.Name, propertyName, StringComparison.InvariantCultureIgnoreCase) == 0);
+            if (property != null)
+            {
+                return ServerVersionHelper.IsValidFor(context.ValidFor, property.ValidFor);
+            }
+            else
+            {
+                // Return true if cannot find the proeprty, SMO still tries to get that property but adding the property to supported list can make loading the nodes faster
+                Logger.Write(LogLevel.Verbose, $"Smo property name {propertyName} for Smo type {smoObj.GetType()} is not added as supported properties. This can cause the performance of loading the OE nodes");
+                return true;
+            }
+        }
+
         public override string GetNodeCustomName(object smoObject, SmoQueryContext smoContext)
         {
             return string.Empty;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoDatabaseCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoDatabaseCustomNode.cs
@@ -4,6 +4,8 @@
 //
 
 using Microsoft.SqlServer.Management.Smo;
+using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
+using System.Collections.Generic;
 
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
 {
@@ -12,21 +14,22 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
     /// </summary>
     internal partial class DatabasesChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
-            return DatabasesCustomNodeHelper.GetStatus(context);
+            return DatabasesCustomNodeHelper.GetStatus(smoObject, smoContext, CachedSmoProperties);
         }
     }
 
     internal static class DatabasesCustomNodeHelper
     {
-        internal static string GetStatus(object context)
+        internal static string GetStatus(object smoObject, SmoQueryContext smoContext, IEnumerable<NodeSmoProperty> supportedProperties)
         {
-            Database db = context as Database;
-            if (db != null)
+            Database db = smoObject as Database;
+            if (db != null && SmoChildFactoryBase.IsPropertySupported("Status", smoContext, db, supportedProperties))
             {
                 DatabaseStatus status;
-                try { 
+                try
+                { 
                     status = db.Status;
                 }
                 catch (SqlServer.Management.Common.ConnectionFailureException)
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoKeyCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoKeyCustomNode.cs
@@ -12,9 +12,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
     /// </summary>
     internal partial class KeysChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return IndexCustomeNodeHelper.GetSubType(context);
+            return IndexCustomeNodeHelper.GetSubType(smoObject);
         }
     }
 
@@ -23,9 +23,9 @@ public override string GetNodeSubType(object context)
     /// </summary>
     internal partial class IndexesChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return IndexCustomeNodeHelper.GetSubType(context);
+            return IndexCustomeNodeHelper.GetSubType(smoObject);
         }
 
         public override string GetNodeCustomName(object smoObject, SmoQueryContext smoContext)
@@ -39,9 +39,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
     /// </summary>
     internal partial class UserDefinedTableTypeKeysChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return IndexCustomeNodeHelper.GetSubType(context);
+            return IndexCustomeNodeHelper.GetSubType(smoObject);
         }
     }
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoLoginCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoLoginCustomNode.cs
@@ -12,9 +12,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
     /// </summary>
     internal partial class ServerLevelLoginsChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
-            return LoginCustomNodeHelper.GetStatus(context);
+            return LoginCustomNodeHelper.GetStatus(smoObject);
         }
     }
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoParamterCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoParamterCustomNode.cs
@@ -18,9 +18,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
             return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);
         }
 
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return ParameterCustomeNodeHelper.GetSubType(context);
+            return ParameterCustomeNodeHelper.GetSubType(smoObject);
         }
     }
 
@@ -33,9 +33,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
         {
             return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);
         }
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return ParameterCustomeNodeHelper.GetSubType(context);
+            return ParameterCustomeNodeHelper.GetSubType(smoObject);
         }
     }
 
@@ -48,9 +48,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
         {
             return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);
         }
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return ParameterCustomeNodeHelper.GetSubType(context);
+            return ParameterCustomeNodeHelper.GetSubType(smoObject);
         }
     }
 
@@ -63,9 +63,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
         {
             return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);
         }
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
-            return ParameterCustomeNodeHelper.GetSubType(context);
+            return ParameterCustomeNodeHelper.GetSubType(smoObject);
         }
     }
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTableCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTableCustomNode.cs
@@ -17,7 +17,7 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
             try
             {
                 Table table = smoObject as Table;
-                if (table != null && table.IsSystemVersioned)
+                if (table != null && IsPropertySupported("IsSystemVersioned", smoContext, table, CachedSmoProperties) && table.IsSystemVersioned)
                 {
                     return $"{table.Schema}.{table.Name} ({SR.SystemVersioned_LabelPart})";
                 }
@@ -30,12 +30,12 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo
             return string.Empty;
         }
 
-        public override string GetNodeSubType(object context)
+        public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)
         {
             try
             {
-                Table table = context as Table;
-                if (table != null && table.TemporalType != TableTemporalType.None)
+                Table table = smoObject as Table;
+                if (table != null && IsPropertySupported("TemporalType", smoContext, table, CachedSmoProperties) && table.TemporalType != TableTemporalType.None)
                 {
                     return "Temporal";
                 }
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTriggerCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTriggerCustomNode.cs
@@ -12,25 +12,25 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
     /// </summary>
     internal partial class TriggersChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
-            return TriggersCustomeNodeHelper.GetStatus(context);
+            return TriggersCustomeNodeHelper.GetStatus(smoObject);
         }
     }
 
     internal partial class ServerLevelServerTriggersChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
-            return TriggersCustomeNodeHelper.GetStatus(context);
+            return TriggersCustomeNodeHelper.GetStatus(smoObject);
         }
     }
 
     internal partial class DatabaseTriggersChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
-            return TriggersCustomeNodeHelper.GetStatus(context);
+            return TriggersCustomeNodeHelper.GetStatus(smoObject);
         }
     }
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoUserCustomNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoUserCustomNode.cs
@@ -12,9 +12,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
     /// </summary>
     internal partial class UsersChildFactory : SmoChildFactoryBase
     {
-        public override string GetNodeStatus(object context)
+        public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)
         {
-            return UserCustomeNodeHelper.GetStatus(context);
+            return UserCustomeNodeHelper.GetStatus(smoObject);
         }
     }
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/ObjectExplorer/Baselines/AllSqlObjects.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/ObjectExplorer/Baselines/AllSqlObjects.txt
@@ -33,8 +33,8 @@ NodeType: Column Label: SickLeaveHours (smallint, not null) SubType: Status:
 NodeType: Column Label: CurrentFlag (Flag(bit), not null) SubType: Status:
 NodeType: Column Label: rowguid (uniqueidentifier, not null) SubType: Status:
 NodeType: Column Label: ModifiedDate (datetime, not null) SubType: Status:
-NodeType: Key Label: FK_Employee_Person_BusinessEntityID SubType:ForeignKey Status:
 NodeType: Key Label: PK_Employee_BusinessEntityID SubType:PrimaryKey Status:
+NodeType: Key Label: FK_Employee_Person_BusinessEntityID SubType:ForeignKey Status:
 NodeType: Constraint Label: CK_Employee_BirthDate SubType: Status:
 NodeType: Constraint Label: CK_Employee_Gender SubType: Status:
 NodeType: Constraint Label: CK_Employee_HireDate SubType: Status:
@@ -156,7 +156,6 @@ NodeType: DatabaseRole Label: db_securityadmin SubType: Status:
 NodeType: DatabaseRole Label: public SubType: Status:
 NodeType: DatabaseRole Label: SalesManagers SubType: Status:
 NodeType: DatabaseRole Label: SalesPersons SubType: Status:
-NodeType: Schema Label: dbo SubType: Status:
 NodeType: Schema Label: db_accessadmin SubType: Status:
 NodeType: Schema Label: db_backupoperator SubType: Status:
 NodeType: Schema Label: db_datareader SubType: Status:
@@ -166,6 +165,7 @@ NodeType: Schema Label: db_denydatareader SubType: Status:
 NodeType: Schema Label: db_denydatawriter SubType: Status:
 NodeType: Schema Label: db_owner SubType: Status:
 NodeType: Schema Label: db_securityadmin SubType: Status:
+NodeType: Schema Label: dbo SubType: Status:
 NodeType: Schema Label: Demo SubType: Status:
 NodeType: Schema Label: guest SubType: Status:
 NodeType: Schema Label: HumanResources SubType: Status:

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel`
`17`	`17`	`{`
`18`	`18`	`public class SmoChildFactoryBase : ChildFactory`
`19`	`19`	`{`
	`20`	`+ private IEnumerable<NodeSmoProperty> smoProperties;`
`20`	`21`	`public override IEnumerable<string> ApplicableParents()`
`21`	`22`	`{`
`22`	`23`	`return null;`
`@@ -230,6 +231,7 @@ protected virtual void InitializeChild(TreeNode parent, TreeNode child, object c`
`230`	`231`	`}`
`231`	`232`	`else`
`232`	`233`	`{`
	`234`	`+ smoProperties = SmoProperties;`
`233`	`235`	`SmoTreeNode childAsMeItem = (SmoTreeNode)child;`
`234`	`236`	`childAsMeItem.CacheInfoFromModel(smoObj);`
`235`	`237`	`SmoQueryContext smoContext = parent.GetContextAs<SmoQueryContext>();`
`@@ -241,8 +243,8 @@ protected virtual void InitializeChild(TreeNode parent, TreeNode child, object c`
`241`	`243`	`childAsMeItem.NodeValue = customizedName;`
`242`	`244`	`}`
`243`	`245`
`244`		`- childAsMeItem.NodeSubType = GetNodeSubType(context);`
`245`		`- childAsMeItem.NodeStatus = GetNodeStatus(context);`
	`246`	`+ childAsMeItem.NodeSubType = GetNodeSubType(context, smoContext);`
	`247`	`+ childAsMeItem.NodeStatus = GetNodeStatus(context, smoContext);`
`246`	`248`	`}`
`247`	`249`	`}`
`248`	`250`
`@@ -270,6 +272,14 @@ public override IEnumerable<NodeSmoProperty> SmoProperties`
`270`	`272`	`}`
`271`	`273`	`}`
`272`	`274`
	`275`	`+ internal IEnumerable<NodeSmoProperty> CachedSmoProperties`
	`276`	`+ {`
	`277`	`+ get`
	`278`	`+ {`
	`279`	`+ return smoProperties == null ? SmoProperties : smoProperties;`
	`280`	`+ }`
	`281`	`+ }`
	`282`	`+`
`273`	`283`	`/// <summary>`
`274`	`284`	`/// Returns true if any final validation of the object to be added passes, and false`
`275`	`285`	`/// if validation fails. This provides a chance to filter specific items out of a list`
`@@ -282,16 +292,31 @@ public virtual bool PassesFinalFilters(TreeNode parent, object context)`
`282`	`292`	`return true;`
`283`	`293`	`}`
`284`	`294`
`285`		`- public override string GetNodeSubType(object context)`
	`295`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`286`	`296`	`{`
`287`	`297`	`return string.Empty;`
`288`	`298`	`}`
`289`	`299`
`290`		`- public override string GetNodeStatus(object context)`
	`300`	`+ public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)`
`291`	`301`	`{`
`292`	`302`	`return string.Empty;`
`293`	`303`	`}`
`294`	`304`
	`305`	`+ public static bool IsPropertySupported(string propertyName, SmoQueryContext context, NamedSmoObject smoObj, IEnumerable<NodeSmoProperty> supportedProperties)`
	`306`	`+ {`
	`307`	`+ var property = supportedProperties.FirstOrDefault(x => string.Compare(x.Name, propertyName, StringComparison.InvariantCultureIgnoreCase) == 0);`
	`308`	`+ if (property != null)`
	`309`	`+ {`
	`310`	`+ return ServerVersionHelper.IsValidFor(context.ValidFor, property.ValidFor);`
	`311`	`+ }`
	`312`	`+ else`
	`313`	`+ {`
	`314`	`+ // Return true if cannot find the proeprty, SMO still tries to get that property but adding the property to supported list can make loading the nodes faster`
	`315`	`+ Logger.Write(LogLevel.Verbose, $"Smo property name {propertyName} for Smo type {smoObj.GetType()} is not added as supported properties. This can cause the performance of loading the OE nodes");`
	`316`	`+ return true;`
	`317`	`+ }`
	`318`	`+ }`
	`319`	`+`
`295`	`320`	`public override string GetNodeCustomName(object smoObject, SmoQueryContext smoContext)`
`296`	`321`	`{`
`297`	`322`	`return string.Empty;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`//`
`5`	`5`
`6`	`6`	`using Microsoft.SqlServer.Management.Smo;`
	`7`	`+using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;`
	`8`	`+using System.Collections.Generic;`
`7`	`9`
`8`	`10`	`namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel`
`9`	`11`	`{`
`@@ -12,21 +14,22 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel`
`12`	`14`	`/// </summary>`
`13`	`15`	`internal partial class DatabasesChildFactory : SmoChildFactoryBase`
`14`	`16`	`{`
`15`		`- public override string GetNodeStatus(object context)`
	`17`	`+ public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)`
`16`	`18`	`{`
`17`		`- return DatabasesCustomNodeHelper.GetStatus(context);`
	`19`	`+ return DatabasesCustomNodeHelper.GetStatus(smoObject, smoContext, CachedSmoProperties);`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`internal static class DatabasesCustomNodeHelper`
`22`	`24`	`{`
`23`		`- internal static string GetStatus(object context)`
	`25`	`+ internal static string GetStatus(object smoObject, SmoQueryContext smoContext, IEnumerable<NodeSmoProperty> supportedProperties)`
`24`	`26`	`{`
`25`		`- Database db = context as Database;`
`26`		`- if (db != null)`
	`27`	`+ Database db = smoObject as Database;`
	`28`	`+ if (db != null && SmoChildFactoryBase.IsPropertySupported("Status", smoContext, db, supportedProperties))`
`27`	`29`	`{`
`28`	`30`	`DatabaseStatus status;`
`29`		`- try {`
	`31`	`+ try`
	`32`	`+ {`
`30`	`33`	`status = db.Status;`
`31`	`34`	`}`
`32`	`35`	`catch (SqlServer.Management.Common.ConnectionFailureException)`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel`
`12`	`12`	`/// </summary>`
`13`	`13`	`internal partial class KeysChildFactory : SmoChildFactoryBase`
`14`	`14`	`{`
`15`		`- public override string GetNodeSubType(object context)`
	`15`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`16`	`16`	`{`
`17`		`- return IndexCustomeNodeHelper.GetSubType(context);`
	`17`	`+ return IndexCustomeNodeHelper.GetSubType(smoObject);`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`@@ -23,9 +23,9 @@ public override string GetNodeSubType(object context)`
`23`	`23`	`/// </summary>`
`24`	`24`	`internal partial class IndexesChildFactory : SmoChildFactoryBase`
`25`	`25`	`{`
`26`		`- public override string GetNodeSubType(object context)`
	`26`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`27`	`27`	`{`
`28`		`- return IndexCustomeNodeHelper.GetSubType(context);`
	`28`	`+ return IndexCustomeNodeHelper.GetSubType(smoObject);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public override string GetNodeCustomName(object smoObject, SmoQueryContext smoContext)`
`@@ -39,9 +39,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`39`	`39`	`/// </summary>`
`40`	`40`	`internal partial class UserDefinedTableTypeKeysChildFactory : SmoChildFactoryBase`
`41`	`41`	`{`
`42`		`- public override string GetNodeSubType(object context)`
	`42`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`43`	`43`	`{`
`44`		`- return IndexCustomeNodeHelper.GetSubType(context);`
	`44`	`+ return IndexCustomeNodeHelper.GetSubType(smoObject);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`18`	`18`	`return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public override string GetNodeSubType(object context)`
	`21`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`22`	`22`	`{`
`23`		`- return ParameterCustomeNodeHelper.GetSubType(context);`
	`23`	`+ return ParameterCustomeNodeHelper.GetSubType(smoObject);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`@@ -33,9 +33,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`33`	`33`	`{`
`34`	`34`	`return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);`
`35`	`35`	`}`
`36`		`- public override string GetNodeSubType(object context)`
	`36`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`37`	`37`	`{`
`38`		`- return ParameterCustomeNodeHelper.GetSubType(context);`
	`38`	`+ return ParameterCustomeNodeHelper.GetSubType(smoObject);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`@@ -48,9 +48,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`48`	`48`	`{`
`49`	`49`	`return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);`
`50`	`50`	`}`
`51`		`- public override string GetNodeSubType(object context)`
	`51`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`52`	`52`	`{`
`53`		`- return ParameterCustomeNodeHelper.GetSubType(context);`
	`53`	`+ return ParameterCustomeNodeHelper.GetSubType(smoObject);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -63,9 +63,9 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`63`	`63`	`{`
`64`	`64`	`return ParameterCustomeNodeHelper.GetCustomLabel(smoObject, smoContext);`
`65`	`65`	`}`
`66`		`- public override string GetNodeSubType(object context)`
	`66`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`67`	`67`	`{`
`68`		`- return ParameterCustomeNodeHelper.GetSubType(context);`
	`68`	`+ return ParameterCustomeNodeHelper.GetSubType(smoObject);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`17`	`17`	`try`
`18`	`18`	`{`
`19`	`19`	`Table table = smoObject as Table;`
`20`		`- if (table != null && table.IsSystemVersioned)`
	`20`	`+ if (table != null && IsPropertySupported("IsSystemVersioned", smoContext, table, CachedSmoProperties) && table.IsSystemVersioned)`
`21`	`21`	`{`
`22`	`22`	`return $"{table.Schema}.{table.Name} ({SR.SystemVersioned_LabelPart})";`
`23`	`23`	`}`
`@@ -30,12 +30,12 @@ public override string GetNodeCustomName(object smoObject, SmoQueryContext smoCo`
`30`	`30`	`return string.Empty;`
`31`	`31`	`}`
`32`	`32`
`33`		`- public override string GetNodeSubType(object context)`
	`33`	`+ public override string GetNodeSubType(object smoObject, SmoQueryContext smoContext)`
`34`	`34`	`{`
`35`	`35`	`try`
`36`	`36`	`{`
`37`		`- Table table = context as Table;`
`38`		`- if (table != null && table.TemporalType != TableTemporalType.None)`
	`37`	`+ Table table = smoObject as Table;`
	`38`	`+ if (table != null && IsPropertySupported("TemporalType", smoContext, table, CachedSmoProperties) && table.TemporalType != TableTemporalType.None)`
`39`	`39`	`{`
`40`	`40`	`return "Temporal";`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,25 +12,25 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel`
`12`	`12`	`/// </summary>`
`13`	`13`	`internal partial class TriggersChildFactory : SmoChildFactoryBase`
`14`	`14`	`{`
`15`		`- public override string GetNodeStatus(object context)`
	`15`	`+ public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)`
`16`	`16`	`{`
`17`		`- return TriggersCustomeNodeHelper.GetStatus(context);`
	`17`	`+ return TriggersCustomeNodeHelper.GetStatus(smoObject);`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`internal partial class ServerLevelServerTriggersChildFactory : SmoChildFactoryBase`
`22`	`22`	`{`
`23`		`- public override string GetNodeStatus(object context)`
	`23`	`+ public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)`
`24`	`24`	`{`
`25`		`- return TriggersCustomeNodeHelper.GetStatus(context);`
	`25`	`+ return TriggersCustomeNodeHelper.GetStatus(smoObject);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`internal partial class DatabaseTriggersChildFactory : SmoChildFactoryBase`
`30`	`30`	`{`
`31`		`- public override string GetNodeStatus(object context)`
	`31`	`+ public override string GetNodeStatus(object smoObject, SmoQueryContext smoContext)`
`32`	`32`	`{`
`33`		`- return TriggersCustomeNodeHelper.GetStatus(context);`
	`33`	`+ return TriggersCustomeNodeHelper.GetStatus(smoObject);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`