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

Fixed the issue with nodeType set to null for many sql objects in object explorer (#323)

Browse Source 
* Fixed the issue with nodeType set to null for sql objects
This commit is contained in:
Leila Lali
2017-04-19 15:49:00 -07:00
committed by GitHub
parent 850cf8c3e4
commit 3fd4129488
7 changed files with 201 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeTypes.cs
View File

@@ -18,7 +18,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes
ScalarValuedFunction, ScalarValuedFunction,
TableValuedFunction, TableValuedFunction,
AggregateFunction, AggregateFunction,
FileGroupInstance, FileGroup,
StoredProcedure, StoredProcedure,
UserDefinedTableType, UserDefinedTableType,
View, View,

2
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/DatabaseInstanceTreeNode.cs → src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/DatabaseTreeNode.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.SqlServer.Management.Smo;
namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
internal partial class DatabaseInstanceTreeNode internal partial class DatabaseTreeNode
{ {
/// <summary> /// <summary>

16
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNode.cs
View File

@@ -58,10 +58,22 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
NodeValue = smoObject.Name; NodeValue = smoObject.Name;
ScriptSchemaObjectBase schemaBasecObject = smoObject as ScriptSchemaObjectBase; ScriptSchemaObjectBase schemaBasecObject = smoObject as ScriptSchemaObjectBase;
ObjectMetadata = new Metadata.Contracts.ObjectMetadata(); ObjectMetadata = new Metadata.Contracts.ObjectMetadata();
ObjectMetadata.Name = smoObject.Name;
try
{
if(smoObject.Urn != null)
{
ObjectMetadata.MetadataTypeName = smoObject.Urn.Type;
}
}
catch
{
//Ignore the exception, sometimes the urn returns exception and I' not sure why
}
if (schemaBasecObject != null) if (schemaBasecObject != null)
{ {
ObjectMetadata.MetadataTypeName = schemaBasecObject.Urn?.Type;
ObjectMetadata.Name = schemaBasecObject.Name;
ObjectMetadata.Schema = schemaBasecObject.Schema; ObjectMetadata.Schema = schemaBasecObject.Schema;
if (!string.IsNullOrEmpty(ObjectMetadata.Schema)) if (!string.IsNullOrEmpty(ObjectMetadata.Schema))
{ {

60
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<ServerExplorerTree> <ServerExplorerTree>
<Node Name="Server" LocLabel="SR.SchemaHierarchy_ServerInstance" Image="Server"> <Node Name="Server" LocLabel="SR.SchemaHierarchy_Server" Image="Server">
<Child Name="Databases"/> <Child Name="Databases"/>
<Child Name="ServerLevelSecurity"/> <Child Name="ServerLevelSecurity"/>
<Child Name="ServerLevelServerObjects"/> <Child Name="ServerLevelServerObjects"/>
</Node> </Node>
<Node Name="Databases" LocLabel="SR.SchemaHierarchy_Databases" IsAsyncLoad="" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlDatabase" TreeNode="DatabaseInstanceTreeNode"> <Node Name="Databases" LocLabel="SR.SchemaHierarchy_Databases" IsAsyncLoad="" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlDatabase" TreeNode="DatabaseTreeNode">
<Child Name="SystemDatabases"/> <Child Name="SystemDatabases"/>
</Node> </Node>
<Node Name="ServerLevelSecurity" LocLabel="SR.SchemaHierarchy_Security" BaseClass="ModelBased" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12|NotContainedUser|CanViewSecurity"> <Node Name="ServerLevelSecurity" LocLabel="SR.SchemaHierarchy_Security" BaseClass="ModelBased" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12|NotContainedUser|CanViewSecurity">
@@ -60,7 +60,7 @@
<Child Name="Security"/> <Child Name="Security"/>
</Node> </Node>
<Node Name="Tables" LocLabel="SR.SchemaHierarchy_Tables" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="TableInstanceTreeNode"> <Node Name="Tables" LocLabel="SR.SchemaHierarchy_Tables" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="TableTreeNode">
<Filters> <Filters>
<Filter Property="IsFileTable" Value="0" Type="bool" /> <Filter Property="IsFileTable" Value="0" Type="bool" />
<Filter Property="IsExternal" Value="0" Type="bool" ValidFor="Sql2016|SqlvNext|AzureV12"/> <Filter Property="IsExternal" Value="0" Type="bool" ValidFor="Sql2016|SqlvNext|AzureV12"/>
@@ -74,7 +74,7 @@
<Child Name="ExternalTables"/> <Child Name="ExternalTables"/>
</Node> </Node>
<Node Name="Views" LocLabel="SR.SchemaHierarchy_Views" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlView" TreeNode="ViewInstanceTreeNode"> <Node Name="Views" LocLabel="SR.SchemaHierarchy_Views" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlView" TreeNode="ViewTreeNode">
<Child Name="SystemViews"/> <Child Name="SystemViews"/>
</Node> </Node>
@@ -89,7 +89,7 @@
<Child Name="Defaults"/> <Child Name="Defaults"/>
<Child Name="Sequences"/> <Child Name="Sequences"/>
</Node> </Node>
<Node Name="ExternalResources" LocLabel="SR.SchemaHierarchy_ExternalResources" BaseClass="ModelBased" TreeNode="ExternalResourceInstanceTreeNode" ValidFor="Sql2016|SqlvNext|AzureV12"> <Node Name="ExternalResources" LocLabel="SR.SchemaHierarchy_ExternalResources" BaseClass="ModelBased" TreeNode="ExternalResourceTreeNode" ValidFor="Sql2016|SqlvNext|AzureV12">
<Child Name="ExternalDataSources"/> <Child Name="ExternalDataSources"/>
<Child Name="ExternalFileFormats"/> <Child Name="ExternalFileFormats"/>
</Node> </Node>
@@ -130,19 +130,19 @@
</Node> </Node>
<!-- Childs of Tables --> <!-- Childs of Tables -->
<Node Name="SystemTables" LocLabel="SR.SchemaHierarchy_SystemTables" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="TableInstanceTreeNode"/> <Node Name="SystemTables" LocLabel="SR.SchemaHierarchy_SystemTables" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="TableTreeNode"/>
<Node Name="FileTables" LocLabel="SR.SchemaHierarchy_FileTables" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="TableInstanceTreeNode" ValidFor="Sql2012|Sql2014|Sql2016|SqlvNext|NotDebugInstance"> <Node Name="FileTables" LocLabel="SR.SchemaHierarchy_FileTables" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="TableTreeNode" ValidFor="Sql2012|Sql2014|Sql2016|SqlvNext|NotDebug">
<Filters> <Filters>
<Filter Property="IsFileTable" Value="1" Type="boolean" /> <Filter Property="IsFileTable" Value="1" Type="boolean" />
</Filters> </Filters>
</Node> </Node>
<Node Name="ExternalTables" LocLabel="SR.SchemaHierarchy_ExternalTables" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="ExternalTableInstanceTreeNode" ValidFor="Sql2016|SqlvNext|AzureV12"> <Node Name="ExternalTables" LocLabel="SR.SchemaHierarchy_ExternalTables" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="ExternalTableTreeNode" ValidFor="Sql2016|SqlvNext|AzureV12">
<Filters> <Filters>
<Filter Property="IsExternalTable" Value="1" Type="boolean" /> <Filter Property="IsExternalTable" Value="1" Type="boolean" />
</Filters> </Filters>
</Node> </Node>
<Node Name="Table" LocLabel="string.Empty" BaseClass="ModelBased" IsAsyncLoad="" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="HistoryTableInstanceTreeNode"> <Node Name="Table" LocLabel="string.Empty" BaseClass="ModelBased" IsAsyncLoad="" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlTable" TreeNode="HistoryTableTreeNode">
<!-- TODO Add special history table handling to only return related history table instead of all! Under Table, we directly show any related history tables.--> <!-- TODO Add special history table handling to only return related history table instead of all! Under Table, we directly show any related history tables.-->
<Filters> <Filters>
<Filter Property="TemporalType" Type="Enum" ValidFor="Sql2016|SqlvNext|AzureV12"> <Filter Property="TemporalType" Type="Enum" ValidFor="Sql2016|SqlvNext|AzureV12">
@@ -190,7 +190,7 @@
</Node> </Node>
<Node Name="Statistics" LocLabel="SR.SchemaHierarchy_Statistics" BaseClass="ModelBased" Strategy="ElementsInRelationship" ChildQuerierTypes="SqlStatistic"/> <Node Name="Statistics" LocLabel="SR.SchemaHierarchy_Statistics" BaseClass="ModelBased" Strategy="ElementsInRelationship" ChildQuerierTypes="SqlStatistic"/>
<Node Name="SystemViews" LocLabel="SR.SchemaHierarchy_SystemViews" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlView" TreeNode="ViewInstanceTreeNode"/> <Node Name="SystemViews" LocLabel="SR.SchemaHierarchy_SystemViews" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlView" TreeNode="ViewTreeNode"/>
<Node Name="View" LocLabel="string.Empty" BaseClass="ModelBased" IsAsyncLoad="" Strategy="PopulateDetails"> <Node Name="View" LocLabel="string.Empty" BaseClass="ModelBased" IsAsyncLoad="" Strategy="PopulateDetails">
<Child Name="Columns"/> <Child Name="Columns"/>
@@ -229,7 +229,7 @@
<Child Name="SystemSpatialDataTypes"/> <Child Name="SystemSpatialDataTypes"/>
</Node> </Node>
<Node Name="UserDefinedDataTypes" LocLabel="SR.SchemaHierarchy_UserDefinedDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedDataType"/> <Node Name="UserDefinedDataTypes" LocLabel="SR.SchemaHierarchy_UserDefinedDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedDataType"/>
<Node Name="UserDefinedTableTypes" LocLabel="SR.SchemaHierarchy_UserDefinedTableTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedTableType" TreeNode="UserDefinedTableTypeInstanceTreeNode" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12"/> <Node Name="UserDefinedTableTypes" LocLabel="SR.SchemaHierarchy_UserDefinedTableTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedTableType" TreeNode="UserDefinedTableTypeTreeNode" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12"/>
<Node Name="UserDefinedTypes" LocLabel="SR.SchemaHierarchy_UserDefinedTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedType" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/> <Node Name="UserDefinedTypes" LocLabel="SR.SchemaHierarchy_UserDefinedTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedType" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/>
<Node Name="XmlSchemaCollections" LocLabel="SR.SchemaHierarchy_XMLSchemaCollections" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlXmlSchemaCollection" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/> <Node Name="XmlSchemaCollections" LocLabel="SR.SchemaHierarchy_XMLSchemaCollections" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlXmlSchemaCollection" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/>
@@ -263,16 +263,16 @@
<Node Name="ExternalDataSources" LocLabel="SR.SchemaHierarchy_ExternalDataSources" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlExternalDataSource" ValidFor="Sql2016|SqlvNext|AzureV12"/> <Node Name="ExternalDataSources" LocLabel="SR.SchemaHierarchy_ExternalDataSources" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlExternalDataSource" ValidFor="Sql2016|SqlvNext|AzureV12"/>
<Node Name="ExternalFileFormats" LocLabel="SR.SchemaHierarchy_ExternalFileFormats" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlExternalFileFormat" ValidFor="Sql2016|SqlvNext"/> <Node Name="ExternalFileFormats" LocLabel="SR.SchemaHierarchy_ExternalFileFormats" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlExternalFileFormat" ValidFor="Sql2016|SqlvNext"/>
<Node Name="StoredProcedures" LocLabel="SR.SchemaHierarchy_StoredProcedures" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlProcedure" TreeNode="StoredProcedureInstanceTreeNode"> <Node Name="StoredProcedures" LocLabel="SR.SchemaHierarchy_StoredProcedures" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlProcedure" TreeNode="StoredProcedureTreeNode">
<Child Name="SystemStoredProcedures"/> <Child Name="SystemStoredProcedures"/>
</Node> </Node>
<Node Name="SystemStoredProcedures" LocLabel="SR.SchemaHierarchy_SystemStoredProcedures" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlProcedure" TreeNode="StoredProcedureInstanceTreeNode"/> <Node Name="SystemStoredProcedures" LocLabel="SR.SchemaHierarchy_SystemStoredProcedures" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlProcedure" TreeNode="StoredProcedureTreeNode"/>
<Node Name="StoredProcedure" LocLabel="string.Empty" BaseClass="ModelBased" ChildQuerierTypes="" IsAsyncLoad="" Strategy="PopulateDetails"> <Node Name="StoredProcedure" LocLabel="string.Empty" BaseClass="ModelBased" ChildQuerierTypes="" IsAsyncLoad="" Strategy="PopulateDetails">
<Child Name="StoredProcedureParameters"/> <Child Name="StoredProcedureParameters"/>
</Node> </Node>
<Node Name="StoredProcedureParameters" LocLabel="SR.SchemaHierarchy_Parameters" BaseClass="ModelBased" Strategy="StoredProcedureParameters" ChildQuerierTypes="SqlSubroutineParameter" DisableSort=""/> <Node Name="StoredProcedureParameters" LocLabel="SR.SchemaHierarchy_Parameters" BaseClass="ModelBased" Strategy="StoredProcedureParameters" ChildQuerierTypes="SqlSubroutineParameter" DisableSort=""/>
<Node Name="TableValuedFunctions" LocLabel="SR.SchemaHierarchy_TableValuedFunctions" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedFunction" TreeNode="TableValuedFunctionInstanceTreeNode"> <Node Name="TableValuedFunctions" LocLabel="SR.SchemaHierarchy_TableValuedFunctions" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedFunction" TreeNode="TableValuedFunctionTreeNode">
<Filters> <Filters>
<Filter Property="UserDefinedFunctionType" Type="Enum" ValidFor="Sql2016|SqlvNext|AzureV12"> <Filter Property="UserDefinedFunctionType" Type="Enum" ValidFor="Sql2016|SqlvNext|AzureV12">
<Value>UserDefinedFunctionType.Table</Value> <Value>UserDefinedFunctionType.Table</Value>
@@ -284,7 +284,7 @@
</Node> </Node>
<Node Name="TableValuedFunctionParameters" LocLabel="SR.SchemaHierarchy_Parameters" BaseClass="ModelBased" Strategy="FunctionParameters" ChildQuerierTypes="SqlSubroutineParameter" DisableSort=""/> <Node Name="TableValuedFunctionParameters" LocLabel="SR.SchemaHierarchy_Parameters" BaseClass="ModelBased" Strategy="FunctionParameters" ChildQuerierTypes="SqlSubroutineParameter" DisableSort=""/>
<Node Name="ScalarValuedFunctions" LocLabel="SR.SchemaHierarchy_ScalarValuedFunctions" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedFunction" TreeNode="ScalarValuedFunctionInstanceTreeNode" > <Node Name="ScalarValuedFunctions" LocLabel="SR.SchemaHierarchy_ScalarValuedFunctions" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedFunction" TreeNode="ScalarValuedFunctionTreeNode" >
<Filters> <Filters>
<Filter Property="UserDefinedFunctionType" Type="Enum" ValidFor="Sql2016|SqlvNext|AzureV12"> <Filter Property="UserDefinedFunctionType" Type="Enum" ValidFor="Sql2016|SqlvNext|AzureV12">
<Value>UserDefinedFunctionType.Table</Value> <Value>UserDefinedFunctionType.Table</Value>
@@ -296,7 +296,7 @@
</Node> </Node>
<Node Name="ScalarValuedFunctionParameters" LocLabel="SR.SchemaHierarchy_Parameters" BaseClass="ModelBased" Strategy="FunctionParameters" ChildQuerierTypes="SqlSubroutineParameter" DisableSort=""/> <Node Name="ScalarValuedFunctionParameters" LocLabel="SR.SchemaHierarchy_Parameters" BaseClass="ModelBased" Strategy="FunctionParameters" ChildQuerierTypes="SqlSubroutineParameter" DisableSort=""/>
<Node Name="AggregateFunctions" LocLabel="SR.SchemaHierarchy_AggregateFunctions" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedAggregate" TreeNode="AggregateFunctionInstanceTreeNode" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/> <Node Name="AggregateFunctions" LocLabel="SR.SchemaHierarchy_AggregateFunctions" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlUserDefinedAggregate" TreeNode="AggregateFunctionTreeNode" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/>
<Node Name="AggregateFunction" LocLabel="string.Empty" BaseClass="ModelBased" ChildQuerierTypes="" IsAsyncLoad="" Strategy="PopulateDetails"> <Node Name="AggregateFunction" LocLabel="string.Empty" BaseClass="ModelBased" ChildQuerierTypes="" IsAsyncLoad="" Strategy="PopulateDetails">
<Child Name="AggregateFunctionParameters"/> <Child Name="AggregateFunctionParameters"/>
</Node> </Node>
@@ -311,7 +311,7 @@
<Node Name="RemoteServiceBindings" LocLabel="SR.SchemaHierarchy_RemoteServiceBindings" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlRemoteServiceBinding"/> <Node Name="RemoteServiceBindings" LocLabel="SR.SchemaHierarchy_RemoteServiceBindings" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlRemoteServiceBinding"/>
<Node Name="BrokerPriorities" LocLabel="SR.SchemaHierarchy_BrokerPriorities" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlBrokerPriority" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext"/> <Node Name="BrokerPriorities" LocLabel="SR.SchemaHierarchy_BrokerPriorities" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlBrokerPriority" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext"/>
<Node Name="FileGroups" LocLabel="SR.SchemaHierarchy_FileGroups" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFileGroup" TreeNode="FileGroupInstanceTreeNode"/> <Node Name="FileGroups" LocLabel="SR.SchemaHierarchy_FileGroups" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFileGroup" TreeNode="FileGroupTreeNode"/>
<Node Name="FullTextCatalogs" LocLabel="SR.SchemaHierarchy_FullTextCatalogs" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFullTextCatalog"/> <Node Name="FullTextCatalogs" LocLabel="SR.SchemaHierarchy_FullTextCatalogs" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFullTextCatalog"/>
<Node Name="FullTextStopLists" LocLabel="SR.SchemaHierarchy_FullTextStopLists" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFullTextStopList" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/> <Node Name="FullTextStopLists" LocLabel="SR.SchemaHierarchy_FullTextStopLists" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFullTextStopList" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/>
<Node Name="SqlLogFiles" LocLabel="SR.SchemaHierarchy_LogFiles" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFile"/> <Node Name="SqlLogFiles" LocLabel="SR.SchemaHierarchy_LogFiles" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlFile"/>
@@ -319,7 +319,7 @@
<Node Name="PartitionSchemes" LocLabel="SR.SchemaHierarchy_PartitionSchemes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlPartitionScheme"/> <Node Name="PartitionSchemes" LocLabel="SR.SchemaHierarchy_PartitionSchemes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlPartitionScheme"/>
<Node Name="SearchPropertyLists" LocLabel="SR.SchemaHierarchy_SearchPropertyLists" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlSearchPropertyList" ValidFor="Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/> <Node Name="SearchPropertyLists" LocLabel="SR.SchemaHierarchy_SearchPropertyLists" BaseClass="ModelBased" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlSearchPropertyList" ValidFor="Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/>
<Node Name="FileGroupInstance" LocLabel="string.Empty" BaseClass="ModelBased" ChildQuerierTypes=""> <Node Name="FileGroup" LocLabel="string.Empty" BaseClass="ModelBased" ChildQuerierTypes="">
<Child Name="FileGroupFiles"/> <Child Name="FileGroupFiles"/>
</Node> </Node>
@@ -375,18 +375,18 @@
<Node Name="SystemServices" LocLabel="SR.SchemaHierarchy_SystemServices" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlService"/> <Node Name="SystemServices" LocLabel="SR.SchemaHierarchy_SystemServices" BaseClass="ModelBased" IsMsShippedOwned="true" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlService"/>
<CodeGenOptions> <CodeGenOptions>
<UniqueTreeNode Name="DatabaseInstanceTreeNode"/> <UniqueTreeNode Name="DatabaseTreeNode"/>
<UniqueTreeNode Name="TableInstanceTreeNode"/> <UniqueTreeNode Name="TableTreeNode"/>
<UniqueTreeNode Name="ViewInstanceTreeNode"/> <UniqueTreeNode Name="ViewTreeNode"/>
<UniqueTreeNode Name="UserDefinedTableTypeInstanceTreeNode"/> <UniqueTreeNode Name="UserDefinedTableTypeTreeNode"/>
<UniqueTreeNode Name="StoredProcedureInstanceTreeNode"/> <UniqueTreeNode Name="StoredProcedureTreeNode"/>
<UniqueTreeNode Name="TableValuedFunctionInstanceTreeNode"/> <UniqueTreeNode Name="TableValuedFunctionTreeNode"/>
<UniqueTreeNode Name="ScalarValuedFunctionInstanceTreeNode"/> <UniqueTreeNode Name="ScalarValuedFunctionTreeNode"/>
<UniqueTreeNode Name="AggregateFunctionInstanceTreeNode"/> <UniqueTreeNode Name="AggregateFunctionTreeNode"/>
<UniqueTreeNode Name="FileGroupInstanceTreeNode"/> <UniqueTreeNode Name="FileGroupTreeNode"/>
<UniqueTreeNode Name="ExternalTableInstanceTreeNode"/> <UniqueTreeNode Name="ExternalTableTreeNode"/>
<UniqueTreeNode Name="ExternalResourceInstanceTreeNode"/> <UniqueTreeNode Name="ExternalResourceTreeNode"/>
<UniqueTreeNode Name="HistoryTableInstanceTreeNode" /> <UniqueTreeNode Name="HistoryTableTreeNode" />
</CodeGenOptions> </CodeGenOptions>
<!-- WARNING: Specifying reverse dependencies that could load large numbers of objects will be detrimental to performance. --> <!-- WARNING: Specifying reverse dependencies that could load large numbers of objects will be detrimental to performance. -->

185
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs
View File

@@ -7,9 +7,9 @@ using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
internal sealed partial class DatabaseInstanceTreeNode : SmoTreeNode internal sealed partial class DatabaseTreeNode : SmoTreeNode
{ {
public DatabaseInstanceTreeNode() : base() public DatabaseTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "Database"; this.NodeType = "Database";
@@ -18,9 +18,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class TableInstanceTreeNode : SmoTreeNode internal sealed partial class TableTreeNode : SmoTreeNode
{ {
public TableInstanceTreeNode() : base() public TableTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "Table"; this.NodeType = "Table";
@@ -29,9 +29,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class ViewInstanceTreeNode : SmoTreeNode internal sealed partial class ViewTreeNode : SmoTreeNode
{ {
public ViewInstanceTreeNode() : base() public ViewTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "View"; this.NodeType = "View";
@@ -40,9 +40,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class UserDefinedTableTypeInstanceTreeNode : SmoTreeNode internal sealed partial class UserDefinedTableTypeTreeNode : SmoTreeNode
{ {
public UserDefinedTableTypeInstanceTreeNode() : base() public UserDefinedTableTypeTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "UserDefinedTableType"; this.NodeType = "UserDefinedTableType";
@@ -51,9 +51,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class StoredProcedureInstanceTreeNode : SmoTreeNode internal sealed partial class StoredProcedureTreeNode : SmoTreeNode
{ {
public StoredProcedureInstanceTreeNode() : base() public StoredProcedureTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "StoredProcedure"; this.NodeType = "StoredProcedure";
@@ -62,9 +62,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class TableValuedFunctionInstanceTreeNode : SmoTreeNode internal sealed partial class TableValuedFunctionTreeNode : SmoTreeNode
{ {
public TableValuedFunctionInstanceTreeNode() : base() public TableValuedFunctionTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "TableValuedFunction"; this.NodeType = "TableValuedFunction";
@@ -73,9 +73,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class ScalarValuedFunctionInstanceTreeNode : SmoTreeNode internal sealed partial class ScalarValuedFunctionTreeNode : SmoTreeNode
{ {
public ScalarValuedFunctionInstanceTreeNode() : base() public ScalarValuedFunctionTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "ScalarValuedFunction"; this.NodeType = "ScalarValuedFunction";
@@ -84,9 +84,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class AggregateFunctionInstanceTreeNode : SmoTreeNode internal sealed partial class AggregateFunctionTreeNode : SmoTreeNode
{ {
public AggregateFunctionInstanceTreeNode() : base() public AggregateFunctionTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "AggregateFunction"; this.NodeType = "AggregateFunction";
@@ -95,20 +95,20 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class FileGroupInstanceTreeNode : SmoTreeNode internal sealed partial class FileGroupTreeNode : SmoTreeNode
{ {
public FileGroupInstanceTreeNode() : base() public FileGroupTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "FileGroupInstance"; this.NodeType = "FileGroup";
this.NodeTypeId = NodeTypes.FileGroupInstance; this.NodeTypeId = NodeTypes.FileGroup;
OnInitialize(); OnInitialize();
} }
} }
internal sealed partial class ExternalTableInstanceTreeNode : SmoTreeNode internal sealed partial class ExternalTableTreeNode : SmoTreeNode
{ {
public ExternalTableInstanceTreeNode() : base() public ExternalTableTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "ExternalTable"; this.NodeType = "ExternalTable";
@@ -117,9 +117,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class ExternalResourceInstanceTreeNode : SmoTreeNode internal sealed partial class ExternalResourceTreeNode : SmoTreeNode
{ {
public ExternalResourceInstanceTreeNode() : base() public ExternalResourceTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "ExternalResource"; this.NodeType = "ExternalResource";
@@ -128,9 +128,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
internal sealed partial class HistoryTableInstanceTreeNode : SmoTreeNode internal sealed partial class HistoryTableTreeNode : SmoTreeNode
{ {
public HistoryTableInstanceTreeNode() : base() public HistoryTableTreeNode() : base()
{ {
NodeValue = string.Empty; NodeValue = string.Empty;
this.NodeType = "HistoryTable"; this.NodeType = "HistoryTable";
@@ -141,7 +141,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class ServerInstanceChildFactory : SmoChildFactoryBase internal partial class ServerChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "Server" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "Server" }; }
@@ -197,7 +197,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new DatabaseInstanceTreeNode(); var child = new DatabaseTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -339,6 +339,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelLinkedServerLogin";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -362,6 +363,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelLogin";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -385,6 +387,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelServerRole";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -408,6 +411,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelCredential";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -431,6 +435,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelCryptographicProvider";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -454,6 +459,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelServerAudit";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -477,6 +483,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelServerAuditSpecification";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -500,6 +507,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelEndpoint";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -523,6 +531,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelLinkedServer";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -546,6 +555,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelServerTrigger";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -569,6 +579,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ServerLevelErrorMessage";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -576,7 +587,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class DatabaseInstanceChildFactory : SmoChildFactoryBase internal partial class DatabaseChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "Database" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "Database" }; }
@@ -670,7 +681,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
NodeValue = SR.SchemaHierarchy_FileTables, NodeValue = SR.SchemaHierarchy_FileTables,
NodeType = "Folder", NodeType = "Folder",
NodeTypeId = NodeTypes.FileTables, NodeTypeId = NodeTypes.FileTables,
ValidFor = ValidForFlag.Sql2012|ValidForFlag.Sql2014|ValidForFlag.Sql2016|ValidForFlag.NotDebugInstance, ValidFor = ValidForFlag.Sql2012|ValidForFlag.Sql2014|ValidForFlag.Sql2016,
SortPriority = SmoTreeNode.NextSortPriority, SortPriority = SmoTreeNode.NextSortPriority,
}); });
currentChildren.Add(new FolderNode { currentChildren.Add(new FolderNode {
@@ -692,7 +703,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new TableInstanceTreeNode(); var child = new TableTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -725,7 +736,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new ViewInstanceTreeNode(); var child = new ViewTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -749,6 +760,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Synonym";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1093,7 +1105,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new TableInstanceTreeNode(); var child = new TableTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1115,7 +1127,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new TableInstanceTreeNode(); var child = new TableTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1137,7 +1149,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new ExternalTableInstanceTreeNode(); var child = new ExternalTableTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1145,7 +1157,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class TableInstanceChildFactory : SmoChildFactoryBase internal partial class TableChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "Table" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "Table" }; }
@@ -1199,7 +1211,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new HistoryTableInstanceTreeNode(); var child = new HistoryTableTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1207,7 +1219,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class HistoryTableInstanceChildFactory : SmoChildFactoryBase internal partial class HistoryTableChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "HistoryTable" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "HistoryTable" }; }
@@ -1252,7 +1264,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class ExternalTableInstanceChildFactory : SmoChildFactoryBase internal partial class ExternalTableChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "ExternalTable" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "ExternalTable" }; }
@@ -1307,6 +1319,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Column";
child.SortPriority = SmoTreeNode.NextSortPriority; child.SortPriority = SmoTreeNode.NextSortPriority;
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
@@ -1331,6 +1344,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Key";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1354,6 +1368,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Constraint";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1377,6 +1392,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Trigger";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1400,6 +1416,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Indexe";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1423,6 +1440,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Statistic";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1444,7 +1462,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new ViewInstanceTreeNode(); var child = new ViewTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1452,7 +1470,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class ViewInstanceChildFactory : SmoChildFactoryBase internal partial class ViewChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "View" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "View" }; }
@@ -1556,6 +1574,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "DatabaseTrigger";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1579,6 +1598,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Assemblie";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1654,6 +1674,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Rule";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1677,6 +1698,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Default";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1700,6 +1722,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Sequence";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1798,6 +1821,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "UserDefinedDataType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1819,7 +1843,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new UserDefinedTableTypeInstanceTreeNode(); var child = new UserDefinedTableTypeTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1843,6 +1867,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "UserDefinedType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1866,6 +1891,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "XmlSchemaCollection";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1873,7 +1899,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class UserDefinedTableTypeInstanceChildFactory : SmoChildFactoryBase internal partial class UserDefinedTableTypeChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "UserDefinedTableType" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "UserDefinedTableType" }; }
@@ -1933,6 +1959,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "UserDefinedTableTypeColumn";
child.SortPriority = SmoTreeNode.NextSortPriority; child.SortPriority = SmoTreeNode.NextSortPriority;
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
@@ -1957,6 +1984,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "UserDefinedTableTypeKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -1980,6 +2008,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "UserDefinedTableTypeConstraint";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2003,6 +2032,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemExactNumeric";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2026,6 +2056,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemApproximateNumeric";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2049,6 +2080,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemDateAndTime";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2072,6 +2104,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemCharacterString";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2095,6 +2128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemUnicodeCharacterString";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2118,6 +2152,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemBinaryString";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2141,6 +2176,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemOtherDataType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2164,6 +2200,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemClrDataType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2187,6 +2224,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemSpatialDataType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2210,6 +2248,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ExternalDataSource";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2233,6 +2272,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ExternalFileFormat";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2265,7 +2305,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new StoredProcedureInstanceTreeNode(); var child = new StoredProcedureTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2287,7 +2327,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new StoredProcedureInstanceTreeNode(); var child = new StoredProcedureTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2295,7 +2335,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class StoredProcedureInstanceChildFactory : SmoChildFactoryBase internal partial class StoredProcedureChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "StoredProcedure" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "StoredProcedure" }; }
@@ -2343,6 +2383,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "StoredProcedureParameter";
child.SortPriority = SmoTreeNode.NextSortPriority; child.SortPriority = SmoTreeNode.NextSortPriority;
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
@@ -2365,7 +2406,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new TableValuedFunctionInstanceTreeNode(); var child = new TableValuedFunctionTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2373,7 +2414,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class TableValuedFunctionInstanceChildFactory : SmoChildFactoryBase internal partial class TableValuedFunctionChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "TableValuedFunction" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "TableValuedFunction" }; }
@@ -2421,6 +2462,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "TableValuedFunctionParameter";
child.SortPriority = SmoTreeNode.NextSortPriority; child.SortPriority = SmoTreeNode.NextSortPriority;
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
@@ -2443,7 +2485,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new ScalarValuedFunctionInstanceTreeNode(); var child = new ScalarValuedFunctionTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2451,7 +2493,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class ScalarValuedFunctionInstanceChildFactory : SmoChildFactoryBase internal partial class ScalarValuedFunctionChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "ScalarValuedFunction" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "ScalarValuedFunction" }; }
@@ -2499,6 +2541,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ScalarValuedFunctionParameter";
child.SortPriority = SmoTreeNode.NextSortPriority; child.SortPriority = SmoTreeNode.NextSortPriority;
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
@@ -2521,7 +2564,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new AggregateFunctionInstanceTreeNode(); var child = new AggregateFunctionTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2529,7 +2572,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class AggregateFunctionInstanceChildFactory : SmoChildFactoryBase internal partial class AggregateFunctionChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "AggregateFunction" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "AggregateFunction" }; }
@@ -2577,6 +2620,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "AggregateFunctionParameter";
child.SortPriority = SmoTreeNode.NextSortPriority; child.SortPriority = SmoTreeNode.NextSortPriority;
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
@@ -2601,6 +2645,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "RemoteServiceBinding";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2624,6 +2669,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "BrokerPrioritie";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2645,7 +2691,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
public override TreeNode CreateChild(TreeNode parent, object context) public override TreeNode CreateChild(TreeNode parent, object context)
{ {
var child = new FileGroupInstanceTreeNode(); var child = new FileGroupTreeNode();
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2669,6 +2715,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "FullTextCatalog";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2692,6 +2739,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "FullTextStopList";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2715,6 +2763,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SqlLogFile";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2738,6 +2787,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "PartitionFunction";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2761,6 +2811,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "PartitionScheme";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2784,6 +2835,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SearchPropertyList";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2791,9 +2843,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
[Export(typeof(ChildFactory))] [Export(typeof(ChildFactory))]
[Shared] [Shared]
internal partial class FileGroupInstanceChildFactory : SmoChildFactoryBase internal partial class FileGroupChildFactory : SmoChildFactoryBase
{ {
public override IEnumerable<string> ApplicableParents() { return new[] { "FileGroupInstance" }; } public override IEnumerable<string> ApplicableParents() { return new[] { "FileGroup" }; }
protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren, TreeNode parent) protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren, TreeNode parent)
{ {
@@ -2832,6 +2884,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "FileGroupFile";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2855,6 +2908,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "User";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2910,6 +2964,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Schema";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2933,6 +2988,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "AsymmetricKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2956,6 +3012,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Certificate";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -2979,6 +3036,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SymmetricKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3002,6 +3060,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "DatabaseEncryptionKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3025,6 +3084,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "MasterKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3048,6 +3108,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "DatabaseAuditSpecification";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3071,6 +3132,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SecurityPolicie";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3094,6 +3156,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "DatabaseScopedCredential";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3150,6 +3213,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "DatabaseRole";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3173,6 +3237,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ApplicationRole";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3196,6 +3261,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ColumnMasterKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3219,6 +3285,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "ColumnEncryptionKey";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3253,6 +3320,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "MessageType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3276,6 +3344,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemMessageType";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3310,6 +3379,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Contract";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3333,6 +3403,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemContract";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3367,6 +3438,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Queue";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3390,6 +3462,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemQueue";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3424,6 +3497,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "Service";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }
@@ -3447,6 +3521,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
var child = new SmoTreeNode(); var child = new SmoTreeNode();
child.IsAlwaysLeaf = true; child.IsAlwaysLeaf = true;
child.NodeType = "SystemService";
InitializeChild(child, context); InitializeChild(child, context);
return child; return child;
} }

6
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.tt
View File

@@ -179,6 +179,12 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
{ {
WriteLine(" var child = new SmoTreeNode();"); WriteLine(" var child = new SmoTreeNode();");
WriteLine(" child.IsAlwaysLeaf = true;"); WriteLine(" child.IsAlwaysLeaf = true;");
if (type.EndsWith("s"))
{
var typeName = type.Substring(0, type.Length - 1);
WriteLine(string.Format(" child.NodeType = \"{0}\";", typeName));
}
} }
else else
{ {

12
test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/ObjectExplorer/ObjectExplorerServiceTests.cs
View File

@@ -89,14 +89,13 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
!node.NodePath.Contains("FileTables") && !node.NodePath.Contains("External Tables")) !node.NodePath.Contains("FileTables") && !node.NodePath.Contains("External Tables"))
{ {
var labaleToUpper = node.Label.ToUpper(); var labaleToUpper = node.Label.ToUpper();
if (labaleToUpper.Contains("TABLE") || labaleToUpper.Contains("StoredProcedure")
|| labaleToUpper.Contains("VIEW"))
{
foreach (var child in children) foreach (var child in children)
{ {
if (child.NodeType != "Folder") if (child.NodeType != "Folder")
{ {
Assert.NotNull(child.Metadata); Assert.NotNull(child.NodeType);
if (child.Metadata != null && !string.IsNullOrEmpty(child.Metadata.MetadataTypeName))
{
if (!string.IsNullOrEmpty(child.Metadata.Schema)) if (!string.IsNullOrEmpty(child.Metadata.Schema))
{ {
Assert.Equal($"{child.Metadata.Schema}.{child.Metadata.Name}", child.Label); Assert.Equal($"{child.Metadata.Schema}.{child.Metadata.Name}", child.Label);
@@ -106,10 +105,13 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
Assert.Equal(child.Metadata.Name, child.Label); Assert.Equal(child.Metadata.Name, child.Label);
} }
} }
} else
{
} }
} }
}
}
foreach (var child in children) foreach (var child in children)
{ {
//Console.WriteLine(child.Label); //Console.WriteLine(child.Label);