From 24a323b37de1ec440209c0df6bdeee2d07abaa6a Mon Sep 17 00:00:00 2001 From: Hai Cao Date: Fri, 12 May 2023 14:38:16 -0700 Subject: [PATCH] Fix effective permission column field (#2061) * fix effective permission * Revert "fix effective permission" This reverts commit 5a97f108c640c7c2bfd22fe21852e880115ee7c9. * remove column info for may --- .../ObjectManagement/SecurableUtils.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/SecurableUtils.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/SecurableUtils.cs index 5076f1d9..b450bc4a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/SecurableUtils.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/SecurableUtils.cs @@ -203,19 +203,21 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement var dataModel = new EffectivePermissionsData(dataContainer); List res = new List(); DataSet data = dataModel.QueryEffectivePermissions(); - // STrace.Assert(data.Tables.Count == 1, "Unknown number of tables returned"); if (data.Tables.Count > 0) { DataTable table = data.Tables[0]; - // STrace.Assert(table.Columns.Count >= 1 && table.Columns.Count <= 2, "Too many columns returned"); bool hasColumnInformation = dataModel.HasColumnInformation; // loop through and add rows foreach (DataRow row in table.Rows) { + if (hasColumnInformation && !string.IsNullOrEmpty(row[1].ToString())) + { + continue; + } res.Add(row[0].ToString()); } }