From e892723c581076d0f4df5dec0bb6eba71a0fec72 Mon Sep 17 00:00:00 2001 From: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com> Date: Mon, 21 Sep 2020 10:04:03 -0700 Subject: [PATCH] fix the reference error due to extra $ in default variable (#12523) --- extensions/sql-database-projects/src/common/constants.ts | 2 +- .../src/dialogs/addDatabaseReferenceDialog.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/sql-database-projects/src/common/constants.ts b/extensions/sql-database-projects/src/common/constants.ts index 5ae192a51e..04651b629f 100644 --- a/extensions/sql-database-projects/src/common/constants.ts +++ b/extensions/sql-database-projects/src/common/constants.ts @@ -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 databaseNameServerNameVariableRequired = localize('databaseNameServerNameVariableRequired', "A database name, server name, and server variable are required. The database variable is optional"); export const otherServer = 'OtherServer'; -export const otherSeverVariable = '$(OtherServer)'; +export const otherSeverVariable = 'OtherServer'; export const databaseProject = localize('databaseProject', "Database project"); // Error messages diff --git a/extensions/sql-database-projects/src/dialogs/addDatabaseReferenceDialog.ts b/extensions/sql-database-projects/src/dialogs/addDatabaseReferenceDialog.ts index 565926e1ad..9776b24519 100644 --- a/extensions/sql-database-projects/src/dialogs/addDatabaseReferenceDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/addDatabaseReferenceDialog.ts @@ -433,7 +433,7 @@ export class AddDatabaseReferenceDialog { switch (this.currentReferenceType) { case ReferenceType.project: { this.databaseNameTextbox!.value = this.projectDropdown?.value; - this.databaseVariableTextbox!.value = `$(${this.projectDropdown?.value})`; + this.databaseVariableTextbox!.value = `${this.projectDropdown?.value}`; break; } case ReferenceType.systemDb: { @@ -443,7 +443,7 @@ export class AddDatabaseReferenceDialog { case ReferenceType.dacpac: { const dacpacName = this.dacpacTextbox!.value ? path.parse(this.dacpacTextbox!.value!).name : ''; this.databaseNameTextbox!.value = dacpacName; - this.databaseVariableTextbox!.value = dacpacName ? `$(${dacpacName})` : ''; + this.databaseVariableTextbox!.value = dacpacName ? `${dacpacName}` : ''; break; } }