Commit 01f2ee7f authored by jepso's avatar jepso

fixed search tests that were broken by changeset 3187

parent d645b165
...@@ -183,7 +183,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -183,7 +183,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'FROM search_test_index ' . 'FROM search_test_index '
. 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
} }
...@@ -197,11 +197,11 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -197,11 +197,11 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
$sql = 'SELECT COUNT(keyword) AS relevance, id ' $sql = 'SELECT COUNT(keyword) AS relevance, id '
. 'FROM search_test_index ' . 'FROM search_test_index '
. 'WHERE keyword = ? OR keyword = ? ' . 'WHERE keyword = ? OR keyword = ? '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
} }
public function testQuerySupportsSingleWordquery() public function testQuerySupportsSingleWordquery()
{ {
...@@ -209,9 +209,9 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -209,9 +209,9 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
$q->query('doctrine'); $q->query('doctrine');
$sql = 'SELECT COUNT(keyword) AS relevance, id ' $sql = 'SELECT COUNT(keyword) AS relevance, id '
. 'FROM search_test_index WHERE keyword = ? GROUP BY id ORDER BY relevance'; . 'FROM search_test_index WHERE keyword = ? GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doctrine')); $this->assertEqual($q->getParams(), array('doctrine'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
} }
...@@ -224,7 +224,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -224,7 +224,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'FROM search_test_index ' . 'FROM search_test_index '
. 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) ' . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) '
. 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doctrine', 'orm', 'dbal')); $this->assertEqual($q->getParams(), array('doctrine', 'orm', 'dbal'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
...@@ -238,7 +238,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -238,7 +238,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
$sql = 'SELECT COUNT(keyword) AS relevance, id ' $sql = 'SELECT COUNT(keyword) AS relevance, id '
. 'FROM search_test_index WHERE keyword = ? ' . 'FROM search_test_index WHERE keyword = ? '
. 'AND (position + 1) = (SELECT position FROM search_test_index WHERE keyword = ?) ' . 'AND (position + 1) = (SELECT position FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doctrine', 'orm')); $this->assertEqual($q->getParams(), array('doctrine', 'orm'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
...@@ -253,7 +253,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -253,7 +253,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'FROM search_test_index WHERE keyword = ? ' . 'FROM search_test_index WHERE keyword = ? '
. 'AND (position + 1) = (SELECT position FROM search_test_index WHERE keyword = ?) ' . 'AND (position + 1) = (SELECT position FROM search_test_index WHERE keyword = ?) '
. 'AND (position + 2) = (SELECT position FROM search_test_index WHERE keyword = ?) ' . 'AND (position + 2) = (SELECT position FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doctrine', 'orm', 'dbal')); $this->assertEqual($q->getParams(), array('doctrine', 'orm', 'dbal'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
...@@ -268,7 +268,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -268,7 +268,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'FROM search_test_index ' . 'FROM search_test_index '
. 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
} }
...@@ -282,7 +282,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -282,7 +282,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'FROM search_test_index ' . 'FROM search_test_index '
. 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword LIKE ?) ' . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword LIKE ?) '
. 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doct?ine', 'orm')); $this->assertEqual($q->getParams(), array('doct?ine', 'orm'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
...@@ -296,7 +296,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -296,7 +296,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'FROM search_test_index ' . 'FROM search_test_index '
. 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword LIKE ?) ' . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword LIKE ?) '
. 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doc%', 'orm')); $this->assertEqual($q->getParams(), array('doc%', 'orm'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
...@@ -311,7 +311,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -311,7 +311,7 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
. 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) ' . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
. 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ? ' . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ? '
. 'AND (position + 1) = (SELECT position FROM search_test_index WHERE keyword = ?)) ' . 'AND (position + 1) = (SELECT position FROM search_test_index WHERE keyword = ?)) '
. 'GROUP BY id ORDER BY relevance'; . 'GROUP BY id ORDER BY relevance DESC';
$this->assertEqual($q->getParams(), array('doctrine', 'orm', 'database')); $this->assertEqual($q->getParams(), array('doctrine', 'orm', 'database'));
$this->assertEqual($q->getSql(), $sql); $this->assertEqual($q->getSql(), $sql);
...@@ -325,4 +325,4 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase ...@@ -325,4 +325,4 @@ class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
$this->assertFalse($result); $this->assertFalse($result);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment