ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix circular dependencies (#6582)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-03 10:57:36 -07:00
committed by GitHub
parent 674351dc75
commit f5184ba282
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/platform/query/common/queryRunner.ts
View File

@@ -5,8 +5,6 @@
import * as azdata from 'azdata'; 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 { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
import * as Utils from 'sql/platform/connection/common/utils'; import * as Utils from 'sql/platform/connection/common/utils';
import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; 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 { private sendBatchTimeMessage(batchId: number, executionTime: string): void {
// get config copyRemoveNewLine option from vscode config // get config copyRemoveNewLine option from vscode config
let showBatchTime: boolean = WorkbenchUtils.getSqlConfigValue<boolean>(this._configurationService, Constants.configShowBatchTime); let showBatchTime = this._configurationService.getValue<boolean>('sql.showBatchTime');
if (showBatchTime) { if (showBatchTime) {
let message: IQueryMessage = { let message: IQueryMessage = {
batchId: batchId, batchId: batchId,
@@ -657,12 +655,12 @@ export function shouldIncludeHeaders(includeHeaders: boolean, configurationServi
return includeHeaders; return includeHeaders;
} }
// else get config option from vscode config // else get config option from vscode config
includeHeaders = WorkbenchUtils.getSqlConfigValue<boolean>(configurationService, Constants.copyIncludeHeaders); includeHeaders = configurationService.getValue<boolean>('sql.copyIncludeHeaders');
return !!includeHeaders; return !!includeHeaders;
} }
export function shouldRemoveNewLines(configurationService: IConfigurationService): boolean { export function shouldRemoveNewLines(configurationService: IConfigurationService): boolean {
// get config copyRemoveNewLine option from vscode config // get config copyRemoveNewLine option from vscode config
let removeNewLines: boolean = WorkbenchUtils.getSqlConfigValue<boolean>(configurationService, Constants.configCopyRemoveNewLine); let removeNewLines = configurationService.getValue<boolean>('sql.copyRemoveNewLine');
return !!removeNewLines; return !!removeNewLines;
} }

20
src/sql/workbench/parts/query/common/resultSerializer.ts
View File

@@ -6,7 +6,6 @@
import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import * as ConnectionConstants from 'sql/platform/connection/common/constants';
import * as Constants from 'sql/workbench/parts/query/common/constants'; import * as Constants from 'sql/workbench/parts/query/common/constants';
import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
import { SaveResultsRequestParams } from 'azdata'; import { SaveResultsRequestParams } from 'azdata';
import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
import { ISaveRequest, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; 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; 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 * Handles save results request from the context menu of slickGrid
*/ */
@@ -42,7 +54,7 @@ export class ResultSerializer {
constructor( constructor(
@IOutputService private _outputService: IOutputService, @IOutputService private _outputService: IOutputService,
@IQueryManagementService private _queryManagementService: IQueryManagementService, @IQueryManagementService private _queryManagementService: IQueryManagementService,
@IConfigurationService private _workspaceConfigurationService: IConfigurationService, @IConfigurationService private _configurationService: IConfigurationService,
@IEditorService private _editorService: IEditorService, @IEditorService private _editorService: IEditorService,
@IWorkspaceContextService private _contextService: IWorkspaceContextService, @IWorkspaceContextService private _contextService: IWorkspaceContextService,
@IWindowsService private _windowsService: IWindowsService, @IWindowsService private _windowsService: IWindowsService,
@@ -159,7 +171,7 @@ export class ResultSerializer {
let saveResultsParams = <SaveResultsRequestParams>{ resultFormat: SaveFormat.CSV as string }; let saveResultsParams = <SaveResultsRequestParams>{ resultFormat: SaveFormat.CSV as string };
// get save results config from vscode config // get save results config from vscode config
let saveConfig = WorkbenchUtils.getSqlConfigSection(this._workspaceConfigurationService, Constants.configSaveAsCsv); let saveConfig = this._configurationService.getValue<ICsvConfig>('sql.saveAsCsv');
// if user entered config, set options // if user entered config, set options
if (saveConfig) { if (saveConfig) {
if (saveConfig.includeHeaders !== undefined) { if (saveConfig.includeHeaders !== undefined) {
@@ -205,7 +217,7 @@ export class ResultSerializer {
let saveResultsParams = <SaveResultsRequestParams>{ resultFormat: SaveFormat.XML as string }; let saveResultsParams = <SaveResultsRequestParams>{ resultFormat: SaveFormat.XML as string };
// get save results config from vscode config // get save results config from vscode config
let saveConfig = WorkbenchUtils.getSqlConfigSection(this._workspaceConfigurationService, Constants.configSaveAsXml); let saveConfig = this._configurationService.getValue<IXmlConfig>('sql.saveAsXml');
// if user entered config, set options // if user entered config, set options
if (saveConfig) { if (saveConfig) {
if (saveConfig.formatted !== undefined) { if (saveConfig.formatted !== undefined) {