From b34e3cbe90994a7475dae1e375086fc8160b6b1c Mon Sep 17 00:00:00 2001
From: Kim Santiago <31145923+kisantia@users.noreply.github.com>
Date: Thu, 27 Jun 2019 18:26:02 -0700
Subject: [PATCH] fix compare after opening scmp with dacpacs failing (#6201)

---
 .../src/dialogs/schemaCompareDialog.ts        |  5 +----
 .../schema-compare/src/schemaCompareResult.ts | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/extensions/schema-compare/src/dialogs/schemaCompareDialog.ts b/extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
index 5bd25941e1..ea4eab0308 100644
--- a/extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
+++ b/extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
@@ -177,7 +177,7 @@ export class SchemaCompareDialog {
 	private endpointChanged(previousEndpoint: azdata.SchemaCompareEndpointInfo, updatedEndpoint: azdata.SchemaCompareEndpointInfo): boolean {
 		if (previousEndpoint && updatedEndpoint) {
 			return getEndpointName(previousEndpoint).toLowerCase() !== getEndpointName(updatedEndpoint).toLowerCase()
-				|| previousEndpoint.serverDisplayName.toLocaleLowerCase() !== updatedEndpoint.serverDisplayName.toLowerCase();
+				|| (previousEndpoint.serverDisplayName && updatedEndpoint.serverDisplayName && previousEndpoint.serverDisplayName.toLowerCase() !== updatedEndpoint.serverDisplayName.toLowerCase());
 		}
 		return false;
 	}
@@ -541,9 +541,6 @@ export class SchemaCompareDialog {
 			}
 
 			let finalName = `${srv} (${usr})`;
-			if (endpointInfo) {
-				console.error('finalname: ' + finalName + ' endpointname: ' + endpointInfo.serverDisplayName);
-			}
 			// use previously selected server or current connection if there is one
 			if (endpointInfo && !isNullOrUndefined(endpointInfo.serverName) && !isNullOrUndefined(endpointInfo.serverDisplayName)
 				&& c.options.server.toLowerCase() === endpointInfo.serverName.toLowerCase()
diff --git a/extensions/schema-compare/src/schemaCompareResult.ts b/extensions/schema-compare/src/schemaCompareResult.ts
index 31d6fcb920..e858bd8b43 100644
--- a/extensions/schema-compare/src/schemaCompareResult.ts
+++ b/extensions/schema-compare/src/schemaCompareResult.ts
@@ -880,7 +880,16 @@ export class SchemaCompareResult {
 					this.sourceEndpointInfo.ownerUri = ownerUri;
 				}
 			} else {
-				this.sourceEndpointInfo = result.sourceEndpointInfo;
+				// need to do this instead of just setting it to the result.sourceEndpointInfo because some fields are null which will cause an error when sending the compare request
+				this.sourceEndpointInfo = {
+					endpointType: azdata.SchemaCompareEndpointType.Dacpac,
+					serverDisplayName: '',
+					serverName: '',
+					databaseName: '',
+					ownerUri: '',
+					packageFilePath: result.sourceEndpointInfo.packageFilePath,
+					connectionDetails: undefined
+				};
 			}
 
 			if (result.targetEndpointInfo && result.targetEndpointInfo.endpointType === azdata.SchemaCompareEndpointType.Database) {
@@ -890,7 +899,16 @@ export class SchemaCompareResult {
 					this.targetEndpointInfo.ownerUri = ownerUri;
 				}
 			} else {
-				this.targetEndpointInfo = result.targetEndpointInfo;
+				// need to do this instead of just setting it to the result.targetEndpointInfo because some fields are null which will cause an error when sending the compare request
+				this.targetEndpointInfo = {
+					endpointType: azdata.SchemaCompareEndpointType.Dacpac,
+					serverDisplayName: '',
+					serverName: '',
+					databaseName: '',
+					ownerUri: '',
+					packageFilePath: result.targetEndpointInfo.packageFilePath,
+					connectionDetails: undefined
+				};
 			}
 
 			this.updateSourceAndTarget();