Merge pull request #67 from alpha0010/master

Remove unusable functions

Author: oohnoitz

README.md

@@ -386,8 +386,6 @@ $result = SphinxQL::create($this->conn)
 * `Helper::create($conn)->showStatus() => 'SHOW STATUS'`
 * `Helper::create($conn)->shotTables() => 'SHOW TABLES'`
 * `Helper::create($conn)->showVariables() => 'SHOW VARIABLES'`
-* `Helper::create($conn)->showSessionVariables() => 'SHOW SESSION VARIABLES'`
-* `Helper::create($conn)->showGlobalVariables() => 'SHOW GLOBAL VARIABLES'`
 * `Helper::create($conn)->setVariable($name, $value, $global = false)`
 * `Helper::create($conn)->callSnippets($data, $index, $query, $options = array())`
 * `Helper::create($conn)->callKeywords($text, $index, $hits = null)`

src/Helper.php

@@ -130,26 +130,6 @@ public function showVariables()
         return $this->query('SHOW VARIABLES');
     }
 
-    /**
-     * Runs query: SHOW SESSION VARIABLES
-     *
-     * @return SphinxQL A SphinxQL object ready to be ->execute();
-     */
-    public function showSessionVariables()
-    {
-        return $this->query('SHOW SESSION VARIABLES');
-    }
-
-    /**
-     * Runs query: SHOW GLOBAL VARIABLES
-     *
-     * @return SphinxQL
-     */
-    public function showGlobalVariables()
-    {
-        return $this->query('SHOW GLOBAL VARIABLES');
-    }
-
     /**
      * SET syntax
      *

src/SphinxQL.php

@@ -483,28 +483,10 @@ public function compileWhere()
         }
 
         if (!empty($this->where)) {
-            $just_opened = false;
-
             foreach ($this->where as $key => $where) {
-                if (in_array($where['ext_operator'], array('AND (', 'OR (', ')'))) {
-                    // if match is not empty we've got to use an operator
-                    if ($key == 0 || ! empty($this->match)) {
-                        $query .= '(';
-
-                        $just_opened = true;
-                    } else {
-                        $query .= $where['ext_operator'].' ';
-                    }
-
-                    continue;
+                if ($key > 0 || !empty($this->match)) {
+                    $query .= 'AND ';
                 }
-
-                if ($key > 0 && !$just_opened || !empty($this->match)) {
-                    $query .= $where['ext_operator'].' '; // AND/OR
-                }
-
-                $just_opened = false;
-
                 $query .= $this->compileFilterCondition($where);
             }
         }
@@ -949,19 +931,17 @@ public function match($column, $value = null, $half = false)
      * @param string   $column   The column name
      * @param string   $operator The operator to use
      * @param string   $value    The value to check against
-     * @param boolean  $or      If it should be prepended with OR (true) or AND (false) - not available as for Sphinx 2.0.2
      *
      * @return SphinxQL
      */
-    public function where($column, $operator, $value = null, $or = false)
+    public function where($column, $operator, $value = null)
     {
         if ($value === null) {
             $value = $operator;
             $operator = '=';
         }
 
         $this->where[] = array(
-            'ext_operator' => $or ? 'OR' : 'AND',
             'column' => $column,
             'operator' => $operator,
             'value' => $value
@@ -970,58 +950,6 @@ public function where($column, $operator, $value = null, $or = false)
         return $this;
     }
 
-    /**
-     * OR WHERE - at this time (Sphinx 2.0.2) it's not available
-     *
-     * @param string $column    The column name
-     * @param string $operator  The operator to use
-     * @param mixed   $value     The value to compare against
-     *
-     * @return SphinxQL
-     */
-    public function orWhere($column, $operator, $value = null)
-    {
-        $this->where($column, $operator, $value, true);
-
-        return $this;
-    }
-
-    /**
-     * Opens a parenthesis prepended with AND (where necessary)
-     *
-     * @return SphinxQL
-     */
-    public function whereOpen()
-    {
-        $this->where[] = array('ext_operator' => 'AND (');
-
-        return $this;
-    }
-
-    /**
-     * Opens a parenthesis prepended with OR (where necessary)
-     *
-     * @return SphinxQL
-     */
-    public function orWhereOpen()
-    {
-        $this->where[] = array('ext_operator' => 'OR (');
-
-        return $this;
-    }
-
-    /**
-     * Closes a parenthesis in WHERE
-     *
-     * @return SphinxQL
-     */
-    public function whereClose()
-    {
-        $this->where[] = array('ext_operator' => ')');
-
-        return $this;
-    }
-
     /**
      * GROUP BY clause
      * Adds to the previously added columns

tests/SphinxQL/SphinxQLTest.php

@@ -375,6 +375,24 @@ public function testWhere()
             ->getStored();
 
         $this->assertCount(6, $result);
+
+        $result = SphinxQL::create(self::$conn)->select()
+            ->from('rt')
+            ->where('gid', '>', 300)
+            ->where('id', '!=', 15)
+            ->execute()
+            ->getStored();
+
+        $this->assertCount(5, $result);
+
+        $result = SphinxQL::create(self::$conn)->select()
+            ->from('rt')
+            ->match('content', 'content')
+            ->where('gid', '>', 200)
+            ->execute()
+            ->getStored();
+
+        $this->assertCount(1, $result);
     }
 
     /**