ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 09:35:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update string to enum for folder structure (#21406)

Browse Source 
* Update string to enum

* Remove newly added enum value
This commit is contained in:
Sakshi Sharma
2022-12-14 08:43:17 -08:00
committed by GitHub
parent bc8d4d2f48
commit d0861f01ed
11 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-database-projects/src/controllers/mainController.ts
View File

@@ -64,7 +64,7 @@ export default class MainController implements vscode.Disposable {
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.build', async (node: WorkspaceTreeItem) => { return this.projectsController.buildProject(node); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.publish', async (node: WorkspaceTreeItem) => { return this.projectsController.publishProject(node); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.schemaCompare', async (node: WorkspaceTreeItem) => { return this.projectsController.schemaCompare(node); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.schemaComparePublishProjectChanges', async (operationId: string, projectFilePath: string, folderStructure: string): Promise<mssql.SchemaComparePublishProjectResult> => { return await this.projectsController.schemaComparePublishProjectChanges(operationId, projectFilePath, folderStructure); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.schemaComparePublishProjectChanges', async (operationId: string, projectFilePath: string, folderStructure: mssql.ExtractTarget): Promise<mssql.SchemaComparePublishProjectResult> => { return await this.projectsController.schemaComparePublishProjectChanges(operationId, projectFilePath, folderStructure); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.updateProjectFromDatabase', async (node: azdataType.IConnectionProfile | vscodeMssql.ITreeNodeInfo | WorkspaceTreeItem) => { await this.projectsController.updateProjectFromDatabase(node); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.createProjectFromDatabase', async (context: azdataType.IConnectionProfile | vscodeMssql.ITreeNodeInfo | undefined) => { return this.projectsController.createProjectFromDatabase(context); }));
this.context.subscriptions.push(vscode.commands.registerCommand('sqlDatabaseProjects.generateProjectFromOpenApiSpec', async (options?: GenerateProjectFromOpenApiSpecOptions) => { return this.projectsController.generateProjectFromOpenApiSpec(options); }));

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

@@ -1693,34 +1693,13 @@ export class ProjectsController {
* @param folderStructure folder structure to use when updating the target project
* @returns
*/
public async schemaComparePublishProjectChanges(operationId: string, projectFilePath: string, folderStructure: string): Promise<mssql.SchemaComparePublishProjectResult> {
public async schemaComparePublishProjectChanges(operationId: string, projectFilePath: string, folderStructure: mssql.ExtractTarget): Promise<mssql.SchemaComparePublishProjectResult> {
const ext = vscode.extensions.getExtension(mssql.extension.name)!;
const service = (await ext.activate() as mssql.IExtension).schemaCompare;
const projectPath = path.dirname(projectFilePath);
let fs: mssql.ExtractTarget;
switch (folderStructure) {
case constants.file:
fs = mssql.ExtractTarget.file;
break;
case constants.flat:
fs = mssql.ExtractTarget.flat;
break;
case constants.objectType:
fs = mssql.ExtractTarget.objectType;
break;
case constants.schema:
fs = mssql.ExtractTarget.schema;
break;
case constants.schemaObjectType:
default:
fs = mssql.ExtractTarget.schemaObjectType;
break;
}
const result: mssql.SchemaComparePublishProjectResult = await service.schemaComparePublishProjectChanges(operationId, projectPath, fs, utils.getAzdataApi()!.TaskExecutionMode.execute);
const result: mssql.SchemaComparePublishProjectResult = await service.schemaComparePublishProjectChanges(operationId, projectPath, folderStructure, utils.getAzdataApi()!.TaskExecutionMode.execute);
if (!result.errorMessage) {
const project = await Project.openProject(projectFilePath);

18
extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts
View File

@@ -7,14 +7,13 @@ import type * as azdataType from 'azdata';
import * as vscode from 'vscode';
import * as constants from '../common/constants';
import * as newProjectTool from '../tools/newProjectTool';
import * as mssql from 'mssql';
import * as path from 'path';
import { IconPathHelper } from '../common/iconHelper';
import { cssStyles } from '../common/uiConstants';
import { ImportDataModel } from '../models/api/import';
import { Deferred } from '../common/promise';
import { getConnectionName } from './utils';
import { getConnectionName, mapExtractTargetEnum } from './utils';
import { exists, getAzdataApi, getDataWorkspaceExtensionApi } from '../common/utils';
export class CreateProjectFromDatabaseDialog {
@@ -457,18 +456,3 @@ export class CreateProjectFromDatabaseDialog {
};
}
}
export function mapExtractTargetEnum(inputTarget: string): mssql.ExtractTarget {
if (inputTarget) {
switch (inputTarget) {
case constants.file: return mssql.ExtractTarget.file;
case constants.flat: return mssql.ExtractTarget.flat;
case constants.objectType: return mssql.ExtractTarget.objectType;
case constants.schema: return mssql.ExtractTarget.schema;
case constants.schemaObjectType: return mssql.ExtractTarget.schemaObjectType;
default: throw new Error(constants.invalidInput(inputTarget));
}
} else {
throw new Error(constants.extractTargetRequired);
}
}

2
extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseQuickpick.ts
View File

@@ -10,7 +10,7 @@ import { exists, getVscodeMssqlApi } from '../common/utils';
import { IConnectionInfo } from 'vscode-mssql';
import { defaultProjectNameFromDb, defaultProjectSaveLocation } from '../tools/newProjectTool';
import { ImportDataModel } from '../models/api/import';
import { mapExtractTargetEnum } from './createProjectFromDatabaseDialog';
import { mapExtractTargetEnum } from './utils';
import { getSDKStyleProjectInfo } from './quickpickHelper';

5
extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts
View File

@@ -17,6 +17,7 @@ import { IconPathHelper } from '../common/iconHelper';
import { UpdateProjectDataModel, UpdateProjectAction } from '../models/api/updateProject';
import { exists, getAzdataApi, getDataWorkspaceExtensionApi } from '../common/utils';
import * as path from 'path';
import { mapExtractTargetEnum } from './utils';
export class UpdateProjectFromDatabaseDialog {
public dialog: azdata.window.Dialog;
@@ -537,7 +538,7 @@ export class UpdateProjectFromDatabaseDialog {
connectionDetails: connectionDetails,
ownerUri: ownerUri,
projectFilePath: '',
folderStructure: '',
folderStructure: mssql.ExtractTarget.schemaObjectType,
targetScripts: [],
dataSchemaProvider: '',
packageFilePath: '',
@@ -547,7 +548,7 @@ export class UpdateProjectFromDatabaseDialog {
const targetEndpointInfo: mssql.SchemaCompareEndpointInfo = {
endpointType: mssql.SchemaCompareEndpointType.Project,
projectFilePath: this.projectFileTextBox!.value!,
folderStructure: this.folderStructureDropDown!.value as string,
folderStructure: mapExtractTargetEnum(<string>this.folderStructureDropDown!.value),
targetScripts: [],
dataSchemaProvider: '',
connectionDetails: connectionDetails,

21
extensions/sql-database-projects/src/dialogs/utils.ts
View File

@@ -6,6 +6,7 @@
import { SqlTargetPlatform } from 'sqldbproj';
import * as constants from '../common/constants';
import * as utils from '../common/utils';
import * as mssql from 'mssql';
import { HttpClient } from '../common/httpClient';
import { AgreementInfo, DockerImageInfo } from '../models/deploy/deployProfile';
@@ -193,3 +194,23 @@ export function getDefaultDockerImageWithTag(projectTargetVersion: string, docke
return dockerImage;
}
/**
* Function to map folder structure string to enum
* @param inputTarget folder structure in string
* @returns folder structure in enum format
*/
export function mapExtractTargetEnum(inputTarget: string): mssql.ExtractTarget {
if (inputTarget) {
switch (inputTarget) {
case constants.file: return mssql.ExtractTarget.file;
case constants.flat: return mssql.ExtractTarget.flat;
case constants.objectType: return mssql.ExtractTarget.objectType;
case constants.schema: return mssql.ExtractTarget.schema;
case constants.schemaObjectType: return mssql.ExtractTarget.schemaObjectType;
default: throw new Error(constants.invalidInput(inputTarget));
}
} else {
throw new Error(constants.extractTargetRequired);
}
}