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

fix the reference error due to extra $ in default variable (#12523)

Browse Source
This commit is contained in:
Udeesha Gautam
2020-09-21 10:04:03 -07:00
committed by GitHub
parent 3f77b371b3
commit e892723c58
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-database-projects/src/common/constants.ts
View File

@@ -120,7 +120,7 @@ export const enterSystemDbName = localize('enterSystemDbName', "Enter a database
export const databaseNameRequiredVariableOptional = localize('databaseNameRequiredVariableOptional', "A database name is required. The database variable is optional."); export const databaseNameRequiredVariableOptional = localize('databaseNameRequiredVariableOptional', "A database name is required. The database variable is optional.");
export const databaseNameServerNameVariableRequired = localize('databaseNameServerNameVariableRequired', "A database name, server name, and server variable are required. The database variable is optional"); export const databaseNameServerNameVariableRequired = localize('databaseNameServerNameVariableRequired', "A database name, server name, and server variable are required. The database variable is optional");
export const otherServer = 'OtherServer'; export const otherServer = 'OtherServer';
export const otherSeverVariable = '$(OtherServer)'; export const otherSeverVariable = 'OtherServer';
export const databaseProject = localize('databaseProject', "Database project"); export const databaseProject = localize('databaseProject', "Database project");
// Error messages // Error messages

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

@@ -433,7 +433,7 @@ export class AddDatabaseReferenceDialog {
switch (this.currentReferenceType) { switch (this.currentReferenceType) {
case ReferenceType.project: { case ReferenceType.project: {
this.databaseNameTextbox!.value = <string>this.projectDropdown?.value; this.databaseNameTextbox!.value = <string>this.projectDropdown?.value;
this.databaseVariableTextbox!.value = `$(${this.projectDropdown?.value})`; this.databaseVariableTextbox!.value = `${this.projectDropdown?.value}`;
break; break;
} }
case ReferenceType.systemDb: { case ReferenceType.systemDb: {
@@ -443,7 +443,7 @@ export class AddDatabaseReferenceDialog {
case ReferenceType.dacpac: { case ReferenceType.dacpac: {
const dacpacName = this.dacpacTextbox!.value ? path.parse(this.dacpacTextbox!.value!).name : ''; const dacpacName = this.dacpacTextbox!.value ? path.parse(this.dacpacTextbox!.value!).name : '';
this.databaseNameTextbox!.value = dacpacName; this.databaseNameTextbox!.value = dacpacName;
this.databaseVariableTextbox!.value = dacpacName ? `$(${dacpacName})` : ''; this.databaseVariableTextbox!.value = dacpacName ? `${dacpacName}` : '';
break; break;
} }
} }