SQL Binding: Give default connection setting name (#17659)

* show sqlconnectionstring in quickpick

* fix duplicate sqlconnectionstring setting

* add (new)

* add sqlconnectionstring as default setting name

* check if sqlconnectionstring already exists
This commit is contained in:
Lucy Zhang
2021-11-15 18:53:52 -08:00
committed by GitHub
parent fc0d175f39
commit 343e314103
2 changed files with 3 additions and 1 deletions

View File

@@ -508,6 +508,7 @@ export const noAzureFunctionsProjectsInWorkspace = localize('noAzureFunctionsPro
export const addPackage = localize('addPackage', "Add Package");
export const createNewLocalAppSetting = localize('createNewLocalAppSetting', 'Create new local app setting');
export const createNewLocalAppSettingWithIcon = `$(add) ${createNewLocalAppSetting}`;
export const sqlConnectionStringSetting = 'SqlConnectionString';
export const valueMustNotBeEmpty = localize('valueMustNotBeEmpty', "Value must not be empty");
export const enterConnectionStringSettingName = localize('enterConnectionStringSettingName', "Enter connection string setting name");
export const enterConnectionString = localize('enterConnectionString', "Enter connection string");

View File

@@ -118,6 +118,7 @@ export async function launchAddSqlBindingQuickpick(uri: vscode.Uri | undefined,
}
existingSettings.unshift({ label: constants.createNewLocalAppSettingWithIcon, isCreateNew: true });
let sqlConnectionStringSettingExists = existingSettings.find(s => s.label === constants.sqlConnectionStringSetting);
while (!connectionStringSettingName) {
const selectedSetting = await vscode.window.showQuickPick(existingSettings, {
@@ -135,6 +136,7 @@ export async function launchAddSqlBindingQuickpick(uri: vscode.Uri | undefined,
{
title: constants.enterConnectionStringSettingName,
ignoreFocusOut: true,
value: sqlConnectionStringSettingExists ? '' : constants.sqlConnectionStringSetting,
validateInput: input => input ? undefined : constants.nameMustNotBeEmpty
}
) ?? '';
@@ -210,4 +212,3 @@ export async function launchAddSqlBindingQuickpick(uri: vscode.Uri | undefined,
// 6. Add sql extension package reference to project. If the reference is already there, it doesn't get added again
await packageHelper.addPackageToAFProjectContainingFile(uri, constants.sqlExtensionPackageName);
}