ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update SC dialog to save/read file structure to/from schema compare file (#22727)

Browse Source 
* Read/Send ExtractTarget information from/to STS

* Remove comment

* Cleanup comment and update azdata dependency
This commit is contained in:
Sakshi Sharma
2023-04-14 11:47:59 -07:00
committed by GitHub
parent 18a541b0a6
commit d69e5b97df
8 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/integration-tests/src/test/schemaCompare.test.ts
View File

@@ -55,7 +55,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: '', ownerUri: '',
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -68,7 +68,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: '', ownerUri: '',
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -123,7 +123,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: sourceDB, databaseName: sourceDB,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -136,7 +136,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: targetDB, databaseName: targetDB,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -196,7 +196,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -209,7 +209,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: targetDB, databaseName: targetDB,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -256,7 +256,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: '', ownerUri: '',
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -269,7 +269,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: '', ownerUri: '',
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -330,7 +330,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -343,7 +343,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: targetDB, databaseName: targetDB,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -413,7 +413,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -426,7 +426,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: targetDB, databaseName: targetDB,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -484,7 +484,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: '', databaseName: '',
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined
@@ -497,7 +497,7 @@ suite('Schema compare integration test suite @DacFx@', () => {
databaseName: targetDB, databaseName: targetDB,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined connectionDetails: undefined

2
extensions/mssql/src/mssql.d.ts vendored
View File

@@ -135,7 +135,7 @@ declare module 'mssql' {
connectionName?: string; connectionName?: string;
projectFilePath: string; projectFilePath: string;
targetScripts: string[]; targetScripts: string[];
folderStructure: ExtractTarget; extractTarget: ExtractTarget;
dataSchemaProvider: string; dataSchemaProvider: string;
} }

2
extensions/schema-compare/package.json
View File

@@ -7,7 +7,7 @@
"preview": false, "preview": false,
"engines": { "engines": {
"vscode": "^1.25.0", "vscode": "^1.25.0",
"azdata": ">=1.40.0" "azdata": ">=1.44.0"
}, },
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
"icon": "images/extension.png", "icon": "images/extension.png",

26
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -118,7 +118,7 @@ export class SchemaCompareDialog {
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
targetScripts: [], targetScripts: [],
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
packageFilePath: '', packageFilePath: '',
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: undefined, connectionDetails: undefined,
@@ -133,7 +133,7 @@ export class SchemaCompareDialog {
ownerUri: '', ownerUri: '',
projectFilePath: '', projectFilePath: '',
targetScripts: [], targetScripts: [],
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
dataSchemaProvider: '', dataSchemaProvider: '',
packageFilePath: this.sourceTextBox.value, packageFilePath: this.sourceTextBox.value,
connectionDetails: undefined connectionDetails: undefined
@@ -144,7 +144,7 @@ export class SchemaCompareDialog {
projectFilePath: this.sourceTextBox.value, projectFilePath: this.sourceTextBox.value,
targetScripts: await this.getProjectScriptFiles(this.sourceTextBox.value), targetScripts: await this.getProjectScriptFiles(this.sourceTextBox.value),
dataSchemaProvider: await this.getDatabaseSchemaProvider(this.sourceTextBox.value), dataSchemaProvider: await this.getDatabaseSchemaProvider(this.sourceTextBox.value),
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
serverDisplayName: '', serverDisplayName: '',
serverName: '', serverName: '',
databaseName: '', databaseName: '',
@@ -165,7 +165,7 @@ export class SchemaCompareDialog {
databaseName: this.targetDatabaseDropdown.value.toString(), databaseName: this.targetDatabaseDropdown.value.toString(),
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
packageFilePath: '', packageFilePath: '',
dataSchemaProvider: '', dataSchemaProvider: '',
@@ -180,7 +180,7 @@ export class SchemaCompareDialog {
databaseName: '', databaseName: '',
ownerUri: '', ownerUri: '',
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
packageFilePath: this.targetTextBox.value, packageFilePath: this.targetTextBox.value,
@@ -190,7 +190,7 @@ export class SchemaCompareDialog {
this.schemaCompareMainWindow.targetEndpointInfo = { this.schemaCompareMainWindow.targetEndpointInfo = {
endpointType: mssql.SchemaCompareEndpointType.Project, endpointType: mssql.SchemaCompareEndpointType.Project,
projectFilePath: this.targetTextBox.value, projectFilePath: this.targetTextBox.value,
folderStructure: mapExtractTargetEnum(<string>this.targetStructureDropdown!.value), extractTarget: mapExtractTargetEnum(<string>this.targetStructureDropdown!.value),
targetScripts: await this.getProjectScriptFiles(this.targetTextBox.value), targetScripts: await this.getProjectScriptFiles(this.targetTextBox.value),
dataSchemaProvider: await this.getDatabaseSchemaProvider(this.targetTextBox.value), dataSchemaProvider: await this.getDatabaseSchemaProvider(this.targetTextBox.value),
serverDisplayName: '', serverDisplayName: '',
@@ -447,13 +447,14 @@ export class SchemaCompareDialog {
} }
private createStructureDropdown(): azdata.FormComponent { private createStructureDropdown(): azdata.FormComponent {
const value = !this.schemaCompareMainWindow.targetEndpointInfo ? loc.schemaObjectType : mapExtractTargetToString(this.schemaCompareMainWindow.targetEndpointInfo.extractTarget);
this.targetStructureDropdown = this.view.modelBuilder.dropDown().withProps({ this.targetStructureDropdown = this.view.modelBuilder.dropDown().withProps({
editable: true, editable: true,
fireOnTextChange: true, fireOnTextChange: true,
ariaLabel: loc.targetStructure, ariaLabel: loc.targetStructure,
width: this.textBoxWidth, width: this.textBoxWidth,
values: [loc.file, loc.flat, loc.objectType, loc.schema, loc.schemaObjectType], values: [loc.file, loc.flat, loc.objectType, loc.schema, loc.schemaObjectType],
value: loc.schemaObjectType, value: value,
}).component(); }).component();
return { return {
@@ -1029,3 +1030,14 @@ export function mapExtractTargetEnum(inputTarget: string): mssql.ExtractTarget {
default: return mssql.ExtractTarget.schemaObjectType; default: return mssql.ExtractTarget.schemaObjectType;
} }
} }
export function mapExtractTargetToString(inputTarget: mssql.ExtractTarget) {
switch (inputTarget) {
case mssql.ExtractTarget.file: return loc.file;
case mssql.ExtractTarget.flat: return loc.flat;
case mssql.ExtractTarget.objectType: return loc.objectType;
case mssql.ExtractTarget.schema: return loc.schema;
case mssql.ExtractTarget.schemaObjectType:
default: return loc.schemaObjectType;
}
}

12
extensions/schema-compare/src/schemaCompareMainWindow.ts
View File

@@ -131,7 +131,7 @@ export class SchemaCompareMainWindow {
projectFilePath: '', projectFilePath: '',
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
folderStructure: mssql.ExtractTarget.schemaObjectType extractTarget: mssql.ExtractTarget.schemaObjectType
}; };
} else if (sourceDacpac) { } else if (sourceDacpac) {
source = { source = {
@@ -145,7 +145,7 @@ export class SchemaCompareMainWindow {
projectFilePath: '', projectFilePath: '',
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
folderStructure: mssql.ExtractTarget.schemaObjectType extractTarget: mssql.ExtractTarget.schemaObjectType
}; };
} else if (sourceProject) { } else if (sourceProject) {
source = { source = {
@@ -159,7 +159,7 @@ export class SchemaCompareMainWindow {
projectFilePath: sourceProject, projectFilePath: sourceProject,
targetScripts: [], targetScripts: [],
dataSchemaProvider: undefined, dataSchemaProvider: undefined,
folderStructure: mssql.ExtractTarget.schemaObjectType extractTarget: mssql.ExtractTarget.schemaObjectType
}; };
} }
@@ -889,7 +889,7 @@ export class SchemaCompareMainWindow {
result = await service.schemaComparePublishDatabaseChanges(this.comparisonResult.operationId, this.targetEndpointInfo.serverName, this.targetEndpointInfo.databaseName, azdata.TaskExecutionMode.execute); result = await service.schemaComparePublishDatabaseChanges(this.comparisonResult.operationId, this.targetEndpointInfo.serverName, this.targetEndpointInfo.databaseName, azdata.TaskExecutionMode.execute);
break; break;
case mssql.SchemaCompareEndpointType.Project: case mssql.SchemaCompareEndpointType.Project:
result = await vscode.commands.executeCommand(loc.sqlDatabaseProjectsPublishChanges, this.comparisonResult.operationId, this.targetEndpointInfo.projectFilePath, this.targetEndpointInfo.folderStructure); result = await vscode.commands.executeCommand(loc.sqlDatabaseProjectsPublishChanges, this.comparisonResult.operationId, this.targetEndpointInfo.projectFilePath, this.targetEndpointInfo.extractTarget);
if (!result.success) { if (!result.success) {
void vscode.window.showErrorMessage(loc.applyError); void vscode.window.showErrorMessage(loc.applyError);
} }
@@ -1151,8 +1151,8 @@ export class SchemaCompareMainWindow {
connectionDetails: undefined, connectionDetails: undefined,
projectFilePath: endpoint.projectFilePath, projectFilePath: endpoint.projectFilePath,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: endpoint.dataSchemaProvider,
folderStructure: mssql.ExtractTarget.schemaObjectType // TODO: Pick this automatically from the scmp file, after issue #20332 is resolved (check dsp as well) extractTarget: endpoint.extractTarget
}; };
} else { } else {
// need to do this instead of just setting it to the endpoint because some fields are null which will cause an error when sending the compare request // need to do this instead of just setting it to the endpoint because some fields are null which will cause an error when sending the compare request

4
extensions/schema-compare/src/test/testUtils.ts
View File

@@ -52,7 +52,7 @@ export const mockDacpacEndpoint: mssql.SchemaCompareEndpointInfo = {
packageFilePath: mockFilePath, packageFilePath: mockFilePath,
connectionDetails: undefined, connectionDetails: undefined,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
}; };
@@ -66,7 +66,7 @@ export const mockDatabaseEndpoint: mssql.SchemaCompareEndpointInfo = {
packageFilePath: '', packageFilePath: '',
connectionDetails: undefined, connectionDetails: undefined,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
}; };

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

@@ -1821,7 +1821,7 @@ export class ProjectsController {
} }
// Publish the changes (retrieved from the cache by operationId) // Publish the changes (retrieved from the cache by operationId)
const publishResult = await this.schemaComparePublishProjectChanges(operationId, target.projectFilePath, target.folderStructure); const publishResult = await this.schemaComparePublishProjectChanges(operationId, target.projectFilePath, target.extractTarget);
if (publishResult.success) { if (publishResult.success) {
void vscode.window.showInformationMessage(constants.applySuccess); void vscode.window.showInformationMessage(constants.applySuccess);

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

@@ -445,7 +445,7 @@ export class UpdateProjectFromDatabaseDialog {
private createFolderStructureRow(view: azdata.ModelView): azdata.FlexContainer { private createFolderStructureRow(view: azdata.ModelView): azdata.FlexContainer {
this.folderStructureDropDown = view.modelBuilder.dropDown().withProps({ this.folderStructureDropDown = view.modelBuilder.dropDown().withProps({
values: [constants.file, constants.flat, constants.objectType, constants.schema, constants.schemaObjectType], values: [constants.file, constants.flat, constants.objectType, constants.schema, constants.schemaObjectType],
value: constants.schemaObjectType, //TODO: Read this value from project info after fixing https://github.com/microsoft/azuredatastudio/issues/20332 value: constants.schemaObjectType,
ariaLabel: constants.folderStructureLabel, ariaLabel: constants.folderStructureLabel,
required: true, required: true,
width: cssStyles.updateProjectFromDatabaseTextboxWidth width: cssStyles.updateProjectFromDatabaseTextboxWidth
@@ -560,7 +560,7 @@ export class UpdateProjectFromDatabaseDialog {
connectionDetails: connectionDetails, connectionDetails: connectionDetails,
ownerUri: ownerUri, ownerUri: ownerUri,
projectFilePath: '', projectFilePath: '',
folderStructure: mssql.ExtractTarget.schemaObjectType, extractTarget: mssql.ExtractTarget.schemaObjectType,
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
packageFilePath: '', packageFilePath: '',
@@ -570,7 +570,7 @@ export class UpdateProjectFromDatabaseDialog {
const targetEndpointInfo: mssql.SchemaCompareEndpointInfo = { const targetEndpointInfo: mssql.SchemaCompareEndpointInfo = {
endpointType: mssql.SchemaCompareEndpointType.Project, endpointType: mssql.SchemaCompareEndpointType.Project,
projectFilePath: this.projectFileDropdown!.value! as string, projectFilePath: this.projectFileDropdown!.value! as string,
folderStructure: mapExtractTargetEnum(<string>this.folderStructureDropDown!.value), extractTarget: mapExtractTargetEnum(<string>this.folderStructureDropDown!.value),
targetScripts: [], targetScripts: [],
dataSchemaProvider: '', dataSchemaProvider: '',
connectionDetails: connectionDetails, connectionDetails: connectionDetails,