diff --git a/src/sql/platform/query/common/queryRunner.ts b/src/sql/platform/query/common/queryRunner.ts index d72713d881..77bbcc5e88 100644 --- a/src/sql/platform/query/common/queryRunner.ts +++ b/src/sql/platform/query/common/queryRunner.ts @@ -5,8 +5,6 @@ import * as azdata from 'azdata'; -import * as Constants from 'sql/workbench/parts/query/common/constants'; -import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import * as Utils from 'sql/platform/connection/common/utils'; import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; @@ -561,7 +559,7 @@ export default class QueryRunner extends Disposable { private sendBatchTimeMessage(batchId: number, executionTime: string): void { // get config copyRemoveNewLine option from vscode config - let showBatchTime: boolean = WorkbenchUtils.getSqlConfigValue(this._configurationService, Constants.configShowBatchTime); + let showBatchTime = this._configurationService.getValue('sql.showBatchTime'); if (showBatchTime) { let message: IQueryMessage = { batchId: batchId, @@ -657,12 +655,12 @@ export function shouldIncludeHeaders(includeHeaders: boolean, configurationServi return includeHeaders; } // else get config option from vscode config - includeHeaders = WorkbenchUtils.getSqlConfigValue(configurationService, Constants.copyIncludeHeaders); + includeHeaders = configurationService.getValue('sql.copyIncludeHeaders'); return !!includeHeaders; } export function shouldRemoveNewLines(configurationService: IConfigurationService): boolean { // get config copyRemoveNewLine option from vscode config - let removeNewLines: boolean = WorkbenchUtils.getSqlConfigValue(configurationService, Constants.configCopyRemoveNewLine); + let removeNewLines = configurationService.getValue('sql.copyRemoveNewLine'); return !!removeNewLines; -} \ No newline at end of file +} diff --git a/src/sql/workbench/parts/query/common/resultSerializer.ts b/src/sql/workbench/parts/query/common/resultSerializer.ts index cbf03405c1..04a72849eb 100644 --- a/src/sql/workbench/parts/query/common/resultSerializer.ts +++ b/src/sql/workbench/parts/query/common/resultSerializer.ts @@ -6,7 +6,6 @@ import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import * as Constants from 'sql/workbench/parts/query/common/constants'; import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; -import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { SaveResultsRequestParams } from 'azdata'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { ISaveRequest, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; @@ -30,6 +29,19 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs'; let prevSavePath: string; +interface ICsvConfig { + includeHeaders: boolean; + delimiter: string; + lineSeperator: string; + textIdentifier: string; + encoding: string; +} + +interface IXmlConfig { + formatted: boolean; + encoding: string; +} + /** * Handles save results request from the context menu of slickGrid */ @@ -42,7 +54,7 @@ export class ResultSerializer { constructor( @IOutputService private _outputService: IOutputService, @IQueryManagementService private _queryManagementService: IQueryManagementService, - @IConfigurationService private _workspaceConfigurationService: IConfigurationService, + @IConfigurationService private _configurationService: IConfigurationService, @IEditorService private _editorService: IEditorService, @IWorkspaceContextService private _contextService: IWorkspaceContextService, @IWindowsService private _windowsService: IWindowsService, @@ -159,7 +171,7 @@ export class ResultSerializer { let saveResultsParams = { resultFormat: SaveFormat.CSV as string }; // get save results config from vscode config - let saveConfig = WorkbenchUtils.getSqlConfigSection(this._workspaceConfigurationService, Constants.configSaveAsCsv); + let saveConfig = this._configurationService.getValue('sql.saveAsCsv'); // if user entered config, set options if (saveConfig) { if (saveConfig.includeHeaders !== undefined) { @@ -205,7 +217,7 @@ export class ResultSerializer { let saveResultsParams = { resultFormat: SaveFormat.XML as string }; // get save results config from vscode config - let saveConfig = WorkbenchUtils.getSqlConfigSection(this._workspaceConfigurationService, Constants.configSaveAsXml); + let saveConfig = this._configurationService.getValue('sql.saveAsXml'); // if user entered config, set options if (saveConfig) { if (saveConfig.formatted !== undefined) {