Added more saveAsCsv options (#1128)

* Added more saveAsCsv options

Options:
lineSeperator
textIdentifier
encoding

* Bump tools service version to support csv configs

README.md

@@ -219,8 +219,11 @@ See [customize options] and [manage connection profiles] for more details.
     },
     "mssql.messagesDefaultOpen": true,
     "mssql.logDebugInfo": false,
-    "mssql.saveAsCSV.includeHeaders": true,
-    "mssql.saveAsCSV.delimiter": ",",
+    "mssql.saveAsCsv.includeHeaders": true,
+    "mssql.saveAsCsv.delimiter": ",",
+    "mssql.saveAsCsv.lineSeperator": null,
+    "mssql.saveAsCsv.textIdentifier": "\"",
+    "mssql.saveAsCsv.encoding": "utf-8",
     "mssql.intelliSense.enableIntelliSense": true,
     "mssql.intelliSense.enableErrorChecking": true,
     "mssql.intelliSense.enableSuggestions": true,

localization/xliff/enu/localizedPackage.json.enu.xlf

@@ -155,6 +155,15 @@
         <trans-unit id="mssql.saveAsCsv.delimiter">
             <source xml:lang="en">[Optional] Delimiter for separating data items when saving results as CSV</source>
         </trans-unit>
+        <trans-unit id="mssql.saveAsCsv.lineSeperator">
+            <source xml:lang="en">[Optional] Character(s) used for seperating rows when saving results as CSV</source>
+        </trans-unit>
+        <trans-unit id="mssql.saveAsCsv.textIdentifier">
+            <source xml:lang="en">[Optional] Character used for enclosing text fields when saving results as CSV</source>
+        </trans-unit>
+        <trans-unit id="mssql.saveAsCsv.encoding">
+            <source xml:lang="en">[Optional] File encoding used when saving results as CSV</source>
+        </trans-unit>
         <trans-unit id="mssql.copyIncludeHeaders">
             <source xml:lang="en">[Optional] Configuration options for copying results from the Results View</source>
         </trans-unit>

package.json

@@ -479,6 +479,24 @@
           "default": ",",
           "scope": "resource"
         },
+        "mssql.saveAsCsv.lineSeperator": {
+          "type": "string",
+          "description": "%mssql.saveAsCsv.lineSeperator%",
+          "default": null,
+          "scope": "resource"
+        },
+        "mssql.saveAsCsv.textIdentifier": {
+          "type": "string",
+          "description": "%mssql.saveAsCsv.textIdentifier%",
+          "default": "\"",
+          "scope": "resource"
+        },
+        "mssql.saveAsCsv.encoding": {
+          "type": "string",
+          "description": "%mssql.saveAsCsv.encoding%",
+          "default": "utf-8",
+          "scope": "resource"
+        },
         "mssql.copyIncludeHeaders": {
           "type": "boolean",
           "description": "%mssql.copyIncludeHeaders%",

package.nls.json

@@ -50,6 +50,9 @@
 "mssql.resultsFontSize":"Set the font size for the results grid; set to blank to use the editor size",
 "mssql.saveAsCsv.includeHeaders":"[Optional] When true, column headers are included when saving results as CSV",
 "mssql.saveAsCsv.delimiter":"[Optional] Delimiter for separating data items when saving results as CSV",
+"mssql.saveAsCsv.lineSeperator": "[Optional] Character(s) used for seperating rows when saving results as CSV",
+"mssql.saveAsCsv.textIdentifier": "[Optional] Character used for enclosing text fields when saving results as CSV",
+"mssql.saveAsCsv.encoding": "[Optional] File encoding used when saving results as CSV",
 "mssql.copyIncludeHeaders":"[Optional] Configuration options for copying results from the Results View",
 "mssql.copyRemoveNewLine":"[Optional] Configuration options for copying multi-line results from the Results View",
 "mssql.showBatchTime":"[Optional] Should execution time be shown for individual batches",

src/configurations/dev.config.json

@@ -1,7 +1,7 @@
 {
     "service": {
         "downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-        "version": "1.5.0-alpha.7",
+        "version": "1.5.0-alpha.34",
         "downloadFileNames": {
             "Windows_7_86": "win-x86-netcoreapp2.1.zip",
             "Windows_7_64": "win-x64-netcoreapp2.1.zip",

src/models/contracts.ts

@@ -68,6 +68,9 @@ export class SaveResultsRequestParams {
 export class SaveResultsAsCsvRequestParams extends SaveResultsRequestParams {
     includeHeaders: boolean = true;
     delimiter: string = ',';
+    lineSeperator: string = undefined;
+    textIdentifier: string = '\"';
+    encoding: string = 'utf-8';
 }
 
 export class SaveResultsAsJsonRequestParams extends SaveResultsRequestParams {

src/models/resultsSerializer.ts

@@ -80,6 +80,15 @@ export default class ResultsSerializer {
             if (saveConfig.delimiter !== undefined) {
                 saveResultsParams.delimiter = saveConfig.delimiter;
             }
+            if (saveConfig.lineSeperator !== undefined) {
+                saveResultsParams.lineSeperator = saveConfig.lineSeperator;
+            }
+            if (saveConfig.textIdentifier !== undefined) {
+                saveResultsParams.textIdentifier = saveConfig.textIdentifier;
+            }
+            if (saveConfig.encoding !== undefined) {
+                saveResultsParams.encoding = saveConfig.encoding;
+            }
         }
         return saveResultsParams;
     }