From 86a019842f4e459da2ed02720b99eff7992bf256 Mon Sep 17 00:00:00 2001
From: Kim Santiago <31145923+kisantia@users.noreply.github.com>
Date: Tue, 11 Aug 2020 18:08:13 -0700
Subject: [PATCH] Fix importing new project from server dashboard (#11766)

* fix importing new project from server dashboard

* also fix not showing list of dbs if the connection from connection dialog already specified the db
---
 .../src/controllers/projectController.ts      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts
index 70f6215e42..e624a82b05 100644
--- a/extensions/sql-database-projects/src/controllers/projectController.ts
+++ b/extensions/sql-database-projects/src/controllers/projectController.ts
@@ -689,19 +689,19 @@ export class ProjectsController {
 			if (connection.options['database']) {
 				database = connection.options['database'];
 			}
+		}
 
-			// choose database if connection was to a server or master
-			if (!model.database || model.database === constants.master) {
-				const databaseList = await azdata.connection.listDatabases(connectionId);
-				database = (await vscode.window.showQuickPick(databaseList.map(dbName => { return { label: dbName }; }),
-					{
-						canPickMany: false,
-						placeHolder: constants.extractDatabaseSelection
-					}))?.label;
+		// choose database if connection was to a server or master
+		if (!database || database === constants.master) {
+			const databaseList = await azdata.connection.listDatabases(connectionId);
+			database = (await vscode.window.showQuickPick(databaseList.map(dbName => { return { label: dbName }; }),
+				{
+					canPickMany: false,
+					placeHolder: constants.extractDatabaseSelection
+				}))?.label;
 
-				if (!database) {
-					throw new Error(constants.databaseSelectionRequired);
-				}
+			if (!database) {
+				throw new Error(constants.databaseSelectionRequired);
 			}
 		}