diff --git a/classes/db/queryparts/condition/Condition.class.php b/classes/db/queryparts/condition/Condition.class.php index 4754fa72b..447ef24fb 100644 --- a/classes/db/queryparts/condition/Condition.class.php +++ b/classes/db/queryparts/condition/Condition.class.php @@ -122,13 +122,18 @@ class Condition case 'more' : case 'excess' : case 'less' : - case 'below' : + case 'below' : + case 'gte' : + case 'gt' : + case 'lte' : + case 'lt' : case 'like_tail' : case 'like_prefix' : case 'like' : case 'notlike_tail' : case 'notlike_prefix' : case 'notlike' : + case 'not_like' : case 'in' : case 'notin' : case 'not_in' : @@ -137,6 +142,7 @@ class Condition case 'xor': case 'not': case 'notequal' : + case 'not_equal' : // if variable is not set or is not string or number, return if(!isset($this->_value)) { @@ -167,7 +173,8 @@ class Condition break; } case 'null': - case 'notnull': + case 'notnull': + case 'not_null': break; default: // If operation is not one of the above, means the condition is invalid @@ -190,19 +197,23 @@ class Condition switch($operation) { - case 'equal' : + case 'equal' : return $name . ' = ' . $value; break; - case 'more' : + case 'more' : + case 'gte' : return $name . ' >= ' . $value; break; - case 'excess' : + case 'excess' : + case 'gt' : return $name . ' > ' . $value; break; - case 'less' : + case 'less' : + case 'lte' : return $name . ' <= ' . $value; break; - case 'below' : + case 'below' : + case 'lt' : return $name . ' < ' . $value; break; case 'like_tail' : @@ -212,6 +223,7 @@ class Condition case 'notlike_tail' : case 'notlike_prefix' : case 'notlike' : + case 'not_like' : return $name . ' NOT LIKE ' . $value; break; case 'in' : @@ -221,10 +233,12 @@ class Condition case 'not_in' : return $name . ' NOT IN ' . $value; break; - case 'notequal' : + case 'notequal' : + case 'not_equal' : return $name . ' <> ' . $value; break; - case 'notnull' : + case 'notnull' : + case 'not_null' : return $name . ' IS NOT NULL '; break; case 'null' :