From fb04db8c245d0dea418646fe72d7e40008c3e101 Mon Sep 17 00:00:00 2001
From: brian-harris <61598682+brian-harris@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:36:56 -0700
Subject: [PATCH] target database mapping and selection bug (#20840)

* target database mapping and selection bug

* bump version to 1.1.0 for sql db release
---
 extensions/sql-migration/package.json                     | 2 +-
 extensions/sql-migration/src/wizard/databaseBackupPage.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/sql-migration/package.json b/extensions/sql-migration/package.json
index 3a9363c600..0b8c83efc8 100644
--- a/extensions/sql-migration/package.json
+++ b/extensions/sql-migration/package.json
@@ -2,7 +2,7 @@
   "name": "sql-migration",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "publisher": "Microsoft",
   "preview": false,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
diff --git a/extensions/sql-migration/src/wizard/databaseBackupPage.ts b/extensions/sql-migration/src/wizard/databaseBackupPage.ts
index 83369efdd0..3ce27c283c 100644
--- a/extensions/sql-migration/src/wizard/databaseBackupPage.ts
+++ b/extensions/sql-migration/src/wizard/databaseBackupPage.ts
@@ -777,7 +777,9 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 
 						const dbIndex = this.migrationStateModel._sourceDatabaseNames?.indexOf(sourceDatabaseName);
 						if (dbIndex > -1) {
-							targetDatabaseName = originalTargetDatabaseNames[dbIndex] ?? targetDatabaseName;
+							targetDatabaseName = isSqlDbTarget
+								? targetDatabaseName
+								: originalTargetDatabaseNames[dbIndex] ?? targetDatabaseName;
 							networkShare = originalNetworkShares[dbIndex] ?? networkShare;
 							blob = originalBlobs[dbIndex] ?? blob;
 						} else {