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

Surfacing better error messages about SQLCMD var names (#22509)

Browse Source 
* Surfacing better error messages about SQLCMD var names

* correcting docstring

* adding space to join char
This commit is contained in:
Benjin Dubishar
2023-03-29 14:23:03 -07:00
committed by GitHub
parent 2a9705c495
commit edc2c5e200
5 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/sql-database-projects/src/dialogs/addDatabaseReferenceDialog.ts
View File

@@ -564,9 +564,7 @@ export class AddDatabaseReferenceDialog {
// check for invalid variables
if (!this.validSqlCmdVariables()) {
let invalidName = !utils.isValidSqlCmdVariableName(this.databaseVariableTextbox?.value) ? this.databaseVariableTextbox!.value! : this.serverVariableTextbox!.value!;
invalidName = utils.removeSqlCmdVariableFormatting(invalidName);
newText = constants.notValidVariableName(invalidName);
newText = utils.validateSqlCmdVariableName(this.databaseVariableTextbox?.value) ?? utils.validateSqlCmdVariableName(this.serverVariableTextbox!.value!)!;
}
this.exampleUsage!.value = newText;
@@ -574,8 +572,8 @@ export class AddDatabaseReferenceDialog {
}
private validSqlCmdVariables(): boolean {
if (this.databaseVariableTextbox?.enabled && this.databaseVariableTextbox?.value && !utils.isValidSqlCmdVariableName(this.databaseVariableTextbox?.value)
|| this.serverVariableTextbox?.enabled && this.serverVariableTextbox?.value && !utils.isValidSqlCmdVariableName(this.serverVariableTextbox?.value)) {
if (this.databaseVariableTextbox?.enabled && this.databaseVariableTextbox?.value && utils.validateSqlCmdVariableName(this.databaseVariableTextbox?.value)
|| this.serverVariableTextbox?.enabled && this.serverVariableTextbox?.value && utils.validateSqlCmdVariableName(this.serverVariableTextbox?.value)) {
return false;
}

6
extensions/sql-database-projects/src/dialogs/addDatabaseReferenceQuickpick.ts
View File

@@ -6,7 +6,7 @@
import path = require('path');
import * as vscode from 'vscode';
import * as constants from '../common/constants';
import { getSqlProjectsInWorkspace, isValidSqlCmdVariableName } from '../common/utils';
import { getSqlProjectsInWorkspace, validateSqlCmdVariableName } from '../common/utils';
import { DbServerValues, populateResultWithVars } from './utils';
import { AddDatabaseReferenceSettings } from '../controllers/projectController';
import { IDacpacReferenceSettings, IProjectReferenceSettings, ISystemDatabaseReferenceSettings } from '../models/IDatabaseReferenceSettings';
@@ -211,7 +211,7 @@ async function promptDbVar(defaultValue: string): Promise<string> {
title: constants.databaseVariable,
value: defaultValue,
validateInput: (value: string) => {
return isValidSqlCmdVariableName(value) ? '' : constants.notValidVariableName(value);
return validateSqlCmdVariableName(value) ?? '';
},
ignoreFocusOut: true
}) ?? '';
@@ -235,7 +235,7 @@ async function promptServerVar(): Promise<string> {
title: constants.serverVariable,
value: constants.otherSeverVariable,
validateInput: (value: string) => {
return isValidSqlCmdVariableName(value) ? '' : constants.notValidVariableName(value);
return validateSqlCmdVariableName(value) ?? '';
},
ignoreFocusOut: true
}) ?? '';