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

Change hardcoded MSSQL provider name to use constant instead (#5953)

Browse Source
This commit is contained in:
Charles Gagnon
2019-06-10 18:10:39 +00:00
committed by GitHub
parent 97a37e6834
commit 673ecc3870
27 changed files with 118 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/workbench/parts/dashboard/dashboardInput.ts
View File

@@ -11,6 +11,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { mssqlProviderName } from 'sql/platform/connection/common/constants';
export class DashboardInput extends EditorInput {
@@ -93,7 +94,7 @@ export class DashboardInput extends EditorInput {
}
private isMasterMssql(): boolean {
return this.connectionProfile.providerName.toLowerCase() === 'mssql'
return this.connectionProfile.providerName === mssqlProviderName
&& this.connectionProfile.databaseName.toLowerCase() === 'master';
}

3
src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts
View File

@@ -19,6 +19,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ILogService } from 'vs/platform/log/common/log';
import { mssqlProviderName } from 'sql/platform/connection/common/constants';
export class ServerDashboardPage extends DashboardPage implements OnInit {
protected propertiesWidget: WidgetConfig = {
@@ -53,7 +54,7 @@ export class ServerDashboardPage extends DashboardPage implements OnInit {
// special-case handling for MSSQL data provider
const connInfo = this.dashboardService.connectionManagementService.connectionInfo;
if (connInfo && connInfo.providerId === 'MSSQL') {
if (connInfo && connInfo.providerId === mssqlProviderName) {
// revert back to default database
this._letDashboardPromise = this.dashboardService.connectionManagementService.changeDatabase('master').then();
} else {

3
src/sql/workbench/parts/dashboard/widgets/properties/propertiesJson.ts
View File

@@ -5,13 +5,14 @@
import { ProviderProperties } from './propertiesWidget.component';
import * as nls from 'vs/nls';
import { mssqlProviderName } from 'sql/platform/connection/common/constants';
const azureEditionDisplayName = nls.localize('azureEdition', 'Edition');
const azureType = nls.localize('azureType', 'Type');
export const properties: Array<ProviderProperties> = [
{
provider: 'MSSQL',
provider: mssqlProviderName,
flavors: [
{
flavor: 'on_prem',