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

fix options not getting set and aggregates not getting unchecked (#6675)

Browse Source
This commit is contained in:
Kim Santiago
2019-08-09 14:13:48 -07:00
committed by GitHub
parent 70269a3890
commit edeab906bc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import * as nls from 'vscode-nls';
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { SchemaCompareMainWindow } from '../schemaCompareMainWindow'; import { SchemaCompareMainWindow } from '../schemaCompareMainWindow';
import { isNullOrUndefined } from 'util';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
@@ -445,10 +446,11 @@ export class SchemaCompareOptionsDialog {
protected async execute() { protected async execute() {
this.SetDeploymentOptions(); this.SetDeploymentOptions();
this.SetObjectTypeOptions(); this.SetObjectTypeOptions();
this.schemaComparison.setDeploymentOptions(this.deploymentOptions);
if (this.optionsChanged) { if (this.optionsChanged) {
vscode.window.showWarningMessage(SchemaCompareOptionsDialog.OptionsChangedMessage, SchemaCompareOptionsDialog.YesButtonText, SchemaCompareOptionsDialog.NoButtonText).then((result) => { vscode.window.showWarningMessage(SchemaCompareOptionsDialog.OptionsChangedMessage, SchemaCompareOptionsDialog.YesButtonText, SchemaCompareOptionsDialog.NoButtonText).then((result) => {
if (result === SchemaCompareOptionsDialog.YesButtonText) { if (result === SchemaCompareOptionsDialog.YesButtonText) {
this.schemaComparison.setDeploymentOptions(this.deploymentOptions);
this.schemaComparison.startCompare(); this.schemaComparison.startCompare();
} }
}); });
@@ -1107,7 +1109,7 @@ export class SchemaCompareOptionsDialog {
private GetSchemaCompareIncludedObjectsUtil(label): boolean { private GetSchemaCompareIncludedObjectsUtil(label): boolean {
switch (label) { switch (label) {
case SchemaCompareOptionsDialog.Aggregates: case SchemaCompareOptionsDialog.Aggregates:
return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.Aggregates)) ? false : true; return !isNullOrUndefined(this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.Aggregates)) ? false : true;
case SchemaCompareOptionsDialog.ApplicationRoles: case SchemaCompareOptionsDialog.ApplicationRoles:
return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.ApplicationRoles)) ? false : true; return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.ApplicationRoles)) ? false : true;
case SchemaCompareOptionsDialog.Assemblies: case SchemaCompareOptionsDialog.Assemblies: