Updated namespace

MarkMpn · Jul 1, 2024 · 69f2e02 · 69f2e02
1 parent 428f8e1
commit 69f2e02
Show file tree

Hide file tree

Showing 33 changed files with 63 additions and 62 deletions.
diff --git a/MarkMpn.Sql4Cds.Export/Contracts/DbCellValue.cs b/MarkMpn.Sql4Cds.Export/Contracts/DbCellValue.cs
@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.Utility;
+using MarkMpn.Sql4Cds.Export.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts
+namespace MarkMpn.Sql4Cds.Export.Contracts
 {
     /// <summary>
     /// Class used for internally passing results from a cell around.

diff --git a/MarkMpn.Sql4Cds.Export/Contracts/DbColumnWrapper.cs b/MarkMpn.Sql4Cds.Export/Contracts/DbColumnWrapper.cs
@@ -10,9 +10,9 @@
 using System.Data.Common;
 using System.Data.SqlTypes;
 using System.Diagnostics;
-using Microsoft.SqlTools.Utility;
+using MarkMpn.Sql4Cds.Export.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts
+namespace MarkMpn.Sql4Cds.Export.Contracts
 {
     /// <summary>
     /// Wrapper around a DbColumn, which provides extra functionality, but can be used as a

diff --git a/MarkMpn.Sql4Cds.Export/Contracts/SaveResultsRequest.cs b/MarkMpn.Sql4Cds.Export/Contracts/SaveResultsRequest.cs
@@ -4,7 +4,7 @@
 //
 
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts
+namespace MarkMpn.Sql4Cds.Export.Contracts
 {
     /// <summary>
     /// Parameters for the save results request

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/FileStreamReadResult.cs b/MarkMpn.Sql4Cds.Export/DataStorage/FileStreamReadResult.cs
@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Represents a value returned from a read from a file stream. This is used to eliminate ref

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/IFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/IFileStreamFactory.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Interface for a factory that creates filesystem readers/writers

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/IFileStreamReader.cs b/MarkMpn.Sql4Cds.Export/DataStorage/IFileStreamReader.cs
@@ -5,9 +5,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Interface for a object that reads from the filesystem

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/IFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/IFileStreamWriter.cs
@@ -6,10 +6,10 @@
 using System;
 using System.Collections.Generic;
 using MarkMpn.Sql4Cds.Engine;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Interface for a object that writes to a filesystem wrapper

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsCsvFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsCsvFileStreamFactory.cs
@@ -6,10 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Factory for creating a reader/writer pair that will read from the temporary buffer file

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsCsvFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsCsvFileStreamWriter.cs
@@ -8,9 +8,9 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Writer for writing rows of results to a CSV file

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsExcelFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsExcelFileStreamFactory.cs
@@ -7,10 +7,10 @@
 using System.Collections.Generic;
 using System.IO;
 using MarkMpn.Sql4Cds.Engine;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Factory for creating a reader/writer pair that will read from the temporary buffer file

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsExcelFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsExcelFileStreamWriter.cs
@@ -7,10 +7,10 @@
 using System.Collections.Generic;
 using System.IO;
 using MarkMpn.Sql4Cds.Engine;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using SkiaSharp;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Writer for writing rows of results to a Excel file

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsExcelFileStreamWriterHelper.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsExcelFileStreamWriterHelper.cs
@@ -11,9 +11,9 @@
 using System.IO.Compression;
 using System.Xml;
 using MarkMpn.Sql4Cds.Engine;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     // A xlsx file is a zip with specific folder structure.
     // http://www.ecma-international.org/publications/standards/Ecma-376.htm

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsJsonFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsJsonFileStreamFactory.cs
@@ -6,10 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     public class SaveAsJsonFileStreamFactory : IFileStreamFactory
     {

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsJsonFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsJsonFileStreamWriter.cs
@@ -6,10 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Newtonsoft.Json;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Writer for writing rows of results to a JSON file.

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsMarkdownFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsMarkdownFileStreamFactory.cs
@@ -7,10 +7,10 @@
 using System.Collections.Generic;
 using System.IO;
 using MarkMpn.Sql4Cds.Engine;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     public class SaveAsMarkdownFileStreamFactory : IFileStreamFactory
     {

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsMarkdownFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsMarkdownFileStreamWriter.cs
@@ -11,9 +11,9 @@
 using System.Text.RegularExpressions;
 using System.Web;
 using MarkMpn.Sql4Cds.Engine;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Writer for exporting results to a Markdown table.

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsWriterBase.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsWriterBase.cs
@@ -7,10 +7,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-using Microsoft.SqlTools.Utility;
+using MarkMpn.Sql4Cds.Export.Contracts;
+using MarkMpn.Sql4Cds.Export.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Abstract class for implementing writers that save results to file. Stores some basic info

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsXmlFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsXmlFileStreamFactory.cs
@@ -6,10 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     public class SaveAsXmlFileStreamFactory : IFileStreamFactory
     {

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsXmlFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/SaveAsXmlFileStreamWriter.cs
@@ -8,9 +8,9 @@
 using System.IO;
 using System.Text;
 using System.Xml;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Writer for writing rows of results to a XML file.

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/ServiceBufferFileStreamFactory.cs b/MarkMpn.Sql4Cds.Export/DataStorage/ServiceBufferFileStreamFactory.cs
@@ -5,10 +5,10 @@
 
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Factory that creates file reader/writers that process rows in an internal, non-human readable file format

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/ServiceBufferFileStreamReader.cs b/MarkMpn.Sql4Cds.Export/DataStorage/ServiceBufferFileStreamReader.cs
@@ -9,10 +9,10 @@
 using System.Data.SqlTypes;
 using System.IO;
 using System.Text;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-using Microsoft.SqlTools.Utility;
+using MarkMpn.Sql4Cds.Export.Contracts;
+using MarkMpn.Sql4Cds.Export.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Reader for service buffer formatted file streams

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/ServiceBufferFileStreamWriter.cs b/MarkMpn.Sql4Cds.Export/DataStorage/ServiceBufferFileStreamWriter.cs
@@ -9,11 +9,11 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
-using Microsoft.SqlTools.Utility;
+using MarkMpn.Sql4Cds.Export.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Writer for service buffer formatted file streams

diff --git a/MarkMpn.Sql4Cds.Export/DataStorage/StorageDataReader.cs b/MarkMpn.Sql4Cds.Export/DataStorage/StorageDataReader.cs
@@ -10,10 +10,10 @@
 using System.IO;
 using System.Linq;
 using System.Xml;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-using Microsoft.SqlTools.Utility;
+using MarkMpn.Sql4Cds.Export.Contracts;
+using MarkMpn.Sql4Cds.Export.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage
+namespace MarkMpn.Sql4Cds.Export.DataStorage
 {
     /// <summary>
     /// Wrapper around a DbData reader to perform some special operations more simply

diff --git a/MarkMpn.Sql4Cds.Export/README.md b/MarkMpn.Sql4Cds.Export/README.md
@@ -1,2 +1,3 @@
 A fork of various classes from https://github.com/microsoft/sqltoolsservice to handle storing and exporting
-data from a data reader to a file in various different formats.
+data from a data reader to a file in various different formats. Extended to handle SqlEntityReference values
+as hyperlinks in Excel and Markdown exports.
diff --git a/MarkMpn.Sql4Cds.Export/SR.cs b/MarkMpn.Sql4Cds.Export/SR.cs
@@ -3,7 +3,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 
-namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
+namespace MarkMpn.Sql4Cds.Export
 {
     internal class SR
     {

diff --git a/MarkMpn.Sql4Cds.Export/Utility/Extensions.cs b/MarkMpn.Sql4Cds.Export/Utility/Extensions.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.Utility
+namespace MarkMpn.Sql4Cds.Export.Utility
 {
     public static class ObjectExtensions
     {

diff --git a/MarkMpn.Sql4Cds.Export/Utility/Validate.cs b/MarkMpn.Sql4Cds.Export/Utility/Validate.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.Utility
+namespace MarkMpn.Sql4Cds.Export.Utility
 {
     /// <summary>
     /// Provides common validation methods to simplify method

diff --git a/MarkMpn.Sql4Cds.Export/ValueFormatter.cs b/MarkMpn.Sql4Cds.Export/ValueFormatter.cs
@@ -3,8 +3,8 @@
 using System.Data.Common;
 using System.Data.SqlTypes;
 using System.Text;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
 namespace MarkMpn.Sql4Cds.Export
 {

diff --git a/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/Contracts/ExportRequests.cs b/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/Contracts/ExportRequests.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace MarkMpn.Sql4Cds.LanguageServer.QueryExecution.Contracts

diff --git a/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/Contracts/ResultSetSubset.cs b/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/Contracts/ResultSetSubset.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
 namespace MarkMpn.Sql4Cds.LanguageServer.QueryExecution.Contracts
 {

diff --git a/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/Contracts/ResultSetSummary.cs b/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/Contracts/ResultSetSummary.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
+using MarkMpn.Sql4Cds.Export.Contracts;
 
 namespace MarkMpn.Sql4Cds.LanguageServer.QueryExecution.Contracts
 {

diff --git a/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/QueryExecutionHandler.cs b/MarkMpn.Sql4Cds.LanguageServer/QueryExecution/QueryExecutionHandler.cs
@@ -20,8 +20,8 @@
 using MarkMpn.Sql4Cds.LanguageServer.QueryExecution.Contracts;
 using MarkMpn.Sql4Cds.LanguageServer.Workspace;
 using Microsoft.SqlTools.ServiceLayer.ExecutionPlan.Contracts;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
+using MarkMpn.Sql4Cds.Export.Contracts;
+using MarkMpn.Sql4Cds.Export.DataStorage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;

diff --git a/MarkMpn.Sql4Cds.XTB/SqlQueryControl.cs b/MarkMpn.Sql4Cds.XTB/SqlQueryControl.cs
@@ -19,11 +19,11 @@
 using MarkMpn.Sql4Cds.Engine;
 using MarkMpn.Sql4Cds.Engine.ExecutionPlan;
 using MarkMpn.Sql4Cds.Export;
+using MarkMpn.Sql4Cds.Export.Contracts;
+using MarkMpn.Sql4Cds.Export.DataStorage;
 using McTools.Xrm.Connection;
 using Microsoft.ApplicationInsights;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Query;
 using Microsoft.Xrm.Tooling.Connector;