From 3961f1e21b8dbe6e795d878036c6234647666dc3 Mon Sep 17 00:00:00 2001
From: Nor Gelera <norgelera@outlook.com>
Date: Tue, 11 Oct 2022 15:31:52 +0800
Subject: [PATCH] Fix issue with incorrect column options query syntax

---
 VERSION                            |  2 +-
 code/Universe/Galaxy.cs            | 14 +++++++-------
 code/Universe/UniverseQuery.csproj |  6 +++---
 code/Universe/UniverseQuery.xml    | 18 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/VERSION b/VERSION
index da768e0..0c87a0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-<Version>1.3.1</Version>
\ No newline at end of file
+<Version>1.3.2</Version>
\ No newline at end of file
diff --git a/code/Universe/Galaxy.cs b/code/Universe/Galaxy.cs
index d4b18dc..85ce993 100644
--- a/code/Universe/Galaxy.cs
+++ b/code/Universe/Galaxy.cs
@@ -1,4 +1,5 @@
-using System.Net;
+using System.Linq;
+using System.Net;
 using Universe.Options;
 using Universe.Response;
 
@@ -25,23 +26,23 @@ protected Galaxy(Database db, string container, string partitionKey, bool record
     private static QueryDefinition CreateQuery(IList<Catalyst> catalysts, ColumnOptions? columnOptions = null, IList<Sorting.Option> sorting = null, IList<string> groups = null)
     {
         // Column Options Builder
-        StringBuilder columnsBuilder = new("*");
+        string columnsInQuery = "*";
         if (columnOptions is not null)
         {
             if (columnOptions?.Names is not null && columnOptions?.Names.Count > 0)
-                columnsBuilder.Append(string.Join(", ", columnOptions?.Names.Select(c => $"c.{c}").ToList()));
+                columnsInQuery = string.Join(", ", columnOptions?.Names.Select(c => $"c.{c}").ToList());
 
             if ((columnOptions?.Top ?? 0) > 0)
-                columnsBuilder.Append($"TOP {columnOptions?.Top ?? 1} {columnsBuilder}");
+                columnsInQuery = $"TOP {columnOptions?.Top ?? 1} {columnsInQuery}";
 
             if (columnOptions?.IsDistinct ?? false)
-                columnsBuilder.Append($"DISTINCT {columnsBuilder}");
+                columnsInQuery = $"DISTINCT {columnsInQuery}";
 
             if (columnOptions?.Count ?? false)
             {
                 groups ??= new List<string>();
                 groups = groups.Concat(columnOptions?.Names ?? new List<string>()).Distinct().ToList();
-                columnsBuilder.Append($"{columnsBuilder}, COUNT(1) Count");
+                columnsInQuery = $"{columnsInQuery}, COUNT(1) Count";
             }
         }
 
@@ -50,7 +51,6 @@ private static QueryDefinition CreateQuery(IList<Catalyst> catalysts, ColumnOpti
             throw new UniverseException("ORDER BY is not supported in presence of GROUP BY");
 
         // Update Columns Builder with Group By
-        string columnsInQuery = columnsBuilder.ToString();
         if (columnsInQuery.Contains("*") && groups is not null && groups.Any())
             columnsInQuery.Replace("*", string.Join(", ", groups.Select(c => $"c.{c}").ToList()));
 
diff --git a/code/Universe/UniverseQuery.csproj b/code/Universe/UniverseQuery.csproj
index 317c504..c863eb2 100644
--- a/code/Universe/UniverseQuery.csproj
+++ b/code/Universe/UniverseQuery.csproj
@@ -21,10 +21,10 @@
 		<RepositoryType>Git</RepositoryType>
 		<Authors>Nor Gelera</Authors>
 		<Product>Universe</Product>
-		<Version>1.3.1</Version>
+		<Version>1.3.2</Version>
 		<PackageReleaseNotes>View release on https://github.com/kuromukira/universe/releases</PackageReleaseNotes>
-		<AssemblyVersion>1.3.1.0</AssemblyVersion>
-		<FileVersion>1.3.1.0</FileVersion>
+		<AssemblyVersion>1.3.2.0</AssemblyVersion>
+		<FileVersion>1.3.2.0</FileVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/code/Universe/UniverseQuery.xml b/code/Universe/UniverseQuery.xml
index fce892a..e0f953f 100644
--- a/code/Universe/UniverseQuery.xml
+++ b/code/Universe/UniverseQuery.xml
@@ -87,22 +87,22 @@
             Get one model from the database
             </summary>
         </member>
-        <member name="M:Universe.Interfaces.IGalaxy`1.List(Universe.Options.Query.Catalyst,System.Nullable{Universe.Options.Query.Column},System.Collections.Generic.IList{Universe.Options.Query.Sorting.Option},System.Collections.Generic.IList{System.String})">
+        <member name="M:Universe.Interfaces.IGalaxy`1.List(Universe.Options.Query.Catalyst,System.Nullable{Universe.Options.Query.ColumnOptions},System.Collections.Generic.IList{Universe.Options.Query.Sorting.Option},System.Collections.Generic.IList{System.String})">
             <summary>
             Get a paginated list from the database
             </summary>
         </member>
-        <member name="M:Universe.Interfaces.IGalaxy`1.List(System.Collections.Generic.IList{Universe.Options.Query.Catalyst},System.Nullable{Universe.Options.Query.Column},System.Collections.Generic.IList{Universe.Options.Query.Sorting.Option},System.Collections.Generic.IList{System.String})">
+        <member name="M:Universe.Interfaces.IGalaxy`1.List(System.Collections.Generic.IList{Universe.Options.Query.Catalyst},System.Nullable{Universe.Options.Query.ColumnOptions},System.Collections.Generic.IList{Universe.Options.Query.Sorting.Option},System.Collections.Generic.IList{System.String})">
             <summary>
             Get a paginated list from the database
             </summary>
         </member>
-        <member name="M:Universe.Interfaces.IGalaxy`1.Paged(Universe.Options.Query.Q.Page,System.Collections.Generic.IList{Universe.Options.Query.Catalyst},System.Nullable{Universe.Options.Query.Column},System.Collections.Generic.IList{Universe.Options.Query.Sorting.Option},System.Collections.Generic.IList{System.String})">
+        <member name="M:Universe.Interfaces.IGalaxy`1.Paged(Universe.Options.Query.Q.Page,System.Collections.Generic.IList{Universe.Options.Query.Catalyst},System.Nullable{Universe.Options.Query.ColumnOptions},System.Collections.Generic.IList{Universe.Options.Query.Sorting.Option},System.Collections.Generic.IList{System.String})">
             <summary>
             Get a paginated list from the database
             </summary>
         </member>
-        <member name="T:Universe.Options.Query.Column">
+        <member name="T:Universe.Options.Query.ColumnOptions">
             <summary></summary>
             <param name="Names">List of column names to be part of the query</param>
             <param name="IsDistinct">Adds DISTINCT in the generated query</param>
@@ -112,7 +112,7 @@
                 will be added as part of the GROUP BY clause
             </param>
         </member>
-        <member name="M:Universe.Options.Query.Column.#ctor(System.Collections.Generic.IList{System.String},System.Boolean,System.Int32,System.Boolean)">
+        <member name="M:Universe.Options.Query.ColumnOptions.#ctor(System.Collections.Generic.IList{System.String},System.Boolean,System.Int32,System.Boolean)">
             <summary></summary>
             <param name="Names">List of column names to be part of the query</param>
             <param name="IsDistinct">Adds DISTINCT in the generated query</param>
@@ -122,16 +122,16 @@
                 will be added as part of the GROUP BY clause
             </param>
         </member>
-        <member name="P:Universe.Options.Query.Column.Names">
+        <member name="P:Universe.Options.Query.ColumnOptions.Names">
             <summary>List of column names to be part of the query</summary>
         </member>
-        <member name="P:Universe.Options.Query.Column.IsDistinct">
+        <member name="P:Universe.Options.Query.ColumnOptions.IsDistinct">
             <summary>Adds DISTINCT in the generated query</summary>
         </member>
-        <member name="P:Universe.Options.Query.Column.Top">
+        <member name="P:Universe.Options.Query.ColumnOptions.Top">
             <summary>Only select the specified number of top rows</summary>
         </member>
-        <member name="P:Universe.Options.Query.Column.Count">
+        <member name="P:Universe.Options.Query.ColumnOptions.Count">
             <summary>
                 Count the number of rows. Please note that the column <paramref name="Names"/>
                 will be added as part of the GROUP BY clause