From 89a7c8ac735ce0b52f8d697bb6f45606e14d92c4 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 17 May 2007 21:02:26 +0000
Subject: [PATCH]

---
 dibi/drivers/mssql.php  | 7 +++++--
 dibi/libs/resultset.php | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 0f8385c4..199d62fe 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @version  $Revision: 43 $ $Date: 2007-05-12 00:25:32 +0200 (so, 12 V 2007) $
+ * @version  $Revision$ $Date$
  * @package  dibi
  */
 
@@ -123,7 +123,10 @@ class DibiMSSqlDriver extends DibiDriver
 
     public function errorInfo()
     {
-        return FALSE;
+        return array(
+            'message'  => NULL,
+            'code'     => NULL,
+        );
     }
 
 
diff --git a/dibi/libs/resultset.php b/dibi/libs/resultset.php
index 9087e28d..b561fbe6 100644
--- a/dibi/libs/resultset.php
+++ b/dibi/libs/resultset.php
@@ -246,6 +246,7 @@ abstract class DibiResult implements IteratorAggregate, Countable
     {
         @$this->seek(0);
         $rec = $this->fetch();
+        if (!$rec) return array();  // empty resultset
 
         if ($value === NULL) {
             $tmp = array_keys($rec);
@@ -256,8 +257,6 @@ abstract class DibiResult implements IteratorAggregate, Countable
             if (!array_key_exists($value, $rec)) return FALSE;
         }
 
-        if (!$rec) return array();  // empty resultset
-
         $arr = array();
         do {
             $arr[ $rec[$key] ] = $rec[$value];