Adding FieldName to DbQueryResult

Author: csbernath

DataCommander.Providers.Msi/DataCommander.Providers.Msi.csproj

@@ -60,7 +60,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Deployment.WindowsInstaller">
-      <HintPath>..\packages\WiX.3.11.1\tools\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
+      <HintPath>%USERPROFILE%\.nuget\packages\wix\3.11.1\tools\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -95,5 +95,10 @@
       <Name>Foundation.NetStandard-2.0</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WiX">
+      <Version>3.11.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DataCommander.Providers/DataCommander.Providers.csproj

@@ -313,6 +313,7 @@
     <Compile Include="ResultWriter\MyDataObject.cs" />
     <Compile Include="ResultWriter\QueryConfiguration\Parameter.cs" />
     <Compile Include="ResultWriter\QueryConfiguration\Query.cs" />
+    <Compile Include="ResultWriter\QueryConfiguration\Result.cs" />
     <Compile Include="ResultWriter\SqlBulkCopyResultWriter.cs" />
     <Compile Include="ResultWriter\CopyResultWriter.cs" />
     <Compile Include="ResultWriter\DataGridViewResultWriter.cs" />

DataCommander.Providers/ResultWriter/LogResultWriter.cs

@@ -186,7 +186,8 @@ void IResultWriter.End()
 
         private DbQueryParameter ToParameter(Parameter source) =>
             new DbQueryParameter(source.Name, source.DataType, source.SqlDbType, source.CSharpDataType, source.IsNullable, source.CSharpValue);
-        private DbQueryResult ToResult(string name, Result result) => new DbQueryResult(name, result.Fields);
+
+        private DbQueryResult ToResult(QueryConfiguration.Result config, Result sql) => new DbQueryResult(config.Name, config.FieldName, sql.Fields);
 
         #endregion
 

DataCommander.Providers/ResultWriter/QueryConfiguration/Query.cs

@@ -8,9 +8,9 @@ public class Query
         public readonly string Namespace;
         public readonly string Name;
         public readonly ReadOnlyCollection<Parameter> Parameters;
-        public readonly ReadOnlyCollection<string> Results;
+        public readonly ReadOnlyCollection<Result> Results;
 
-        public Query(string @using, string @namespace, string name, ReadOnlyCollection<Parameter> parameters, ReadOnlyCollection<string> results)
+        public Query(string @using, string @namespace, string name, ReadOnlyCollection<Parameter> parameters, ReadOnlyCollection<Result> results)
         {
             Using = @using;
             Namespace = @namespace;

DataCommander.Providers/ResultWriter/QueryConfiguration/Result.cs

@@ -0,0 +1,14 @@
+namespace DataCommander.Providers.ResultWriter.QueryConfiguration
+{
+    public class Result
+    {
+        public readonly string Name;
+        public readonly string FieldName;
+
+        public Result(string name, string fieldName)
+        {
+            Name = name;
+            FieldName = fieldName;
+        }
+    }
+}

Foundation.NetStandard-2.0/DbQueryBuilding/DbQueryBuilder.cs

@@ -170,7 +170,7 @@ private string GetExecuteReaderMethod()
                     next = "Next";
                 }
 
-                stringBuilder.Append($"        var {ToLower(result.Name)} = dataReader.Read{next}Result(Read{result.Name}).AsReadOnly();");
+                stringBuilder.Append($"        var {ToLower(result.FieldName)} = dataReader.Read{next}Result(Read{result.Name}).AsReadOnly();");
             }
 
             stringBuilder.Append($"\r\n        result = new {_query.Name}DbQueryResult(");
@@ -181,7 +181,7 @@ private string GetExecuteReaderMethod()
                 if (sequence.Next() > 0)
                     stringBuilder.Append(", ");
 
-                stringBuilder.Append($"{ToLower(result.Name)}");
+                stringBuilder.Append($"{ToLower(result.FieldName)}");
             }
 
             stringBuilder.Append(");\r\n");
@@ -216,14 +216,14 @@ private string GetExecuteReaderAsyncMethodFragment()
             foreach (var result in _query.Results)
             {
                 var next = sequence.Next() == 0 ? null : "Next";
-                stringBuilder.Append($"var {ToLower(result.Name)} = (await dataReader.Read{next}ResultAsync(Read{result.Name}, request.CancellationToken)).AsReadOnly();\r\n");
+                stringBuilder.Append($"var {ToLower(result.FieldName)} = (await dataReader.Read{next}ResultAsync(Read{result.Name}, request.CancellationToken)).AsReadOnly();\r\n");
             }
 
             stringBuilder.Append($"result = new {_query.Name}DbQueryResult({GetResultVariableNames()});");
             return stringBuilder.ToString();
         }
 
-        private string GetResultVariableNames() => string.Join(", ", _query.Results.Select(i => ToLower(i.Name)));
+        private string GetResultVariableNames() => string.Join(", ", _query.Results.Select(i => ToLower(i.FieldName)));
 
         private string GetRecordClasses()
         {
@@ -292,7 +292,7 @@ private string GetQueryResultClass()
                 if (sequence.Next() > 0)
                     stringBuilder.Append("\r\n");
 
-                stringBuilder.Append($"    public readonly ReadOnlyCollection<{result.Name}> {result.Name};");
+                stringBuilder.Append($"    public readonly ReadOnlyCollection<{result.Name}> {result.FieldName};");
             }
 
             stringBuilder.Append("\r\n\r\n");
@@ -312,14 +312,14 @@ private string GetQueryResultClassConstructor(ReadOnlyCollection<DbQueryResult>
                 if (sequence.Next() > 0)
                     stringBuilder.Append(", ");
 
-                stringBuilder.Append($"ReadOnlyCollection<{result.Name}> {ToLower(result.Name)}");
+                stringBuilder.Append($"ReadOnlyCollection<{result.Name}> {ToLower(result.FieldName)}");
             }
 
             stringBuilder.Append(")\r\n");
             stringBuilder.Append("{\r\n");
 
             foreach (var result in results)
-                stringBuilder.Append($"    {result.Name} = {ToLower(result.Name)};\r\n");
+                stringBuilder.Append($"    {result.FieldName} = {ToLower(result.FieldName)};\r\n");
 
             stringBuilder.Append("}");
 

Foundation.NetStandard-2.0/DbQueryBuilding/DbQueryResult.cs

@@ -5,11 +5,13 @@ namespace Foundation.DbQueryBuilding
     public sealed class DbQueryResult
     {
         public readonly string Name;
+        public readonly string FieldName;
         public readonly ReadOnlyCollection<DbQueryResultField> Fields;
 
-        public DbQueryResult(string name, ReadOnlyCollection<DbQueryResultField> fields)
+        public DbQueryResult(string name, string fieldName, ReadOnlyCollection<DbQueryResultField> fields)
         {
             Name = name;
+            FieldName = fieldName;
             Fields = fields;
         }
     }