From 16d36c2b9c3c67006147f76ecae7fa23a066a5ba Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 26 Feb 2020 19:24:44 +0000 Subject: [PATCH] --- .../DataList/DataListSqlSelectBuilder.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/DataList/DataListSqlSelectBuilder.cs b/server/AyaNova/DataList/DataListSqlSelectBuilder.cs index 4e267a5f..c8e24963 100644 --- a/server/AyaNova/DataList/DataListSqlSelectBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlSelectBuilder.cs @@ -53,7 +53,7 @@ namespace AyaNova.DataList //DEPRECATED map.Add("df", 0); int nOrdinal = 0; - + var firstColumnAdded = false; foreach (string ColumnName in listViewFieldList) { // //skip the df column, it's already been processed above @@ -77,8 +77,10 @@ namespace AyaNova.DataList //has it been added yet? if (!map.ContainsKey(CustomFieldSqlColumnName)) { //nope - sb.Append(", "); + if (firstColumnAdded) + sb.Append(", "); sb.Append(CustomFieldSqlColumnName); + firstColumnAdded = true; map.Add(CustomFieldSqlColumnName, nOrdinal++); } //if it was already added then can just ignore it @@ -93,9 +95,11 @@ namespace AyaNova.DataList var valueColumnName = o.GetSqlValueColumnName(); if (!map.ContainsKey(valueColumnName)) { - sb.Append(", "); + if (firstColumnAdded) + sb.Append(", "); sb.Append(valueColumnName); - map.Add(valueColumnName, ++nOrdinal); + firstColumnAdded = true; + map.Add(valueColumnName, nOrdinal++); } //does it also have an ID column? @@ -104,12 +108,14 @@ namespace AyaNova.DataList { if (!map.ContainsKey(idColumnName)) { - sb.Append(", "); + if (firstColumnAdded) + sb.Append(", "); sb.Append(idColumnName); - map.Add(idColumnName, ++nOrdinal); + firstColumnAdded = true; + map.Add(idColumnName, nOrdinal++); } } - + } }