Code review changes

microsoft · Jan 28, 2025 · 6c4490b · 6c4490b
1 parent 24adc3f
commit 6c4490b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/src/services/schemaCompareService.ts b/src/services/schemaCompareService.ts
@@ -10,7 +10,7 @@ import * as mssql from "vscode-mssql";
 export class SchemaCompareService implements mssql.ISchemaCompareService {
     constructor(private _client: SqlToolsServiceClient) {}
 
-    public schemaCompare(
+    public compare(
         operationId: string,
         sourceEndpointInfo: mssql.SchemaCompareEndpointInfo,
         targetEndpointInfo: mssql.SchemaCompareEndpointInfo,
@@ -31,7 +31,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaCompareGenerateScript(
+    public generateScript(
         operationId: string,
         targetServerName: string,
         targetDatabaseName: string,
@@ -50,7 +50,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaComparePublishDatabaseChanges(
+    public publishDatabaseChanges(
         operationId: string,
         targetServerName: string,
         targetDatabaseName: string,
@@ -70,7 +70,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaComparePublishProjectChanges(
+    public publishProjectChanges(
         operationId: string,
         targetProjectPath: string,
         targetFolderStructure: mssql.ExtractTarget,
@@ -90,7 +90,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaCompareGetDefaultOptions(): Thenable<mssql.SchemaCompareOptionsResult> {
+    public getDefaultOptions(): Thenable<mssql.SchemaCompareOptionsResult> {
         const params: mssql.SchemaCompareGetOptionsParams = {};
 
         return this._client.sendRequest(
@@ -99,7 +99,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaCompareIncludeExcludeNode(
+    public includeExcludeNode(
         operationId: string,
         diffEntry: mssql.DiffEntry,
         includeRequest: boolean,
@@ -118,7 +118,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaCompareOpenScmp(
+    public openScmp(
         filePath: string,
     ): Thenable<mssql.SchemaCompareOpenScmpResult> {
         const params: mssql.SchemaCompareOpenScmpParams = {
@@ -131,7 +131,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaCompareSaveScmp(
+    public saveScmp(
         sourceEndpointInfo: mssql.SchemaCompareEndpointInfo,
         targetEndpointInfo: mssql.SchemaCompareEndpointInfo,
         taskExecutionMode: mssql.TaskExecutionMode,
@@ -156,9 +156,7 @@ export class SchemaCompareService implements mssql.ISchemaCompareService {
         );
     }
 
-    public schemaCompareCancel(
-        operationId: string,
-    ): Thenable<mssql.ResultStatus> {
+    public cancel(operationId: string): Thenable<mssql.ResultStatus> {
         const params: mssql.SchemaCompareCancelParams = {
             operationId: operationId,
         };

diff --git a/typings/vscode-mssql.d.ts b/typings/vscode-mssql.d.ts
@@ -440,15 +440,15 @@ declare module 'vscode-mssql' {
 	}
 
 	export interface ISchemaCompareService {
-		schemaCompare(operationId: string, sourceEndpointInfo: SchemaCompareEndpointInfo, targetEndpointInfo: SchemaCompareEndpointInfo, taskExecutionMode: TaskExecutionMode, deploymentOptions: DeploymentOptions): Thenable<SchemaCompareResult>;
-		schemaCompareGenerateScript(operationId: string, targetServerName: string, targetDatabaseName: string, taskExecutionMode: TaskExecutionMode): Thenable<ResultStatus>;
-		schemaComparePublishDatabaseChanges(operationId: string, targetServerName: string, targetDatabaseName: string, taskExecutionMode: TaskExecutionMode): Thenable<ResultStatus>;
-		schemaComparePublishProjectChanges(operationId: string, targetProjectPath: string, targetFolderStructure: ExtractTarget, taskExecutionMode: TaskExecutionMode): Thenable<SchemaComparePublishProjectResult>;
-		schemaCompareGetDefaultOptions(): Thenable<SchemaCompareOptionsResult>;
-		schemaCompareIncludeExcludeNode(operationId: string, diffEntry: DiffEntry, includeRequest: boolean, taskExecutionMode: TaskExecutionMode): Thenable<SchemaCompareIncludeExcludeResult>;
-		schemaCompareOpenScmp(filePath: string): Thenable<SchemaCompareOpenScmpResult>;
-		schemaCompareSaveScmp(sourceEndpointInfo: SchemaCompareEndpointInfo, targetEndpointInfo: SchemaCompareEndpointInfo, taskExecutionMode: TaskExecutionMode, deploymentOptions: DeploymentOptions, scmpFilePath: string, excludedSourceObjects: SchemaCompareObjectId[], excludedTargetObjects: SchemaCompareObjectId[]): Thenable<ResultStatus>;
-		schemaCompareCancel(operationId: string): Thenable<ResultStatus>;
+		compare(operationId: string, sourceEndpointInfo: SchemaCompareEndpointInfo, targetEndpointInfo: SchemaCompareEndpointInfo, taskExecutionMode: TaskExecutionMode, deploymentOptions: DeploymentOptions): Thenable<SchemaCompareResult>;
+		generateScript(operationId: string, targetServerName: string, targetDatabaseName: string, taskExecutionMode: TaskExecutionMode): Thenable<ResultStatus>;
+		publishDatabaseChanges(operationId: string, targetServerName: string, targetDatabaseName: string, taskExecutionMode: TaskExecutionMode): Thenable<ResultStatus>;
+		publishProjectChanges(operationId: string, targetProjectPath: string, targetFolderStructure: ExtractTarget, taskExecutionMode: TaskExecutionMode): Thenable<SchemaComparePublishProjectResult>;
+		getDefaultOptions(): Thenable<SchemaCompareOptionsResult>;
+		includeExcludeNode(operationId: string, diffEntry: DiffEntry, includeRequest: boolean, taskExecutionMode: TaskExecutionMode): Thenable<SchemaCompareIncludeExcludeResult>;
+		openScmp(filePath: string): Thenable<SchemaCompareOpenScmpResult>;
+		saveScmp(sourceEndpointInfo: SchemaCompareEndpointInfo, targetEndpointInfo: SchemaCompareEndpointInfo, taskExecutionMode: TaskExecutionMode, deploymentOptions: DeploymentOptions, scmpFilePath: string, excludedSourceObjects: SchemaCompareObjectId[], excludedTargetObjects: SchemaCompareObjectId[]): Thenable<ResultStatus>;
+		cancel(operationId: string): Thenable<ResultStatus>;
 	}
 
 	export interface IDacFxService {
@@ -1171,7 +1171,7 @@ declare module 'vscode-mssql' {
 		// located at \src\Microsoft.SqlTools.ServiceLayer\SchemaCompare\Contracts\SchemaCompareRequest.cs
 	}
 
-	export interface ConnectionInfo {
+	export interface SchemaCompareConnectionInfo {
 		options: { [name: string]: any };
 	}
 
@@ -1182,7 +1182,7 @@ declare module 'vscode-mssql' {
 		serverName: string;
 		databaseName: string;
 		ownerUri: string;
-		connectionDetails: ConnectionInfo;
+		connectionDetails: SchemaCompareConnectionInfo;
 		connectionName?: string;
 		projectFilePath: string;
 		targetScripts: string[];