From 757af550b3502cb4aef1f3f3f0be209df5c53996 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 29 Jan 2010 23:49:53 +0100 Subject: [PATCH] Tweak DB API usage. --- nag/lib/Driver/Sql.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nag/lib/Driver/Sql.php b/nag/lib/Driver/Sql.php index aa66f6005..6d7985d31 100644 --- a/nag/lib/Driver/Sql.php +++ b/nag/lib/Driver/Sql.php @@ -517,15 +517,18 @@ class Nag_Driver_Sql extends Nag_Driver { __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Run the query. */ - $qr = $this->_db->getAll($q, $values, DB_FETCHMODE_ASSOC); - if (is_a($qr, 'PEAR_Error')) { - return $qr; + $result = $this->_db->query($q, $values); + if (is_a($result, 'PEAR_Error')) { + return $result; } - $tasks = array(); - foreach ($qr as $row) { + while ($row = $result->fetchRow(DB_FETCHMODE_ASSOC)) { + if (is_a($row, 'PEAR_Error')) { + return $row; + } $tasks[$row['task_id']] = new Nag_Task($this->_buildTask($row)); } + return $tasks; } -- 2.11.0