summaryrefslogtreecommitdiff
path: root/modules/search
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-09-24 21:24:14 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-09-24 21:24:14 +0000
commit7b14675e08e9dd10e8a15eb939b57a12b40ae97e (patch)
treee74a6bde195a7b0478fdc3695ebaeefd17d33e10 /modules/search
parentb6d73970aeb8d1921bf5d880cacc7c05e16e7377 (diff)
downloadbrdo-7b14675e08e9dd10e8a15eb939b57a12b40ae97e.tar.gz
brdo-7b14675e08e9dd10e8a15eb939b57a12b40ae97e.tar.bz2
#890994 by Berdir: Entity query tests fail on PostgreSQL.
Diffstat (limited to 'modules/search')
-rw-r--r--modules/search/search.extender.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/search/search.extender.inc b/modules/search/search.extender.inc
index 1eae2caa6..6c0c7600b 100644
--- a/modules/search/search.extender.inc
+++ b/modules/search/search.extender.inc
@@ -415,10 +415,6 @@ class SearchQuery extends SelectQueryExtender {
// Add default score.
$this->addScore('i.relevance');
}
- if (count($this->getOrderBy()) == 0) {
- // Add default order.
- $this->orderBy('calculated_score', 'DESC');
- }
if (count($this->multiply)) {
// Add the total multiplicator as many times as requested to maintain
@@ -436,6 +432,11 @@ class SearchQuery extends SelectQueryExtender {
// Convert scores to an expression.
$this->addExpression('SUM(' . implode(' + ', $this->scores) . ')', 'calculated_score', $this->scoresArguments);
+ if (count($this->getOrderBy()) == 0) {
+ // Add default order after adding the expression.
+ $this->orderBy('calculated_score', 'DESC');
+ }
+
// Add tag and useful metadata.
$this
->addTag('search_' . $this->type)