Refactored Table.class.php.

Updated sql-parser library to phpmyadmin/sql-parser@b3eff80. Fixed failing test. Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
phpmyadmin · Jul 10, 2015 · 889b49e · 889b49e
1 parent c8993af
commit 889b49e
Show file tree

Hide file tree

Showing 30 changed files with 996 additions and 617 deletions.
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
@@ -3344,12 +3344,17 @@ private function _getUrlSqlQuery($analyzed_sql_results)
         }
 
         $query = 'SELECT ' . SqlParser\Utils\Query::getClause(
-            $parser->statements[0], $parser->list, 'SELECT'
+            $analyzed_sql_results['statement'],
+            $analyzed_sql_results['parser']->list,
+            'SELECT'
         );
 
         $from_clause = SqlParser\Utils\Query::getClause(
-            $parser->statements[0], $parser->list, 'FROM'
+            $analyzed_sql_results['statement'],
+            $analyzed_sql_results['parser']->list,
+            'FROM'
         );
+
         if (!empty($from_clause)) {
             $query .= ' FROM ' . $from_clause;
         }
@@ -4345,7 +4350,7 @@ public function getTable(
 
         }
 
-        if (($displayParts['nav_bar'] == '1') && (empty($statemet->limit))) {
+        if (($displayParts['nav_bar'] == '1') && (empty($statement->limit))) {
             $table_html .= $this->_getPlacedTableNavigations(
                 $pos_next, $pos_prev, self::PLACE_TOP_DIRECTION_DROPDOWN,
                 $is_innodb