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
2018-12-03 23:38:54 +00:00
parent 33dcadfc7c
commit b6302d85e1
3 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/biz/FilterComparisonOperator.cs
View File

@@ -3,13 +3,14 @@ namespace AyaNova.Biz
{
public static class FilterComparisonOperator
{
//NOTE: no LIKE or NOT LIKE deliberately
//StartsWith and EndsWith and Contains and NotContains cover all the most common cases and avoid needing a special set of LIKE characters people have to type and we have to document
public const string Equality = "=";
public const string GreaterThan = ">";
public const string GreaterThanOrEqualTo = ">=";
public const string LessThan = "<";
public const string LessThanOrEqualTo = "<=";
public const string NotEqual = "!=";
public const string NotLike = "!%";
public const string StartsWith = "%-";
public const string EndsWith = "-%";
public const string Contains = "-%-";
@@ -29,7 +30,6 @@ namespace AyaNova.Biz
operators.Add(LessThan);
operators.Add(LessThanOrEqualTo);
operators.Add(NotEqual);
operators.Add(NotLike);
operators.Add(StartsWith);
operators.Add(EndsWith);
operators.Add(Contains);

44
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -180,12 +180,6 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "Like":
sb.Append("Like '");
sb.Append(sValue);
sb.Append("%'");
break;
case FilterComparisonOperator.NotEqual:
sb.Append("<>'");
sb.Append(sValue);
@@ -193,47 +187,47 @@ namespace AyaNova.Biz
break;
//Following 7 operators added 14-June-2006
case "DoesNotContain":
case FilterComparisonOperator.NotContains:
sb.Append("Not Like '%");
sb.Append(sValue);
sb.Append("%'");
break;
case "Contains":
case FilterComparisonOperator.Contains:
sb.Append("Like '%");
sb.Append(sValue);
sb.Append("%'");
break;
case "StartsWith":
case FilterComparisonOperator.StartsWith:
sb.Append("Like '");
sb.Append(sValue);
sb.Append("%'");
break;
case "EndsWith":
case FilterComparisonOperator.EndsWith:
sb.Append("Like '%");
sb.Append(sValue);
sb.Append("'");
break;
case "DoesNotStartWith":
sb.Append("Not Like '");
sb.Append(sValue);
sb.Append("%'");
break;
// case "DoesNotStartWith":
// sb.Append("Not Like '");
// sb.Append(sValue);
// sb.Append("%'");
// break;
case "DoesNotEndWith":
sb.Append("Not Like '%");
sb.Append(sValue);
sb.Append("'");
break;
// case "DoesNotEndWith":
// sb.Append("Not Like '%");
// sb.Append(sValue);
// sb.Append("'");
// break;
case "NotLike":
sb.Append("Not Like '");
sb.Append(sValue);
sb.Append("%'");
break;
// case "NotLike":
// sb.Append("Not Like '");
// sb.Append(sValue);
// sb.Append("%'");
// break;
default:
throw new System.ArgumentOutOfRangeException("OPERATOR_TYPE", sOperator, "GridToSqlCriteria unhandled operator type [" + sOperator + "] IN STRING");