Strict null on some query and connection (#7300)

* wip

* make connection work with strict-nulls

* change comments

* fix tests; remove unneeded type forcing

* address feedback

* adjust the logic of query editor

* clean up typing
This commit is contained in:
Anthony Dresser
2019-10-21 15:50:12 -07:00
committed by GitHub
parent 6a375fdd8c
commit 06e86e57e7
22 changed files with 367 additions and 369 deletions

View File

@@ -97,71 +97,71 @@ export class MainThreadDataProtocol extends Disposable implements MainThreadData
public $registerQueryProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._queryManagementService.addQueryRequestHandler(providerId, {
cancelQuery(ownerUri: string): Thenable<azdata.QueryCancelResult> {
return self._proxy.$cancelQuery(handle, ownerUri);
cancelQuery(ownerUri: string): Promise<azdata.QueryCancelResult> {
return Promise.resolve(self._proxy.$cancelQuery(handle, ownerUri));
},
runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable<void> {
return self._proxy.$runQuery(handle, ownerUri, selection, runOptions);
runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Promise<void> {
return Promise.resolve(self._proxy.$runQuery(handle, ownerUri, selection, runOptions));
},
runQueryStatement(ownerUri: string, line: number, column: number): Thenable<void> {
return self._proxy.$runQueryStatement(handle, ownerUri, line, column);
runQueryStatement(ownerUri: string, line: number, column: number): Promise<void> {
return Promise.resolve(self._proxy.$runQueryStatement(handle, ownerUri, line, column));
},
runQueryString(ownerUri: string, queryString: string): Thenable<void> {
return self._proxy.$runQueryString(handle, ownerUri, queryString);
runQueryString(ownerUri: string, queryString: string): Promise<void> {
return Promise.resolve(self._proxy.$runQueryString(handle, ownerUri, queryString));
},
runQueryAndReturn(ownerUri: string, queryString: string): Thenable<azdata.SimpleExecuteResult> {
return self._proxy.$runQueryAndReturn(handle, ownerUri, queryString);
runQueryAndReturn(ownerUri: string, queryString: string): Promise<azdata.SimpleExecuteResult> {
return Promise.resolve(self._proxy.$runQueryAndReturn(handle, ownerUri, queryString));
},
parseSyntax(ownerUri: string, query: string): Thenable<azdata.SyntaxParseResult> {
return self._proxy.$parseSyntax(handle, ownerUri, query);
parseSyntax(ownerUri: string, query: string): Promise<azdata.SyntaxParseResult> {
return Promise.resolve(self._proxy.$parseSyntax(handle, ownerUri, query));
},
getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable<azdata.QueryExecuteSubsetResult> {
return self._proxy.$getQueryRows(handle, rowData);
getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Promise<azdata.QueryExecuteSubsetResult> {
return Promise.resolve(self._proxy.$getQueryRows(handle, rowData));
},
setQueryExecutionOptions(ownerUri: string, options: azdata.QueryExecutionOptions): Thenable<void> {
return self._proxy.$setQueryExecutionOptions(handle, ownerUri, options);
setQueryExecutionOptions(ownerUri: string, options: azdata.QueryExecutionOptions): Promise<void> {
return Promise.resolve(self._proxy.$setQueryExecutionOptions(handle, ownerUri, options));
},
disposeQuery(ownerUri: string): Thenable<void> {
return self._proxy.$disposeQuery(handle, ownerUri);
disposeQuery(ownerUri: string): Promise<void> {
return Promise.resolve(self._proxy.$disposeQuery(handle, ownerUri));
},
saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable<azdata.SaveResultRequestResult> {
saveResults(requestParams: azdata.SaveResultsRequestParams): Promise<azdata.SaveResultRequestResult> {
let saveResultsFeatureInfo = self._serializationService.getSaveResultsFeatureMetadataProvider(requestParams.ownerUri);
if (saveResultsFeatureInfo && saveResultsFeatureInfo.enabled) {
return self._proxy.$saveResults(handle, requestParams);
return Promise.resolve(self._proxy.$saveResults(handle, requestParams));
}
else if (saveResultsFeatureInfo && !saveResultsFeatureInfo.enabled) {
return self._serializationService.disabledSaveAs();
return Promise.resolve(self._serializationService.disabledSaveAs());
}
else {
return self._serializationService.saveAs(requestParams.resultFormat, requestParams.filePath, undefined, true);
return Promise.resolve(self._serializationService.saveAs(requestParams.resultFormat, requestParams.filePath, undefined, true));
}
},
initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable<void> {
return self._proxy.$initializeEdit(handle, ownerUri, schemaName, objectName, objectType, rowLimit, queryString);
initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Promise<void> {
return Promise.resolve(self._proxy.$initializeEdit(handle, ownerUri, schemaName, objectName, objectType, rowLimit, queryString));
},
updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult> {
return self._proxy.$updateCell(handle, ownerUri, rowId, columnId, newValue);
updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Promise<azdata.EditUpdateCellResult> {
return Promise.resolve(self._proxy.$updateCell(handle, ownerUri, rowId, columnId, newValue));
},
commitEdit(ownerUri): Thenable<void> {
return self._proxy.$commitEdit(handle, ownerUri);
commitEdit(ownerUri): Promise<void> {
return Promise.resolve(self._proxy.$commitEdit(handle, ownerUri));
},
createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult> {
return self._proxy.$createRow(handle, ownerUri);
createRow(ownerUri: string): Promise<azdata.EditCreateRowResult> {
return Promise.resolve(self._proxy.$createRow(handle, ownerUri));
},
deleteRow(ownerUri: string, rowId: number): Thenable<void> {
return self._proxy.$deleteRow(handle, ownerUri, rowId);
deleteRow(ownerUri: string, rowId: number): Promise<void> {
return Promise.resolve(self._proxy.$deleteRow(handle, ownerUri, rowId));
},
disposeEdit(ownerUri: string): Thenable<void> {
return self._proxy.$disposeEdit(handle, ownerUri);
disposeEdit(ownerUri: string): Promise<void> {
return Promise.resolve(self._proxy.$disposeEdit(handle, ownerUri));
},
revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult> {
return self._proxy.$revertCell(handle, ownerUri, rowId, columnId);
revertCell(ownerUri: string, rowId: number, columnId: number): Promise<azdata.EditRevertCellResult> {
return Promise.resolve(self._proxy.$revertCell(handle, ownerUri, rowId, columnId));
},
revertRow(ownerUri: string, rowId: number): Thenable<void> {
return self._proxy.$revertRow(handle, ownerUri, rowId);
revertRow(ownerUri: string, rowId: number): Promise<void> {
return Promise.resolve(self._proxy.$revertRow(handle, ownerUri, rowId));
},
getEditRows(rowData: azdata.EditSubsetParams): Thenable<azdata.EditSubsetResult> {
return self._proxy.$getEditRows(handle, rowData);
getEditRows(rowData: azdata.EditSubsetParams): Promise<azdata.EditSubsetResult> {
return Promise.resolve(self._proxy.$getEditRows(handle, rowData));
}
});