From bb29ae00c9ecd99892a102309c0104ed80affd65 Mon Sep 17 00:00:00 2001
From: Kim Santiago <31145923+kisantia@users.noreply.github.com>
Date: Wed, 10 Feb 2021 13:46:46 -0800
Subject: [PATCH] Fix schema compare options reset (#14225)

* fix schema compare options reset not updating correctly

* bump version
---
 extensions/schema-compare/package.json                      | 2 +-
 .../src/dialogs/schemaCompareOptionsDialog.ts               | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extensions/schema-compare/package.json b/extensions/schema-compare/package.json
index be40e68708..dd8be841bc 100644
--- a/extensions/schema-compare/package.json
+++ b/extensions/schema-compare/package.json
@@ -2,7 +2,7 @@
   "name": "schema-compare",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "publisher": "Microsoft",
   "preview": false,
   "engines": {
diff --git a/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts b/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts
index 3927c738fe..916a86525f 100644
--- a/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts
+++ b/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts
@@ -13,7 +13,6 @@ import { SchemaCompareOptionsModel } from '../models/schemaCompareOptionsModel';
 
 export class SchemaCompareOptionsDialog {
 	public dialog: azdata.window.Dialog;
-	public deploymentOptions: mssql.DeploymentOptions;
 
 	private generalOptionsTab: azdata.window.DialogTab;
 	private objectTypesTab: azdata.window.DialogTab;
@@ -31,7 +30,6 @@ export class SchemaCompareOptionsDialog {
 	private optionsModel: SchemaCompareOptionsModel;
 
 	constructor(defaultOptions: mssql.DeploymentOptions, private schemaComparison: SchemaCompareMainWindow) {
-		this.deploymentOptions = defaultOptions;
 		this.optionsModel = new SchemaCompareOptionsModel(defaultOptions);
 	}
 
@@ -66,7 +64,7 @@ export class SchemaCompareOptionsDialog {
 	protected execute(): void {
 		this.optionsModel.setDeploymentOptions();
 		this.optionsModel.setObjectTypeOptions();
-		this.schemaComparison.setDeploymentOptions(this.deploymentOptions);
+		this.schemaComparison.setDeploymentOptions(this.optionsModel.deploymentOptions);
 
 		if (this.optionsChanged) {
 			vscode.window.showWarningMessage(loc.OptionsChangedMessage, loc.YesButtonText, loc.NoButtonText).then((result) => {
@@ -85,7 +83,7 @@ export class SchemaCompareOptionsDialog {
 	private async reset(): Promise<void> {
 		let service = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.IExtension).schemaCompare;
 		let result = await service.schemaCompareGetDefaultOptions();
-		this.deploymentOptions = result.defaultDeploymentOptions;
+		this.optionsModel.deploymentOptions = result.defaultDeploymentOptions;
 		this.optionsChanged = true;
 
 		await this.updateOptionsTable();