Merge pull request #13 from fearoff/master

hello there. not in operand++
areal-team · Jan 25, 2019 · 3a66b49 · 3a66b49
2 parents ab5adc3 + 2d661b3
commit 3a66b49
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Element/QuerySet.php b/src/Element/QuerySet.php
@@ -136,11 +136,12 @@ private function getExpression($fieldName, $fieldValue, $prefix = '')
         );
         switch ($operand) {
             case 'IN':
+            case 'NOT IN':
                 $values = '';
                 foreach ($fieldValue as $value) {
                     $values .= "'$value',";
                 }
-                return "`$this->tableName`.`$fieldName` IN ({$this->removeLastComma($values)}) AND ";
+                return "`$this->tableName`.`$fieldName` $operand ({$this->removeLastComma($values)}) AND ";
                 break;
             case 'BETWEEN':
                 return "`$this->tableName`.`$fieldName` BETWEEN '{$fieldValue[0]}' AND '{$fieldValue[1]}' AND ";
@@ -163,6 +164,9 @@ private function getOperand($fieldValue, $prefix = '')
           if ($prefix == '><') {
             return 'BETWEEN';
           }
+          if ($prefix == '!=') {
+              return 'NOT IN';
+          }
           return 'IN';
         }
         // \Akop\Util::pre([$fieldValue, $prefix], 'getOperand');