Skip to content

Commit 794c33e

Browse files
authored
Improve connection string and empty workspace folder case (#17229)
* improve connection string and corner case * comments
1 parent b1d0e29 commit 794c33e

File tree

3 files changed

+6
-29
lines changed

3 files changed

+6
-29
lines changed

src/azureFunction/azureFunctionUtils.ts

+3
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ export async function getAzureFunctionProject(): Promise<string | undefined> {
149149
export async function getAzureFunctionProjectFiles(): Promise<string[] | undefined> {
150150
let projFiles: string[] = [];
151151
const hostFiles = await getHostFiles();
152+
if (!hostFiles) {
153+
return undefined;
154+
}
152155
for (let host of hostFiles) {
153156
let projectFile = await vscode.workspace.findFiles('*.csproj', path.dirname(host));
154157
projectFile.filter(file => path.dirname(file.fsPath) === path.dirname(host) ? projFiles.push(file?.fsPath) : projFiles);

src/controllers/mainController.ts

+3-9
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import { QueryHistoryProvider } from '../queryHistory/queryHistoryProvider';
3232
import { QueryHistoryNode } from '../queryHistory/queryHistoryNode';
3333
import { DacFxService } from '../services/dacFxService';
3434
import { IConnectionInfo } from 'vscode-mssql';
35-
import { getConnectionString } from '../utils/connectionStringUtil';
3635
import { SchemaCompareService } from '../services/schemaCompareService';
3736
import { SqlTasksService } from '../services/sqlTasksService';
3837
import { AzureFunctionsService } from '../services/azureFunctionsService';
@@ -443,14 +442,9 @@ export default class MainController implements vscode.Disposable {
443442

444443
// Generate Azure Function command
445444
this._context.subscriptions.push(vscode.commands.registerCommand(Constants.cmdCreateAzureFunction, async (node: TreeNodeInfo) => {
446-
const database = ObjectExplorerUtils.getDatabaseName(node);
447-
const connStr = getConnectionString(
448-
node.connectionInfo.server,
449-
node.connectionInfo.authenticationType,
450-
database,
451-
node.connectionInfo.user,
452-
node.connectionInfo.password);
453-
await this.azureFunctionsService.createAzureFunction(connStr, node.metadata.schema, node.metadata.name);
445+
const connectionUri = this._connectionMgr.getUriForConnection(node.connectionInfo);
446+
const connectionString = await this._connectionMgr.getConnectionString(connectionUri);
447+
await this.azureFunctionsService.createAzureFunction(connectionString, node.metadata.schema, node.metadata.name);
454448
}));
455449
}
456450

src/utils/connectionStringUtil.ts

-20
This file was deleted.

0 commit comments

Comments
 (0)