diff --git a/lib/sqlparser/sqlparser.class.php b/lib/sqlparser/sqlparser.class.php
index c91cbfe9a8..16381c190a 100644
--- a/lib/sqlparser/sqlparser.class.php
+++ b/lib/sqlparser/sqlparser.class.php
@@ -314,31 +314,17 @@ class sqlparser
     }
 
     /**
-     * and condition.
+     * operatorCondition
      *
+     * @param  string $type
      * @access public
-     * @return object
+     * @return void
      */
-    public function andCondition()
+    public function operatorCondition($type)
     {
         $condition = new PhpMyAdmin\SqlParser\Components\Condition();
         $condition->isOperator = true;
-        $condition->expr       = 'AND';
-
-        return $condition;
-    }
-
-    /**
-     * or condition.
-     *
-     * @access public
-     * @return object
-     */
-    public function orCondition()
-    {
-        $condition = new PhpMyAdmin\SqlParser\Components\Condition();
-        $condition->isOperator = true;
-        $condition->expr       = 'OR';
+        $condition->expr       = strtoupper($type);
 
         return $condition;
     }