Merge pull request #106 from alpha0010/master

Add setSelect() and getSelect() to modify select fields

Author: oohnoitz

.travis.yml

@@ -25,7 +25,8 @@ matrix:
 before_install:
   - mkdir $HOME/sphinx
   - pushd $HOME/sphinx
-  - wget --quiet http://ppa.launchpad.net/builds/sphinxsearch-${SPHINXSEARCH_BUILD}/ubuntu/dists/`lsb_release -cs`/main/binary-amd64/Packages
+  - wget --quiet http://ppa.launchpad.net/builds/sphinxsearch-${SPHINXSEARCH_BUILD}/ubuntu/dists/`lsb_release -cs`/main/binary-amd64/Packages.gz
+  - gzip -d Packages.gz
   - SPHINX_DEB=`grep -m1 Filename Packages | cut -f2 -d' '`
   - wget --quiet -O sphinxsearch.deb http://ppa.launchpad.net/builds/sphinxsearch-${SPHINXSEARCH_BUILD}/ubuntu/${SPHINX_DEB}
   - dpkg -x sphinxsearch.deb .

src/SphinxQL.php

@@ -813,6 +813,37 @@ public function select($columns = null)
         return $this;
     }
 
+    /**
+     * Alters which arguments to select
+     *
+     * Query is assumed to be in SELECT mode
+     * See select() for usage
+     *
+     * @param array|string $columns Array or multiple string arguments containing column names
+     *
+     * @return SphinxQL
+     */
+    public function setSelect($columns = null)
+    {
+        if (is_array($columns)) {
+            $this->select = $columns;
+        } else {
+            $this->select = \func_get_args();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the columns staged to select
+     *
+     * @return array
+     */
+    public function getSelect()
+    {
+        return $this->select;
+    }
+
     /**
      * Activates the INSERT mode
      *

tests/SphinxQL/SphinxQLTest.php

@@ -924,6 +924,56 @@ public function testSubselect()
         $this->assertEquals('10', $result[0]['id']);
     }
 
+    /**
+     * @covers \Foolz\SphinxQL\SphinxQL::setSelect
+     */
+    public function testSetSelect()
+    {
+        $this->refill();
+        $q1 = SphinxQL::create(self::$conn)
+            ->select(array('id', 'gid'))
+            ->from('rt');
+        $q2 = clone $q1;
+        $q2->setSelect(array('id'));
+        $result = $q1
+            ->execute()
+            ->getStored();
+        $this->assertArrayHasKey('id', $result[0]);
+        $this->assertArrayHasKey('gid', $result[0]);
+        $result = $q2
+            ->execute()
+            ->getStored();
+        $this->assertArrayHasKey('id', $result[0]);
+        $this->assertArrayNotHasKey('gid', $result[0]);
+
+        $q1 = SphinxQL::create(self::$conn)
+            ->select('id', 'gid')
+            ->from('rt');
+        $q2 = clone $q1;
+        $q2->setSelect('id');
+        $result = $q1
+            ->execute()
+            ->getStored();
+        $this->assertArrayHasKey('id', $result[0]);
+        $this->assertArrayHasKey('gid', $result[0]);
+        $result = $q2
+            ->execute()
+            ->getStored();
+        $this->assertArrayHasKey('id', $result[0]);
+        $this->assertArrayNotHasKey('gid', $result[0]);
+    }
+
+    /**
+     * @covers \Foolz\SphinxQL\SphinxQL::getSelect
+     */
+    public function testGetSelect()
+    {
+        $query = SphinxQL::create(self::$conn)
+            ->select('id', 'gid')
+            ->from('rt');
+        $this->assertEquals(array('id', 'gid'), $query->getSelect());
+    }
+
     /**
      * @covers \Foolz\SphinxQL\SphinxQL::facet
      * @covers \Foolz\SphinxQL\SphinxQL::compileSelect