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

Fix schema compare options reset (#14225)

Browse Source 
* fix schema compare options reset not updating correctly

* bump version
This commit is contained in:
Kim Santiago
2021-02-10 13:46:46 -08:00
committed by GitHub
parent 800cd2fa89
commit bb29ae00c9
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/schema-compare/package.json
View File

@@ -2,7 +2,7 @@
"name": "schema-compare", "name": "schema-compare",
"displayName": "%displayName%", "displayName": "%displayName%",
"description": "%description%", "description": "%description%",
"version": "1.9.0", "version": "1.9.1",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": false, "preview": false,
"engines": { "engines": {

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

@@ -13,7 +13,6 @@ import { SchemaCompareOptionsModel } from '../models/schemaCompareOptionsModel';
export class SchemaCompareOptionsDialog { export class SchemaCompareOptionsDialog {
public dialog: azdata.window.Dialog; public dialog: azdata.window.Dialog;
public deploymentOptions: mssql.DeploymentOptions;
private generalOptionsTab: azdata.window.DialogTab; private generalOptionsTab: azdata.window.DialogTab;
private objectTypesTab: azdata.window.DialogTab; private objectTypesTab: azdata.window.DialogTab;
@@ -31,7 +30,6 @@ export class SchemaCompareOptionsDialog {
private optionsModel: SchemaCompareOptionsModel; private optionsModel: SchemaCompareOptionsModel;
constructor(defaultOptions: mssql.DeploymentOptions, private schemaComparison: SchemaCompareMainWindow) { constructor(defaultOptions: mssql.DeploymentOptions, private schemaComparison: SchemaCompareMainWindow) {
this.deploymentOptions = defaultOptions;
this.optionsModel = new SchemaCompareOptionsModel(defaultOptions); this.optionsModel = new SchemaCompareOptionsModel(defaultOptions);
} }
@@ -66,7 +64,7 @@ export class SchemaCompareOptionsDialog {
protected execute(): void { protected execute(): void {
this.optionsModel.setDeploymentOptions(); this.optionsModel.setDeploymentOptions();
this.optionsModel.setObjectTypeOptions(); this.optionsModel.setObjectTypeOptions();
this.schemaComparison.setDeploymentOptions(this.deploymentOptions); this.schemaComparison.setDeploymentOptions(this.optionsModel.deploymentOptions);
if (this.optionsChanged) { if (this.optionsChanged) {
vscode.window.showWarningMessage(loc.OptionsChangedMessage, loc.YesButtonText, loc.NoButtonText).then((result) => { vscode.window.showWarningMessage(loc.OptionsChangedMessage, loc.YesButtonText, loc.NoButtonText).then((result) => {
@@ -85,7 +83,7 @@ export class SchemaCompareOptionsDialog {
private async reset(): Promise<void> { private async reset(): Promise<void> {
let service = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.IExtension).schemaCompare; let service = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.IExtension).schemaCompare;
let result = await service.schemaCompareGetDefaultOptions(); let result = await service.schemaCompareGetDefaultOptions();
this.deploymentOptions = result.defaultDeploymentOptions; this.optionsModel.deploymentOptions = result.defaultDeploymentOptions;
this.optionsChanged = true; this.optionsChanged = true;
await this.updateOptionsTable(); await this.updateOptionsTable();