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-12-03 18:18:58 +00:00
parent 77d114743c
commit 5da01d776a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ namespace AyaNova.PickList
//Maximum number of results to return at any given time //Maximum number of results to return at any given time
//did a little research and may adjust this but it can be fairly girthy in this day and age //did a little research and may adjust this but it can be fairly girthy in this day and age
//and many people might not want or need to autocomplete type if we provide enough leeway. //and many people might not want or need to autocomplete type if we provide enough leeway.
//for example, if you're selecting a
const int MAXIMUM_RESULT_COUNT = 100; const int MAXIMUM_RESULT_COUNT = 100;
//Build the query for a picklist request //Build the query for a picklist request
@@ -52,6 +52,8 @@ namespace AyaNova.PickList
throw new System.ArgumentNullException($"DEV ERROR in PickListSqlBuilder.cs: picklist for {pickList.DefaultListObjectType.ToString()} has no rowId column specified in columnDefinitions list"); throw new System.ArgumentNullException($"DEV ERROR in PickListSqlBuilder.cs: picklist for {pickList.DefaultListObjectType.ToString()} has no rowId column specified in columnDefinitions list");
PlIdSelectFragment = rowIdColumn.SqlIdColumnName + " as plId"; PlIdSelectFragment = rowIdColumn.SqlIdColumnName + " as plId";
if (preId != 0) if (preId != 0)
{ {
PredefinedOnlyWhereFragment = rowIdColumn.SqlIdColumnName + " = " + preId.ToString(); PredefinedOnlyWhereFragment = rowIdColumn.SqlIdColumnName + " = " + preId.ToString();
@@ -67,6 +69,7 @@ namespace AyaNova.PickList
AyaPickListFieldDefinition activeColumn = pickList.ColumnDefinitions.FirstOrDefault(z => z.IsActiveColumn == true); AyaPickListFieldDefinition activeColumn = pickList.ColumnDefinitions.FirstOrDefault(z => z.IsActiveColumn == true);
if (activeColumn == null) if (activeColumn == null)
{ {
//no active column which is normal for some types of objects //no active column which is normal for some types of objects
//so make a fake one and return them all as active=true as all lists must return the same format //so make a fake one and return them all as active=true as all lists must return the same format
ActiveSelectFragment = "true as plActive"; ActiveSelectFragment = "true as plActive";
@@ -83,7 +86,16 @@ namespace AyaNova.PickList
//if there is an override to see inactive too then we just don't set the filter on active //if there is an override to see inactive too then we just don't set the filter on active
if (!IncludeInactive) if (!IncludeInactive)
{ {
ActiveWhereFragment = activeColumn.SqlValueColumnName + " = true"; if (preId != 0)
{
//pre-selected need to always appear regardless of active status
ActiveWhereFragment = $"({rowIdColumn.SqlIdColumnName} = {preId}) or ({activeColumn.SqlValueColumnName} = true)";
}
else
{
ActiveWhereFragment = activeColumn.SqlValueColumnName + " = true";
}
} }
} }
@@ -169,10 +181,10 @@ namespace AyaNova.PickList
//Where fragment is different for non text fields: it needs to be cast to text to like query on it //Where fragment is different for non text fields: it needs to be cast to text to like query on it
//(cast (awidget.serial as text) like '%some%') //(cast (awidget.serial as text) like '%some%')
if (HasAutoCompleteQuery) if (HasAutoCompleteQuery)
if (ServerGlobalBizSettings.SearchCaseSensitiveOnly) if (ServerGlobalBizSettings.SearchCaseSensitiveOnly)
sWhere = $"(cast ({valueColumnName} as text) like '%{autoCompleteQuery}%')"; sWhere = $"(cast ({valueColumnName} as text) like '%{autoCompleteQuery}%')";
else else
sWhere = $"(lower(cast ({valueColumnName} as text)) like lower('%{autoCompleteQuery}%'))"; sWhere = $"(lower(cast ({valueColumnName} as text)) like lower('%{autoCompleteQuery}%'))";
} }