diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml index 9df8bc7b..adf6a96b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml @@ -324,6 +324,7 @@ UserDefinedFunctionType.Table + UserDefinedFunctionType.Inline @@ -332,6 +333,7 @@ UserDefinedFunctionType.Table + UserDefinedFunctionType.Inline diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs index bb0eb0cc..039aad41 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs @@ -2723,7 +2723,8 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel Type = typeof(Enum), Values = new List { - { UserDefinedFunctionType.Table } + { UserDefinedFunctionType.Table }, + { UserDefinedFunctionType.Inline } } }); filters.Add(new NodeFilter @@ -2769,7 +2770,8 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel Type = typeof(Enum), Values = new List { - { UserDefinedFunctionType.Table } + { UserDefinedFunctionType.Table }, + { UserDefinedFunctionType.Inline } } }); filters.Add(new NodeFilter diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/SmoQueryModelTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/SmoQueryModelTests.cs index eb0e76c3..439f0ef9 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/SmoQueryModelTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/SmoQueryModelTests.cs @@ -71,6 +71,16 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer Assert.False(querier.ValidFor.HasFlag(ValidForFlag.SqlDw)); } + [Fact] + public void TableValuedFunctionsIncludeInlineFunctions() + { + var tableFactory = new TableValuedFunctionsChildFactory(); + var filters = tableFactory.Filters; + Assert.True(filters.ToList().Any(filter => { + return filter.Values.Contains(UserDefinedFunctionType.Table) && filter.Values.Contains(UserDefinedFunctionType.Inline); + })); + } + private SmoQuerier GetSmoQuerier(Type querierType) { // Given the extension type loader is set to find SmoCollectionQuerier objects