Updated SQL Builder so that Where() method does not need the operator…

… (i.e. '=' is the default).
phpopenfw · Jan 30, 2019 · db1f077 · db1f077
1 parent f843f04
commit db1f077
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/plugins/Builders/SQL/Statements/Traits/Conditions.php b/src/plugins/Builders/SQL/Statements/Traits/Conditions.php
@@ -27,7 +27,7 @@ trait Conditions
 	// Add Condition Method
     //=========================================================================
     //=========================================================================
-	protected function AddCondition(&$conditions, $field, $op, $val, $type, $andor='and')
+	protected function AddCondition(&$conditions, $field, $op, $val, $type='s', $andor='and')
 	{
         //-----------------------------------------------------------------
         // Validate Parameters

diff --git a/src/plugins/Builders/SQL/Statements/Traits/Where.php b/src/plugins/Builders/SQL/Statements/Traits/Where.php
@@ -37,6 +37,25 @@ trait Where
     //=========================================================================
 	public function Where($field, $op=null, $val=false, $type='s', $andor='and')
 	{
+    	if ($op && !self::IsValidOperator($op)) {
+        	$invalid_op = true;
+        	if (is_scalar($op) || is_array($op)) {
+            	$invalid_op = false;
+            	if ($type && in_array($type, ['and', 'or'])) {
+                	$andor = $type;
+            	}
+            	if ($val && in_array($val, ['i', 's', 'd', 'b'])) {
+                	$type = $val;
+            	}
+            	$val = $op;
+            	$op = '=';
+        	}
+
+        	if ($invalid_op) {
+            	throw new \Exception('Invalid operator given.');
+            	return;
+        	}
+        }
         $this->AddCondition($this->wheres, $field, $op, $val, $type, $andor);
         return $this;
 	}