ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-14 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't ask for db twice if connection was to a db (#11099)

Browse Source
This commit is contained in:
Kim Santiago
2020-06-25 17:18:41 -07:00
committed by GitHub
parent 770848850d
commit 8e0050f2af
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -624,11 +624,18 @@ export class ProjectsController {
}
const connectionId = connection.connectionId;
const databaseList = await this.apiWrapper.listDatabases(connectionId);
const database = (await this.apiWrapper.showQuickPick(databaseList.map(dbName => { return { label: dbName }; })))?.label;
let database;
if (!database) {
throw new Error(constants.databaseSelectionRequired);
// use database that was connected to if it isn't master
if (connection.options['database'] && connection.options['database'] !== constants.master) {
database = connection.options['database'];
} else {
const databaseList = await this.apiWrapper.listDatabases(connectionId);
database = (await this.apiWrapper.showQuickPick(databaseList.map(dbName => { return { label: dbName }; })))?.label;
if (!database) {
throw new Error(constants.databaseSelectionRequired);
}
}
model.serverId = connectionId;