diff options
Diffstat (limited to 'kohana/libraries/drivers/Database')
| -rw-r--r-- | kohana/libraries/drivers/Database/Mysql.php | 2 | ||||
| -rw-r--r-- | kohana/libraries/drivers/Database/Mysqli.php | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/kohana/libraries/drivers/Database/Mysql.php b/kohana/libraries/drivers/Database/Mysql.php index c24dfec3..f54b6d81 100644 --- a/kohana/libraries/drivers/Database/Mysql.php +++ b/kohana/libraries/drivers/Database/Mysql.php @@ -325,7 +325,7 @@ class Database_Mysql_Driver extends Database_Driver { if ($query = mysql_query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link)) { - if (mysql_num_rows($query) > 0) + if (mysql_num_rows($query)) { while ($row = mysql_fetch_object($query)) { diff --git a/kohana/libraries/drivers/Database/Mysqli.php b/kohana/libraries/drivers/Database/Mysqli.php index 206d42f2..795c576b 100644 --- a/kohana/libraries/drivers/Database/Mysqli.php +++ b/kohana/libraries/drivers/Database/Mysqli.php @@ -114,15 +114,18 @@ class Database_Mysqli_Driver extends Database_Mysql_Driver { public function field_data($table) { - $query = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table)); + $columns = array(); + $query = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table)); - $table = array(); - while ($row = $query->fetch_object()) + if (is_object($query)) { - $table[] = $row; + while ($row = $query->fetch_object()) + { + $columns[] = $row; + } } - return $table; + return $columns; } } // End Database_Mysqli_Driver Class |