Ticket #572: 572-jDaoConditions-in-notin.2.diff

lib/jelix/dao/jDaoFactoryBase.class.php

@@ -362 +362 @@
-                $prefixNoCondition = $prop['fieldName'];
-
-            $prefix = $prefixNoCondition.' '.$cond['operator'].' '; // ' ' for LIKE..
+            
+            if(strtoupper($cond['operator']) == 'IN' || strtoupper($cond['operator']) == 'NOT IN'){
+                if(is_array($cond['value'])){
+                    $values = array();
+                    foreach($cond['value'] as $value)
+                        $values[] = $this->_prepareValue($value,$prop['datatype']);
+                    $values = join(',', $values);
+                }
+                else
+                    $values = $cond['value'];
-
-
+
+
+
-                $value = $this->_prepareValue($cond['value'],$prop['datatype']);
-                if ($value === 'NULL'){
-                    if($cond['operator'] == '='){