Skip to content

Commit 0f07d03

Browse files
authored
Merge pull request #94 from microsoft/chsuh/port
[Port] Add copy results return value
2 parents fdd415f + 65da91a commit 0f07d03

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

lib/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ class QueryFeature extends SqlOpsFeature {
385385
});
386386
};
387387
let copyResults = (params) => {
388-
return client.sendRequest(protocol.CopyResultsRequest.type, params).then(r => undefined, e => {
388+
return client.sendRequest(protocol.CopyResultsRequest.type, params).then(r => r, e => {
389389
client.logFailedRequest(protocol.CopyResultsRequest.type, e);
390390
return Promise.reject(e);
391391
});

lib/protocol.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export declare namespace SaveResultsAsXmlRequest {
308308
const type: RequestType<azdata.SaveResultsRequestParams, azdata.SaveResultRequestResult, void, void>;
309309
}
310310
export declare namespace CopyResultsRequest {
311-
const type: RequestType<azdata.CopyResultsRequestParams, void, void, void>;
311+
const type: RequestType<azdata.CopyResultsRequestParams, azdata.CopyResultsRequestResult, void, void>;
312312
}
313313
export declare namespace SyntaxParseRequest {
314314
const type: RequestType<azdata.SyntaxParseParams, azdata.SyntaxParseResult, void, void>;

src/azdata.proposed.d.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,13 @@ declare module 'azdata' {
863863
selections: SelectionRange[];
864864
}
865865

866+
export interface CopyResultsRequestResult {
867+
/**
868+
* Result string from copy operation
869+
*/
870+
results: string;
871+
}
872+
866873
export interface QueryProvider {
867874
/**
868875
* Notify clients that the URI for a connection has been changed.
@@ -874,7 +881,7 @@ declare module 'azdata' {
874881
* ADS will use this if 'supportCopyResultsToClipboard' property is set to true in the provider contribution point in extension's package.json.
875882
* Otherwise, The default handler will load all the selected data to ADS and perform the copy operation.
876883
*/
877-
copyResults?(requestParams: CopyResultsRequestParams): Thenable<void>;
884+
copyResults?(requestParams: CopyResultsRequestParams): Thenable<CopyResultsRequestResult>;
878885
}
879886

880887
export enum DataProviderType {

src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,9 @@ export class QueryFeature extends SqlOpsFeature<undefined> {
564564
);
565565
};
566566

567-
let copyResults = (params: azdata.CopyResultsRequestParams): Thenable<void> => {
567+
let copyResults = (params: azdata.CopyResultsRequestParams): Thenable<azdata.CopyResultsRequestResult> => {
568568
return client.sendRequest(protocol.CopyResultsRequest.type, params).then(
569-
r => undefined,
569+
r => r,
570570
e => {
571571
client.logFailedRequest(protocol.CopyResultsRequest.type, e);
572572
return Promise.reject(e);

src/protocol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export namespace SaveResultsAsXmlRequest {
469469
// --------------------------------- < Copy Results Request > ------------------------------------------
470470
// copy results to clipboard
471471
export namespace CopyResultsRequest {
472-
export const type = new RequestType<azdata.CopyResultsRequestParams, void, void, void>('query/copy');
472+
export const type = new RequestType<azdata.CopyResultsRequestParams, azdata.CopyResultsRequestResult, void, void>('query/copy');
473473
}
474474
// --------------------------------- </ Copy Results Request > ------------------------------------------
475475

0 commit comments

Comments
 (0)