From 55d652198c45fcaf7a5d2bede7038e0e76d11bee Mon Sep 17 00:00:00 2001 From: Sakshi Sharma <57200045+SakshiS-harma@users.noreply.github.com> Date: Wed, 3 May 2023 13:03:40 -0700 Subject: [PATCH] Fix schema comparison failure for Azure synapse (#22938) --- extensions/sql-database-projects/src/common/utils.ts | 7 ++++++- .../src/dialogs/updateProjectFromDatabaseDialog.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extensions/sql-database-projects/src/common/utils.ts b/extensions/sql-database-projects/src/common/utils.ts index fac5bc71a4..95aa988524 100644 --- a/extensions/sql-database-projects/src/common/utils.ts +++ b/extensions/sql-database-projects/src/common/utils.ts @@ -726,7 +726,12 @@ export async function getTargetPlatformFromServerVersion(serverInfo: azdataType. let targetPlatform; if (isCloud) { const engineEdition = serverInfo.engineEditionId; - targetPlatform = engineEdition === vscodeMssql.DatabaseEngineEdition.SqlDataWarehouse ? SqlTargetPlatform.sqlDW : SqlTargetPlatform.sqlAzure; + const azdataApi = getAzdataApi(); + if (azdataApi) { + targetPlatform = engineEdition === azdataApi.DatabaseEngineEdition.SqlDataWarehouse ? SqlTargetPlatform.sqlDW : SqlTargetPlatform.sqlAzure; + } else { + targetPlatform = engineEdition === vscodeMssql.DatabaseEngineEdition.SqlDataWarehouse ? SqlTargetPlatform.sqlDW : SqlTargetPlatform.sqlAzure; + } } else { const serverMajorVersion = serverInfo.serverMajorVersion; targetPlatform = serverMajorVersion ? constants.onPremServerVersionToTargetPlatform.get(serverMajorVersion) : undefined; diff --git a/extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts index db871ed766..1d60f0fbc7 100644 --- a/extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts @@ -572,7 +572,7 @@ export class UpdateProjectFromDatabaseDialog { projectFilePath: this.projectFileDropdown!.value! as string, extractTarget: mapExtractTargetEnum(this.folderStructureDropDown!.value), targetScripts: [], - dataSchemaProvider: '', + dataSchemaProvider: this.project!.getProjectTargetVersion(), connectionDetails: connectionDetails, databaseName: '', serverDisplayName: '',