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

add vscode mssql handling for getSqlProjectsService() (#22121)

Browse Source 
* add vscode mssql handling for getSqlProjectsService()

* try to fix error because of projectStyle enum
This commit is contained in:
Kim Santiago
2023-03-03 16:52:05 -08:00
committed by GitHub
parent d2d24e3827
commit 5fef212ea3
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/sql-database-projects/src/common/utils.ts
View File

@@ -279,6 +279,7 @@ export function getDataWorkspaceExtensionApi(): dataworkspace.IExtension {
export type IDacFxService = mssql.IDacFxService | vscodeMssql.IDacFxService; export type IDacFxService = mssql.IDacFxService | vscodeMssql.IDacFxService;
export type ISchemaCompareService = mssql.ISchemaCompareService | vscodeMssql.ISchemaCompareService; export type ISchemaCompareService = mssql.ISchemaCompareService | vscodeMssql.ISchemaCompareService;
export type ISqlProjectsService = mssql.ISqlProjectsService | vscodeMssql.ISqlProjectsService;
export async function getDacFxService(): Promise<IDacFxService> { export async function getDacFxService(): Promise<IDacFxService> {
if (getAzdataApi()) { if (getAzdataApi()) {
@@ -302,12 +303,15 @@ export async function getSchemaCompareService(): Promise<ISchemaCompareService>
} }
} }
export async function getSqlProjectsService(): Promise<mssql.ISqlProjectsService> { export async function getSqlProjectsService(): Promise<ISqlProjectsService> {
const ext = vscode.extensions.getExtension(mssql.extension.name) as vscode.Extension<mssql.IExtension>; if (getAzdataApi()) {
const api = await ext.activate(); const ext = vscode.extensions.getExtension(mssql.extension.name) as vscode.Extension<mssql.IExtension>;
return api.sqlProjects; const api = await ext.activate();
return api.sqlProjects;
// TODO: add vscode-mssql support } else {
const api = await getVscodeMssqlApi();
return api.sqlProjects;
}
} }
export async function getVscodeMssqlApi(): Promise<vscodeMssql.IExtension> { export async function getVscodeMssqlApi(): Promise<vscodeMssql.IExtension> {

11
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -13,7 +13,7 @@ import * as templates from '../templates/templates';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import type * as azdataType from 'azdata'; import type * as azdataType from 'azdata';
import * as dataworkspace from 'dataworkspace'; import * as dataworkspace from 'dataworkspace';
import type * as mssqlVscode from 'vscode-mssql'; import * as mssqlVscode from 'vscode-mssql';
import { promises as fs } from 'fs'; import { promises as fs } from 'fs';
import { PublishDatabaseDialog } from '../dialogs/publishDatabaseDialog'; import { PublishDatabaseDialog } from '../dialogs/publishDatabaseDialog';
@@ -183,7 +183,6 @@ export class ProjectsController {
} }
const targetPlatform = creationParams.targetPlatform ? constants.targetPlatformToVersion.get(creationParams.targetPlatform)! : constants.defaultDSP; const targetPlatform = creationParams.targetPlatform ? constants.targetPlatformToVersion.get(creationParams.targetPlatform)! : constants.defaultDSP;
const sdkStyle = creationParams.sdkStyle ? mssql.ProjectType.SdkStyle : mssql.ProjectType.LegacyStyle;
let newProjFileName = creationParams.newProjName; let newProjFileName = creationParams.newProjName;
@@ -198,7 +197,13 @@ export class ProjectsController {
} }
const sqlProjectsService = await utils.getSqlProjectsService(); const sqlProjectsService = await utils.getSqlProjectsService();
await sqlProjectsService.createProject(newProjFilePath, sdkStyle, targetPlatform); if (utils.getAzdataApi()) {
const projectStyle = creationParams.sdkStyle ? mssql.ProjectType.SdkStyle : mssql.ProjectType.LegacyStyle;
await (sqlProjectsService as mssql.ISqlProjectsService).createProject(newProjFilePath, projectStyle, targetPlatform);
} else {
const projectStyle = creationParams.sdkStyle ? mssqlVscode.ProjectType.SdkStyle : mssqlVscode.ProjectType.LegacyStyle;
await (sqlProjectsService as mssqlVscode.ISqlProjectsService).createProject(newProjFilePath, projectStyle, targetPlatform);
}
await this.addTemplateFiles(newProjFilePath, creationParams.projectTypeId); await this.addTemplateFiles(newProjFilePath, creationParams.projectTypeId);