fixed warnings for array key lookups on explain

karlkeyton · Apr 10, 2014 · 1b36e74 · 1b36e74
1 parent 8fe0536
commit 1b36e74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/QueryExplain.php b/lib/QueryExplain.php
@@ -227,7 +227,7 @@ function result_as_table($result) {
         while ($row = $result->fetch_assoc()) {
             foreach ($row as $col_name => $value) {
                 $len = strlen($value);
-                if ($len > $sizes[$col_name]) {
+                if (array_key_exists($col_name, $sizes) and $len > $sizes[$col_name]) {
                     $sizes[$col_name] = $len;
                 }
 
@@ -237,10 +237,17 @@ function result_as_table($result) {
         }
 
         foreach ($columns as $col => $count) {
-            $len = strlen($col);
-            if ($len > $sizes[$col]) {
-                $sizes[$col] = $len;
+            $len = strlen($col) + 0;
+            if (array_key_exists($col, $sizes))
+	    {
+		if ( $len > $sizes[$col]) {
+			$sizes[$col] = $len;
+	        }
             }
+	    else
+	    {
+		$sizes[$col] = $len;
+	    }
         }
 
         $column_order = array_keys($columns);

diff --git a/lib/QueryTableParser.php b/lib/QueryTableParser.php
@@ -56,7 +56,7 @@ public function parse($query) {
 
                 if (preg_match("/\w+/", $table)) {
                     $table = str_replace('`', '', $table);
-                    $tables[$table]++;
+                    $tables[$table]=1;
                 }
             }
         }
@@ -98,4 +98,4 @@ private function get_next_token() {
 
 }
 
-?>
+?>