From 6612e4c1ae79c2bc3a5cd08e1594fc152107618e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:34:39 +0200
Subject: [PATCH] SimpleQuery: Make compare() alias aware
refs #8826
refs #7693
---
library/Icinga/Data/SimpleQuery.php | 64 +++++++++++++++++++----------
1 file changed, 42 insertions(+), 22 deletions(-)
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index a069e03cd..1507ba589 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -43,6 +43,15 @@ class SimpleQuery implements QueryInterface
*/
protected $columns = array();
+ /**
+ * The columns and their aliases flipped in order to handle aliased sort columns
+ *
+ * Supposed to be used and populated by $this->compare *only*.
+ *
+ * @var array
+ */
+ protected $flippedColumns;
+
/**
* The columns you're using to sort the query result
*
@@ -219,32 +228,42 @@ class SimpleQuery implements QueryInterface
return $this;
}
- public function compare($a, $b, $col_num = 0)
+ /**
+ * Compare $a with $b based on this query's sort rules and column aliases
+ *
+ * @param object $a
+ * @param object $b
+ * @param int $orderIndex
+ *
+ * @return int
+ */
+ public function compare($a, $b, $orderIndex = 0)
{
- // Last column to sort reached, rows are considered being equal
- if (! array_key_exists($col_num, $this->order)) {
- return 0;
- }
- $col = $this->order[$col_num][0];
- $dir = $this->order[$col_num][1];
-// TODO: throw Exception if column is missing
- //$res = strnatcmp(strtolower($a->$col), strtolower($b->$col));
- $res = @strcmp(strtolower($a->$col), strtolower($b->$col));
- if ($res === 0) {
-// return $this->compare($a, $b, $col_num++);
-
- if (array_key_exists(++$col_num, $this->order)) {
- return $this->compare($a, $b, $col_num);
- } else {
- return 0;
- }
-
+ if (! array_key_exists($orderIndex, $this->order)) {
+ return 0; // Last column to sort reached, rows are considered being equal
}
- if ($dir === self::SORT_ASC) {
- return $res;
+ if ($this->flippedColumns === null) {
+ $this->flippedColumns = array_flip($this->columns);
+ }
+
+ $column = $this->order[$orderIndex][0];
+ if (array_key_exists($column, $this->flippedColumns)) {
+ $column = $this->flippedColumns[$column];
+ }
+
+ // TODO: throw Exception if column is missing
+ //$res = strnatcmp(strtolower($a->$column), strtolower($b->$column));
+ $result = @strcmp(strtolower($a->$column), strtolower($b->$column));
+ if ($result === 0) {
+ return $this->compare($a, $b, $orderIndex);
+ }
+
+ $direction = $this->order[$orderIndex][1];
+ if ($direction === self::SORT_ASC) {
+ return $result;
} else {
- return $res * -1;
+ return $result * -1;
}
}
@@ -426,6 +445,7 @@ class SimpleQuery implements QueryInterface
public function columns(array $columns)
{
$this->columns = $columns;
+ $this->flippedColumns = null; // Reset, due to updated columns
return $this;
}