ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 17:23:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update dacpac and schema compare extensions to use getConnections() (#6131)

Browse Source 
* update dacpac and schema compare extensions to use getConnections

* use more const

* make MSSQL a const

* changing name of mssql const

* add comment for name of parameter
This commit is contained in:
Kim Santiago
2019-06-24 14:16:07 -07:00
committed by GitHub
parent e3f26e8f12
commit 6a0ffdfa60
6 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -513,8 +513,8 @@ export class SchemaCompareDialog {
}
}
protected async getServerValues(isTarget: boolean): Promise<{ connection: azdata.connection.Connection, displayName: string, name: string }[]> {
let cons = await azdata.connection.getActiveConnections();
protected async getServerValues(isTarget: boolean): Promise<{ connection: azdata.connection.ConnectionProfile, displayName: string, name: string }[]> {
let cons = await azdata.connection.getConnections(/* activeConnectionsOnly */ true);
// This user has no active connections
if (!cons || cons.length === 0) {
return undefined;
@@ -668,5 +668,5 @@ export class SchemaCompareDialog {
}
interface ConnectionDropdownValue extends azdata.CategoryValue {
connection: azdata.connection.Connection;
connection: azdata.connection.ConnectionProfile;
}

11
extensions/schema-compare/src/schemaCompareResult.ts
View File

@@ -14,6 +14,7 @@ import { getTelemetryErrorType, getEndpointName } from './utils';
import { SchemaCompareDialog } from './dialogs/schemaCompareDialog';
import { isNullOrUndefined } from 'util';
const localize = nls.loadMessageBundle();
const msSqlProvider = 'MSSQL';
const diffEditorTitle = localize('schemaCompare.CompareDetailsTitle', 'Compare Details');
const applyConfirmation = localize('schemaCompare.ApplyConfirmation', 'Are you sure you want to update the target?');
const reCompareToRefeshMessage = localize('schemaCompare.RecompareToRefresh', 'Press Compare to refresh the comparison.');
@@ -252,7 +253,7 @@ export class SchemaCompareResult {
this.deploymentOptions = this.schemaCompareOptionDialog.deploymentOptions;
}
Telemetry.sendTelemetryEvent('SchemaComparisonStarted');
const service = await SchemaCompareResult.getService('MSSQL');
const service = await SchemaCompareResult.getService(msSqlProvider);
if (!this.operationId) {
// create once per page
this.operationId = generateGuid();
@@ -545,7 +546,7 @@ export class SchemaCompareResult {
// cancel compare
if (this.operationId) {
const service = await SchemaCompareResult.getService('MSSQL');
const service = await SchemaCompareResult.getService(msSqlProvider);
const result = await service.schemaCompareCancel(this.operationId);
if (!result || !result.success) {
@@ -577,7 +578,7 @@ export class SchemaCompareResult {
'startTime:': Date.now().toString(),
'operationId': this.comparisonResult.operationId
});
const service = await SchemaCompareResult.getService('MSSQL');
const service = await SchemaCompareResult.getService(msSqlProvider);
const result = await service.schemaCompareGenerateScript(this.comparisonResult.operationId, this.targetEndpointInfo.serverName, this.targetEndpointInfo.databaseName, azdata.TaskExecutionMode.script);
if (!result || !result.success) {
Telemetry.sendTelemetryEvent('SchemaCompareGenerateScriptFailed', {
@@ -642,7 +643,7 @@ export class SchemaCompareResult {
// disable apply and generate script buttons because the results are no longer valid after applying the changes
this.setButtonsForRecompare();
const service = await SchemaCompareResult.getService('MSSQL');
const service = await SchemaCompareResult.getService(msSqlProvider);
const result = await service.schemaComparePublishChanges(this.comparisonResult.operationId, this.targetEndpointInfo.serverName, this.targetEndpointInfo.databaseName, azdata.TaskExecutionMode.execute);
if (!result || !result.success) {
Telemetry.sendTelemetryEvent('SchemaCompareApplyFailed', {
@@ -777,7 +778,7 @@ export class SchemaCompareResult {
private async GetDefaultDeploymentOptions(): Promise<void> {
// Same as dacfx default options
const service = await SchemaCompareResult.getService('MSSQL');
const service = await SchemaCompareResult.getService(msSqlProvider);
let result = await service.schemaCompareGetDefaultOptions();
this.deploymentOptions = result.defaultDeploymentOptions;
}