Clean up

Author: ctrlpprint

src/PivotSharp/PivotConfig.cs

@@ -16,6 +16,8 @@ public class PivotConfig
 
     public IList<AggregatorDef> Aggregators { get; set; } = [];
 
+    public bool IncludeZeroValues { get; set; } = false;
+
     public ConfigurationErrorHandlingMode ErrorMode { get; set; }
         = ConfigurationErrorHandlingMode.Ignore;
 

src/PivotSharp/PivotSharp.csproj

@@ -13,11 +13,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Templates\Table.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />

src/PivotSharp/PivotSqlString.cs

@@ -45,8 +45,6 @@ public PivotSqlString(PivotConfig config) {
 	/// select {groupingColumns},{Aggregations} from {tableName} where {FilterColumns} group by {GroupingColumns}
 	/// </summary>
 	public override string ToString() =>
-			$"select {SelectList} from {tableName} "
-			+ $" {WhereClause}"
-            + $" {GroupByClause}";
+        string.Join(" ", [$"select {SelectList} from {tableName}", $"{WhereClause}", $"{GroupByClause}"]).Replace("  ", " ");
 
 }

src/PivotSharp/PivotTable.cs

@@ -73,22 +73,21 @@ namespace PivotSharp;
 /// </remarks>
 public class PivotTable
 {
+	/// <summary>
+	/// Used to produce flattened row and column keys. The Delimeter needs to be something
+	/// that won't appear in any of the header values.
+	/// </summary>
     public static string KeyDelimiter { get; set; } = "/~/";
 
     private readonly IPivotDataSourceConnector connector;
 
-	// Need to be able to group these.
-	// sort by field1 then field2, etc.
-
 	// PivotFieldList : List<PivotField>
 	public RowOrColumns Rows { get; private set; }
     public RowOrColumns Cols { get; private set; }
 
     // PivotCell
     public PivotCell GrandTotal { get; private set; }
 
-	// AggregatorDef -> Aggregator?
-	// Cells
 	public PivotBody Cells { get; private set; }
 
 	public PivotConfig Config => connector.Config;

src/PivotSharp/Templates/Table.cshtml

@@ -52,13 +52,13 @@ public void Init() {
     [Test]
     public void Can_Generate_Headers() {
         Assert.That(pivot.Cols.Count(), Is.EqualTo(3));
-        Assert.That(pivot.Cols[0].FlattenedKey, Is.EqualTo("dotted,outside"));
-        Assert.That(pivot.Cols[1].FlattenedKey, Is.EqualTo("dashed,outside"));
-        Assert.That(pivot.Cols[2].FlattenedKey, Is.EqualTo("dotted,inside"));
+        Assert.That(pivot.Cols[0].FlattenedKey, Is.EqualTo("dotted/~/outside"));
+        Assert.That(pivot.Cols[1].FlattenedKey, Is.EqualTo("dashed/~/outside"));
+        Assert.That(pivot.Cols[2].FlattenedKey, Is.EqualTo("dotted/~/inside"));
 
         Assert.That(pivot.Rows.Count(), Is.EqualTo(2));
-        Assert.That(pivot.Rows[0].FlattenedKey, Is.EqualTo("blue,circle"));
-        Assert.That(pivot.Rows[1].FlattenedKey, Is.EqualTo("red,triangle"));
+        Assert.That(pivot.Rows[0].FlattenedKey, Is.EqualTo("blue/~/circle"));
+        Assert.That(pivot.Rows[1].FlattenedKey, Is.EqualTo("red/~/triangle"));
     }
 
     [Test]
@@ -70,9 +70,9 @@ public void Can_Generate_Elements() {
 
     [Test]
     public void Can_Generate_Counts() {
-        Assert.That(pivot.Cells["blue,circle"]["dotted,outside"][0].Value, Is.EqualTo(2));
-        Assert.That(pivot.Cells["blue,circle"]["dashed,outside"][0].Value, Is.EqualTo(1));
-        Assert.That(pivot.Cells["red,triangle"]["dotted,inside"][0].Value, Is.EqualTo(1));
+        Assert.That(pivot.Cells["blue/~/circle"]["dotted/~/outside"][0].Value, Is.EqualTo(2));
+        Assert.That(pivot.Cells["blue/~/circle"]["dashed/~/outside"][0].Value, Is.EqualTo(1));
+        Assert.That(pivot.Cells["red/~/triangle"]["dotted/~/inside"][0].Value, Is.EqualTo(1));
 
         Assert.That(pivot.GrandTotal[0].Value, Is.EqualTo(4));
     }