ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor follow-ups for user management support classes (#1857)

Browse Source
This commit is contained in:
Karl Burtram
2023-02-08 18:26:44 -08:00
committed by GitHub
parent 2ef5f0918a
commit 8d428aeb8a
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
View File

@@ -271,7 +271,7 @@ WHERE do.database_id = @DbID
isSystemDB = db.IsSystemObject; isSystemDB = db.IsSystemObject;
ResourceManager manager = new ResourceManager("Microsoft.SqlServer.Management.SqlManagerUI.CreateDatabaseStrings", typeof(DatabasePrototype).Assembly); ResourceManager manager = new ResourceManager("Microsoft.SqlTools.ServiceLayer.Localization.SR", typeof(DatabasePrototype).Assembly);
this.owner = db.Owner; this.owner = db.Owner;
@@ -2012,7 +2012,7 @@ WHERE do.database_id = @DbID
(this.currentState.owner != this.originalState.owner)) (this.currentState.owner != this.originalState.owner))
{ {
// //
// bug 20000092 says the error message is confusing if this fails, so // the error message is confusing if this fails, so
// wrap this and throw a nicer error on failure. // wrap this and throw a nicer error on failure.
// //
try try

3
src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs
View File

@@ -180,9 +180,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Admin
{ {
get { return this.ServerVersion.Major > 11 && this.AzureEdition != AzureEdition.DataWarehouse; } get { return this.ServerVersion.Major > 11 && this.AzureEdition != AzureEdition.DataWarehouse; }
} }
// [Browsable(false)]
// public SubscriptionLocationKey AzureServiceLocation { get; set; }
public string BackupStorageRedundancy public string BackupStorageRedundancy
{ {

3
src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs
View File

@@ -67,9 +67,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Security
private UserPrototype InitUserNew(CDataContainer dataContainer, UserInfo user) private UserPrototype InitUserNew(CDataContainer dataContainer, UserInfo user)
{ {
// this.DataContainer = context;
// this.parentDbUrn = new Urn(this.DataContainer.ParentUrn);
// this.objectUrn = new Urn(this.DataContainer.ObjectUrn);
ExhaustiveUserTypes currentUserType; ExhaustiveUserTypes currentUserType;
UserPrototypeFactory userPrototypeFactory = UserPrototypeFactory.GetInstance(dataContainer, user); UserPrototypeFactory userPrototypeFactory = UserPrototypeFactory.GetInstance(dataContainer, user);