From 2237d286b6b60bab48e62aac74668f96ed5ecb55 Mon Sep 17 00:00:00 2001 From: Amir Omidi Date: Fri, 18 Oct 2019 16:35:45 -0700 Subject: [PATCH] XML output is truncated (#7748) * QueryExecutionOptions change * add config points * Change api type used * Revert "QueryExecutionOptions change" This reverts commit 7adc3b032b5e4bc92234d337f0a145f0963c2d34. Let's not change the azdata file. * Change the signature of this api * Change the event * Change SqlCMD to use the API properly * Add type * Change type to interface - handle existing files * Remove unused import * Delete useless code * Remove unnecessary code * Fix the interface * remove whitespace --- extensions/mssql/package.json | 5 +++++ extensions/mssql/package.nls.json | 1 + src/sql/azdata.d.ts | 4 +--- src/sql/workbench/parts/query/browser/queryActions.ts | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index dce0773297..5a373b3b1f 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -128,6 +128,11 @@ "default": true, "description": "%mssql.query.displayBitAsNumber%" }, + "mssql.query.maxXmlCharsToStore": { + "type": "number", + "default": 2097152, + "description": "%mssql.query.maxXmlCharsToStore%" + }, "mssql.format.alignColumnDefinitionsInColumns": { "type": "boolean", "description": "%mssql.format.alignColumnDefinitionsInColumns%", diff --git a/extensions/mssql/package.nls.json b/extensions/mssql/package.nls.json index 3e53e6f185..eb4292f53f 100644 --- a/extensions/mssql/package.nls.json +++ b/extensions/mssql/package.nls.json @@ -38,6 +38,7 @@ "mssql.configuration.title": "MSSQL configuration", "mssql.query.displayBitAsNumber": "Should BIT columns be displayed as numbers (1 or 0)? If false, BIT columns will be displayed as 'true' or 'false'", + "mssql.query.maxXmlCharsToStore": "Number of XML characters to store after running a query", "mssql.format.alignColumnDefinitionsInColumns": "Should column definitions be aligned?", "mssql.format.datatypeCasing": "Should data types be formatted as UPPERCASE, lowercase, or none (not formatted)", "mssql.format.keywordCasing": "Should keywords be formatted as UPPERCASE, lowercase, or none (not formatted)", diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts index a672e7203c..c287466080 100644 --- a/src/sql/azdata.d.ts +++ b/src/sql/azdata.d.ts @@ -748,8 +748,6 @@ declare module 'azdata' { deleteCredential(credentialId: string): Thenable; } - - export interface DidChangeLanguageFlavorParams { uri: string; language: string; @@ -757,7 +755,7 @@ declare module 'azdata' { } export interface QueryExecutionOptions { - options: Map; + options: { [option: string]: any; }; } export interface QueryProvider extends DataProvider { diff --git a/src/sql/workbench/parts/query/browser/queryActions.ts b/src/sql/workbench/parts/query/browser/queryActions.ts index 81efca7d1c..6465f1e1a0 100644 --- a/src/sql/workbench/parts/query/browser/queryActions.ts +++ b/src/sql/workbench/parts/query/browser/queryActions.ts @@ -555,7 +555,7 @@ export class ToggleSqlCmdModeAction extends QueryTaskbarAction { this.editor.input.state.isSqlCmdMode = toSqlCmdState; // set query options - let queryoptions: QueryExecutionOptions = { options: new Map() }; + let queryoptions: QueryExecutionOptions = { options: {} }; queryoptions.options['isSqlCmdMode'] = toSqlCmdState; if (!this.editor.input) { console.error('editor input was null');