From 121f1bbac044d71509c76441538d81f1e1776b84 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 2 Sep 2021 19:32:39 +0000 Subject: [PATCH] --- .../DataListSqlFilterCriteriaBuilder.cs | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs index 378ef621..8195b51f 100644 --- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs @@ -982,34 +982,16 @@ namespace AyaNova.DataList case DataListFilterComparisonOperator.NotEqual: //NOT (ARRAY['green'::varchar(255)] <@ tags and array_length(tags,1) = 1) return $"NOT ({PostgresTagArrayFragment} <@ {SqlColumnNameToFilter} AND ARRAY_LENGTH({SqlColumnNameToFilter},1) = {normalizedTags.Count})"; - - case DataListFilterComparisonOperator.NotContains: - sb.Append("Not Like '%"); - sb.Append(sValue); - sb.Append("%'"); - break; - + //NOT ARRAY['red','green'::varchar(255)] <@ tags + return $"NOT {PostgresTagArrayFragment} <@ {SqlColumnNameToFilter}"; case DataListFilterComparisonOperator.Contains: - - //TagSpecificWhereFragment = $"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')"; - sb.Append("Like '%"); - sb.Append(sValue); - sb.Append("%'"); - break; - + //ARRAY['red','green'::varchar(255)] <@ tags + return $"{PostgresTagArrayFragment} <@ {SqlColumnNameToFilter}"; default: throw new System.ArgumentOutOfRangeException("OPERATOR_TYPE", sOperator, "DataListSqlFilterCriteriaBuilder unhandled operator type [" + sOperator + "] IN TAGS"); - } - - - - } - return sb.ToString(); - - } ////////////////////////////////////