From 79350e10f9a5395bffa3fa56650496c17ad61366 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 29 May 2017 16:36:55 -0700 Subject: [PATCH] Couple workarounds for OE refresh issues on RHEL (#365) --- .../ObjectExplorer/SmoModel/SmoQuerier.cs | 19 +++++++++++-------- .../SqlContext/ObjectExplorerSettings.cs | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs index 85c619e5..2c6f2dc3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs @@ -149,14 +149,17 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel protected IEnumerable GetSmoCollectionResult(HashSet urns, SmoCollectionBase retValue, SqlSmoObject parent) where T : SqlSmoObject { - if (urns != null) - { - return new SmoCollectionWrapper(retValue).Where(c => PassesFinalFilters(parent, c) && urns.Contains(c.Urn)); - } - else - { - return new SmoCollectionWrapper(retValue).Where(c => PassesFinalFilters(parent, c)); - } + // the below code is filtering out tables on helsinki system + return new SmoCollectionWrapper(retValue); + + // if (urns != null) + // { + // return new SmoCollectionWrapper(retValue).Where(c => PassesFinalFilters(parent, c) && urns.Contains(c.Urn)); + // } + // else + // { + // return new SmoCollectionWrapper(retValue).Where(c => PassesFinalFilters(parent, c)); + // } } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/ObjectExplorerSettings.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/ObjectExplorerSettings.cs index b22aa49b..8d0adf56 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/ObjectExplorerSettings.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/ObjectExplorerSettings.cs @@ -10,8 +10,8 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlContext /// public class ObjectExplorerSettings { - public static int DefaultCreateSessionTimeout = 10; - public static int DefaultExpandTimeout = 10; + public static int DefaultCreateSessionTimeout = 300; + public static int DefaultExpandTimeout = 300; public ObjectExplorerSettings() {