ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correctly route notebook serialization requests to SQL Tools Service. (#20874)

Browse Source
This commit is contained in:
Cory Rivera
2022-10-19 15:37:41 -07:00
committed by GitHub
parent 14cbe09a20
commit 33c6daaea1
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts
View File

@@ -48,6 +48,7 @@ import { getChartMaxRowCount, notifyMaxRowCountExceeded } from 'sql/workbench/co
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
import { IExecutionPlanService } from 'sql/workbench/services/executionPlan/common/interfaces';
import { mssqlProviderName } from 'sql/platform/connection/common/constants';
@Component({
selector: GridOutputComponent.SELECTOR,
@@ -487,8 +488,20 @@ export class DataResourceDataProvider implements IGridDataProvider {
// interface than the query execution service's saveResults handlers. Here, we take the
// format-specific request params (eg, includeHeaders for CSV) and merge the format-agnostic
// request params for the serialization request (eg, saveFormat, filePath).
let provider = this.cellModel.notebookModel.context?.providerName;
if (!provider) {
// If no connection currently exists, then pick the first connection provider for the current kernel.
// If there's still no provider, then fallback to the default MSSQL one.
let connProviders = this.cellModel.notebookModel.getApplicableConnectionProviderIds(this.cellModel.notebookModel.selectedKernelDisplayName);
if (connProviders?.length > 0) {
provider = connProviders[0];
} else {
provider = mssqlProviderName;
}
}
let formatSpecificParams = serializer.getBasicSaveParameters(format);
let formatAgnosticParams = <Partial<SerializeDataParams>>{
serializationProviderId: provider,
saveFormat: format,
filePath: filePath.fsPath,
columns: columns,

2
src/sql/workbench/contrib/notebook/test/browser/dataResourceDataProvider.test.ts
View File

@@ -79,7 +79,7 @@ suite('Data Resource Data Provider', function () {
fileDialogService = new TestFileDialogService(pathService);
notificationService = new TestNotificationService();
serializationService = new SerializationService(undefined, undefined); //_connectionService _capabilitiesService
serializationService.registerProvider('testProviderId', new TestSerializationProvider());
serializationService.registerProvider('MSSQL', new TestSerializationProvider());
serializer = new ResultSerializer(
undefined, // IQueryManagementService
undefined, // IConfigurationService