From a0e56c5747dfe7b5c82fdb29f4f352a6b07a69cf Mon Sep 17 00:00:00 2001 From: BranislavGrbicMDCS <55592643+BranislavGrbicMDCS@users.noreply.github.com> Date: Thu, 17 Oct 2019 20:33:09 +0200 Subject: [PATCH] Removing External table folder for sqlOnDemand (#879) * Removing External table folder for sqlOnDemand * Enabling external table flag --- .../SmoModel/TreeNodeDefinition.xml | 9 ++-- .../SmoModel/TreeNodeGenerator.cs | 47 +------------------ .../ObjectExplorer/NodePathGeneratorTests.cs | 3 -- 3 files changed, 5 insertions(+), 54 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml index 7af55320..eabff76f 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml @@ -82,7 +82,7 @@ - + @@ -161,13 +161,12 @@ - --> - + - + --> @@ -191,7 +190,7 @@ - + diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs index 8270281c..5b41da85 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs @@ -802,7 +802,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel properties.Add(new NodeSmoProperty { Name = "IsExternal", - ValidFor = ValidForFlag.Sql2016|ValidForFlag.Sql2017|ValidForFlag.AzureV12 + ValidFor = ValidForFlag.Sql2016|ValidForFlag.Sql2017|ValidForFlag.AzureV12|ValidForFlag.SqlOnDemand }); return properties; } @@ -818,14 +818,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel IsMsShippedOwned = true, SortPriority = SmoTreeNode.NextSortPriority, }); - currentChildren.Add(new FolderNode { - NodeValue = SR.SchemaHierarchy_ExternalTables, - NodeType = "Folder", - NodeTypeId = NodeTypes.ExternalTables, - IsSystemObject = false, - ValidFor = ValidForFlag.SqlOnDemand, - SortPriority = SmoTreeNode.NextSortPriority, - }); } internal override Type[] ChildQuerierTypes @@ -1299,43 +1291,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel } } - [Export(typeof(ChildFactory))] - [Shared] - internal partial class ExternalTablesChildFactory : SmoChildFactoryBase - { - public override IEnumerable ApplicableParents() { return new[] { "ExternalTables" }; } - - public override IEnumerable Filters - { - get - { - var filters = new List(); - filters.Add(new NodeFilter - { - Property = "IsExternal", - Type = typeof(bool), - Values = new List { 1 }, - }); - return filters; - } - } - - internal override Type[] ChildQuerierTypes - { - get - { - return new [] { typeof(SqlTableQuerier), }; - } - } - - public override TreeNode CreateChild(TreeNode parent, object context) - { - var child = new ExternalTableTreeNode(); - InitializeChild(parent, child, context); - return child; - } - } - [Export(typeof(ChildFactory))] [Shared] internal partial class TableChildFactory : SmoChildFactoryBase diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs index cadc1da6..48ae58e7 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs @@ -98,8 +98,6 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer "testServer/Databases/System Databases/testDatabase/Tables/testSchema.testTable/Columns/testColumn", "testServer/Databases/testDatabase/Tables/System Tables/testSchema.testTable/Columns/testColumn", "testServer/Databases/System Databases/testDatabase/Tables/System Tables/testSchema.testTable/Columns/testColumn", - "testServer/Databases/testDatabase/Tables/External Tables/testSchema.testTable/Columns/testColumn", - "testServer/Databases/System Databases/testDatabase/Tables/External Tables/testSchema.testTable/Columns/testColumn", "testServer/Databases/testDatabase/Views/testSchema.testTable/Columns/testColumn", "testServer/Databases/System Databases/testDatabase/Views/testSchema.testTable/Columns/testColumn", "testServer/Databases/testDatabase/Views/System Views/testSchema.testTable/Columns/testColumn", @@ -121,7 +119,6 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer { "testServer/testDatabase/Tables/testSchema.testTable/Columns/testColumn", "testServer/testDatabase/Tables/System Tables/testSchema.testTable/Columns/testColumn", - "testServer/testDatabase/Tables/External Tables/testSchema.testTable/Columns/testColumn", "testServer/testDatabase/Views/testSchema.testTable/Columns/testColumn", "testServer/testDatabase/Views/System Views/testSchema.testTable/Columns/testColumn" };