where changes

Author: hardeepvicky

.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Xdebug Cloud",
+            "type": "php",
+            "request": "launch",
+            "xdebugCloudToken": ""
+        },
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

src/Where.php

@@ -41,41 +41,64 @@ public function add(String $field, $value, String $operator = "=", String $value
         {
             $operator = "";
         }
-        
+
+        $will_condition_apply = true;
+
         switch(gettype($value))
         {
+            case "integer":
+            case "float":                
+                break;
+
+            case "boolean":
+                $value = (int) $value;
+            break;
+
             case "string":
-                switch($value_type)
-                {
-                    case "string":
-                        $value = "'" . $value . "'";
-                        break;
+                $value = trim($value);
 
-                    case "date":
-                        $value = date("Y-m-d", strtotime($value));
-                        $value = "'" . $value . "'";
-                        break;
-                    
-                    case "datetime":
-                        $value = date("Y-m-d H:i:s", strtotime($value));
-                        $value = "'" . $value . "'";
-                        break;
+                $null_present = strpos(strtoupper($value), "NULL") >= 0;
 
-                    case "bool":
-                    case "boolean":
-                        $value = (int) $value;
-                        break;
+                if (!$null_present)
+                {
+                    $value = $this->_parseStringValue($value);
+                    if ($value === false)
+                    {
+                        $will_condition_apply = false;
+                    }
                 }
             break;
 
-            case "boolean":
-            case "integer":
-                $value = (int) $value;
-            break;
+            
 
             case "array":
-                $value = "(" . implode(",", $value) . ")";
-                $operator = "IN";
+                if (empty($value))
+                {
+                    $will_condition_apply = false;
+                    break;
+                }
+
+                $arr = $value;
+
+                foreach($arr as $k => $v)
+                {
+                    switch(gettype($v))
+                    {
+                        case "integer":
+                        case "float":                
+                            break;
+                
+                        case "string":
+                            $arr[$k] = $v = $this->_parseStringValue($v);
+                            if ($v === false)
+                            {
+                                unset($arr[$k]);
+                            }
+                        break;
+                    }
+                }
+
+                $value = "(" . implode(",", $arr) . ")";
             break;
 
             case "NULL":
@@ -87,14 +110,49 @@ public function add(String $field, $value, String $operator = "=", String $value
                 throw new \Exception("Query Builder : Un-Supported value type :" . gettype($value) );
         }
 
-        $this->fields[] = array(
-            "field" => trim($field),
-            "value" => $value,
-            "op" => trim($operator)
-        );
+        if ($will_condition_apply)
+        {
+            $this->fields[] = array(
+                "field" => trim($field),
+                "value" => $value,
+                "op" => trim($operator)
+            );
+        }
 
         return $this;
     }
+
+    private function _parseStringValue($value, $value_type = "string")
+    {
+        if (is_string($value) && strlen($value) > 0)
+        {
+            switch($value_type)
+            {
+                case "string":
+                    $value = "'" . $value . "'";
+                    break;
+
+                case "date":
+                    $value = date("Y-m-d", strtotime($value));
+                    $value = "'" . $value . "'";
+                    break;
+                
+                case "datetime":
+                    $value = date("Y-m-d H:i:s", strtotime($value));
+                    $value = "'" . $value . "'";
+                    break;
+
+                case "bool":
+                case "boolean":
+                    $value = (int) $value;
+                    break;
+            }
+
+            return $value;
+        }
+
+        return false;
+    }
 
     /**
      * @param Array $arr 

test.php

@@ -27,6 +27,8 @@
                 Where::init("OR")
                 ->add("P.id", NULL, "", "")
                 ->add("O.id", NULL, "", "")
+                ->add("O.id", "IS NOT NULL", "", "")
+                ->add("O.id", ["a", 1], "NOT IN", "")
         )
 );