admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-02-26 19:24:44 +00:00
parent 1a36dad3e9
commit 16d36c2b9c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/AyaNova/DataList/DataListSqlSelectBuilder.cs
View File

@@ -53,7 +53,7 @@ namespace AyaNova.DataList
//DEPRECATED map.Add("df", 0); //DEPRECATED map.Add("df", 0);
int nOrdinal = 0; int nOrdinal = 0;
var firstColumnAdded = false;
foreach (string ColumnName in listViewFieldList) foreach (string ColumnName in listViewFieldList)
{ {
// //skip the df column, it's already been processed above // //skip the df column, it's already been processed above
@@ -77,8 +77,10 @@ namespace AyaNova.DataList
//has it been added yet? //has it been added yet?
if (!map.ContainsKey(CustomFieldSqlColumnName)) if (!map.ContainsKey(CustomFieldSqlColumnName))
{ //nope { //nope
sb.Append(", "); if (firstColumnAdded)
sb.Append(", ");
sb.Append(CustomFieldSqlColumnName); sb.Append(CustomFieldSqlColumnName);
firstColumnAdded = true;
map.Add(CustomFieldSqlColumnName, nOrdinal++); map.Add(CustomFieldSqlColumnName, nOrdinal++);
} }
//if it was already added then can just ignore it //if it was already added then can just ignore it
@@ -93,9 +95,11 @@ namespace AyaNova.DataList
var valueColumnName = o.GetSqlValueColumnName(); var valueColumnName = o.GetSqlValueColumnName();
if (!map.ContainsKey(valueColumnName)) if (!map.ContainsKey(valueColumnName))
{ {
sb.Append(", "); if (firstColumnAdded)
sb.Append(", ");
sb.Append(valueColumnName); sb.Append(valueColumnName);
map.Add(valueColumnName, ++nOrdinal); firstColumnAdded = true;
map.Add(valueColumnName, nOrdinal++);
} }
//does it also have an ID column? //does it also have an ID column?
@@ -104,12 +108,14 @@ namespace AyaNova.DataList
{ {
if (!map.ContainsKey(idColumnName)) if (!map.ContainsKey(idColumnName))
{ {
sb.Append(", "); if (firstColumnAdded)
sb.Append(", ");
sb.Append(idColumnName); sb.Append(idColumnName);
map.Add(idColumnName, ++nOrdinal); firstColumnAdded = true;
map.Add(idColumnName, nOrdinal++);
} }
} }
} }
} }