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-03-16 23:25:19 +00:00
parent eddfcf6019
commit fd3f8cb923
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/AyaNova/PickList/PickListSqlBuilder.cs
View File

@@ -30,7 +30,7 @@ namespace AyaNova.PickList
string PlIdSelectFragment = string.Empty; string PlIdSelectFragment = string.Empty;
string ActiveSelectFragment = string.Empty; string ActiveSelectFragment = string.Empty;
string ActiveWhereFragment = string.Empty; string ActiveWhereFragment = string.Empty;
string TagSpecificWhereFragment = string.Empty; string TagSpecificWhereFragment = string.Empty;
//PROCESS ROW ID "VALUE" COLUMN //PROCESS ROW ID "VALUE" COLUMN
@@ -73,10 +73,11 @@ namespace AyaNova.PickList
//PROCESS TAG SPECIFIC QUERY //PROCESS TAG SPECIFIC QUERY
// //
if(HasTagSpecificQuery){ if (HasTagSpecificQuery)
{
//get the tag column //get the tag column
AyaPickListFieldDefinition tagColumn = pickList.ColumnDefinitions.FirstOrDefault(x => x.ColumnDataType == UiFieldDataType.Tags); AyaPickListFieldDefinition tagColumn = pickList.ColumnDefinitions.FirstOrDefault(x => x.ColumnDataType == UiFieldDataType.Tags);
TagSpecificWhereFragment=$"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')"; TagSpecificWhereFragment = $"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')";
} }
@@ -183,6 +184,13 @@ namespace AyaNova.PickList
//WHERE //WHERE
sb.Append(" where "); sb.Append(" where ");
if (HasTagSpecificQuery)
{
sb.Append(TagSpecificWhereFragment);
sb.Append(" and (");
}
if (!IncludeInactive) if (!IncludeInactive)
{ {
sb.Append(ActiveWhereFragment); sb.Append(ActiveWhereFragment);
@@ -197,6 +205,12 @@ namespace AyaNova.PickList
//clear trailing or //clear trailing or
sb.Length -= 4; sb.Length -= 4;
//enclosing parenthesis //enclosing parenthesis
if (HasTagSpecificQuery)
{
sb.Append(")");
}
if (!IncludeInactive) if (!IncludeInactive)
{ {
sb.Append(")"); sb.Append(")");