ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix azdata api loading in sql proj for VS Code (#18122)

Browse Source
This commit is contained in:
Charles Gagnon
2022-01-19 11:01:20 -08:00
committed by GitHub
parent 967cd2b102
commit aaffbc6b25
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts
View File

@@ -5,7 +5,7 @@
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import * as mssql from '../../../mssql'; import * as mssql from '../../../mssql';
import * as azdata from 'azdata'; import type * as azdata from 'azdata';
import * as constants from '../common/constants'; import * as constants from '../common/constants';
import * as newProjectTool from '../tools/newProjectTool'; import * as newProjectTool from '../tools/newProjectTool';
import type * as mssqlVscode from 'vscode-mssql'; import type * as mssqlVscode from 'vscode-mssql';
@@ -56,7 +56,7 @@ export class UpdateProjectFromDatabaseDialog {
} }
public async openDialog(): Promise<void> { public async openDialog(): Promise<void> {
let connection = await azdata.connection.getCurrentConnection(); let connection = await getAzdataApi()!.connection.getCurrentConnection();
if (connection) { if (connection) {
this.connectionId = connection.connectionId; this.connectionId = connection.connectionId;
} }
@@ -251,7 +251,7 @@ export class UpdateProjectFromDatabaseDialog {
} }
private async getServerValues() { private async getServerValues() {
let cons = await azdata.connection.getConnections(/* activeConnectionsOnly */ true); let cons = await getAzdataApi()!.connection.getConnections(/* activeConnectionsOnly */ true);
// This user has no active connections // This user has no active connections
if (!cons || cons.length === 0) { if (!cons || cons.length === 0) {
@@ -316,7 +316,7 @@ export class UpdateProjectFromDatabaseDialog {
let idx = -1; let idx = -1;
let count = -1; let count = -1;
let values = (await azdata.connection.listDatabases(connectionId)).sort((a, b) => a.localeCompare(b)).map(db => { let values = (await getAzdataApi()!.connection.listDatabases(connectionId)).sort((a, b) => a.localeCompare(b)).map(db => {
count++; count++;
// put currently selected db at the top of the dropdown if there is one // put currently selected db at the top of the dropdown if there is one
@@ -350,7 +350,7 @@ export class UpdateProjectFromDatabaseDialog {
} }
private async connectionButtonClick() { private async connectionButtonClick() {
let connection = await azdata.connection.openConnectionDialog(); let connection = await getAzdataApi()!.connection.openConnectionDialog();
if (connection) { if (connection) {
this.connectionId = connection.connectionId; this.connectionId = connection.connectionId;
await this.populateServerDropdown(); await this.populateServerDropdown();
@@ -498,12 +498,12 @@ export class UpdateProjectFromDatabaseDialog {
public async handleUpdateButtonClick(): Promise<void> { public async handleUpdateButtonClick(): Promise<void> {
const serverDropdownValue = this.serverDropdown!.value! as azdata.CategoryValue as ConnectionDropdownValue; const serverDropdownValue = this.serverDropdown!.value! as azdata.CategoryValue as ConnectionDropdownValue;
const ownerUri = await azdata.connection.getUriForConnection(serverDropdownValue.connection.connectionId); const ownerUri = await getAzdataApi()!.connection.getUriForConnection(serverDropdownValue.connection.connectionId);
let connection = (await azdata.connection.getConnections(true)).filter(con => con.connectionId === serverDropdownValue.connection.connectionId)[0]; let connection = (await getAzdataApi()!.connection.getConnections(true)).filter(con => con.connectionId === serverDropdownValue.connection.connectionId)[0];
connection.databaseName = this.databaseDropdown!.value! as string; connection.databaseName = this.databaseDropdown!.value! as string;
const credentials = await azdata.connection.getCredentials(connection.connectionId); const credentials = await getAzdataApi()!.connection.getCredentials(connection.connectionId);
if (credentials.hasOwnProperty('password')) { if (credentials.hasOwnProperty('password')) {
connection.password = connection.options.password = credentials.password; connection.password = connection.options.password = credentials.password;
} }