some testing

2 files changed, 8 insertions, 6 deletions

diff --git a/modules/database/classes/driver/mysql/db.php b/modules/database/classes/driver/mysql/db.php
index ab0a3bb..f53d618 100644
--- a/modules/database/classes/driver/mysql/db.php
+++ b/modules/database/classes/driver/mysql/db.php
@@ -42,12 +42,15 @@ class DB_Mysql_Driver extends DB{
      * 

 	 * @param string $table Name of the table to get columns from

      * @return array Array of column names

+	 * @throw Exception if table doesn't exist

      * @access public 

      */

 	public function list_columns($table) {

 		$columns=array();

 		$table_desc = $this->execute("DESCRIBE `$table`");

-		

+		Debug::log($table_desc);

+		if (!$table_desc->valid())

+			throw new Exception("Table '{$table}' doesn't exist");

 		foreach($table_desc as $column)

 			$columns[] = $column->Field;

 			

@@ -105,9 +108,7 @@ class DB_Mysql_Driver extends DB{
 		}

 		$cursor->execute();

 		$res = $cursor->get_result();

-		if (is_object($res)){

-			$res=new Result_Mysql_Driver($res);

-		}

-		return $res;

+		return new Result_Mysql_Driver($res);

+

 	}

 }
\ No newline at end of file
diff --git a/modules/database/classes/driver/mysql/result.php b/modules/database/classes/driver/mysql/result.php
index a461c81..f058a97 100644
--- a/modules/database/classes/driver/mysql/result.php
+++ b/modules/database/classes/driver/mysql/result.php
@@ -16,7 +16,8 @@ class Result_Mysql_Driver extends Result_Database {
      */

 	public function __construct($result) {

 		$this->_result = $result;

-		$this->_row=$this->_result->fetch_object();

+		if(!empty($result))

+			$this->_row=$this->_result->fetch_object();

 	}

 

     /**