Manage query errors better

Author: kormoc

explain.php

@@ -40,19 +40,24 @@
 		Database::find($label)->disable_fatal_errors();
 		$query = Database::find($label)->query($sample);
 		Database::find($label)->enable_fatal_errors();
-		
-		while ($row = $query->fetch_assoc()) {
-			$row['possible_keys'] = str_replace(',', ', ', $row['possible_keys']);
-			$row['ref'] = str_replace(',', ', ', $row['ref']);
-			$row['Extra'] = str_replace(array('Using ', ';'), array('', ', '), $row['Extra']);
-			foreach ($row as $key => $val) {
-				if (is_null($row[$key]))
-					$row[$key] = '';
-				$row[$key] = htmlentities($row[$key]);
-			}
-					
-			$return['Explain'][] = $row;
-		}
+        
+        if (is_null($query)) {
+            $return['Warnings'][] = array('Code' => Database::find($label)->_errno(), 'Level' => 'Error', 'Message' => Database::find($label)->_errstr());
+        }
+        else {
+            while ($row = $query->fetch_assoc()) {
+                $row['possible_keys'] = str_replace(',', ', ', $row['possible_keys']);
+                $row['ref'] = str_replace(',', ', ', $row['ref']);
+                $row['Extra'] = str_replace(array('Using ', ';'), array('', ', '), $row['Extra']);
+                foreach ($row as $key => $val) {
+                    if (is_null($row[$key]))
+                        $row[$key] = '';
+                    $row[$key] = htmlentities($row[$key]);
+                }
+                        
+                $return['Explain'][] = $row;
+            }
+        }
 		$query = Database::find($label)->query('SHOW WARNINGS');
 		while ($row = $query->fetch_assoc()) {
 			if ($row['Code'] == 1003)