From 959644445d84189d3b58f343c3635634c473ca58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 6 Aug 2013 12:04:00 +0200
Subject: PMA_Util::formatSql now requires unparsed query as well

In most cases we just need to output it as is, formatting is done in
javascript.
---
 libraries/Util.class.php                     |  2 +-
 tbl_tracking.php                             |  4 ++--
 test/libraries/common/PMA_formatSql_test.php | 17 +----------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index b7e8297b0d..b0b04693c6 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -396,7 +396,7 @@ class PMA_Util
      * @access  public
      * @todo    move into PMA_Sql
      */
-    public static function formatSql($parsed_sql, $unparsed_sql = '')
+    public static function formatSql($parsed_sql, $unparsed_sql)
     {
         global $cfg;
 
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 27304f6ec4..81b82b4997 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -568,7 +568,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
                     $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
                 ) . '[...]';
             } else {
-                $statement  = PMA_Util::formatSql(PMA_SQP_parse($entry['statement']));
+                $statement  = PMA_Util::formatSql(PMA_SQP_parse($entry['statement']), $entry['statement']);
             }
             $timestamp = strtotime($entry['date']);
 
@@ -635,7 +635,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
                     $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
                 ) . '[...]';
             } else {
-                $statement  = PMA_Util::formatSql(PMA_SQP_parse($entry['statement']));
+                $statement  = PMA_Util::formatSql(PMA_SQP_parse($entry['statement']), $entry['statement']);
             }
             $timestamp = strtotime($entry['date']);
 
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php
index c385ddcc0a..43fb2b8d77 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -303,11 +303,6 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             $expected, PMA_Util::formatSql($sql, $unparsed)
         );
-
-        $expected = "SELECT 1;";
-        $this->assertEquals(
-            $expected, PMA_Util::formatSql($sql)
-        );
     }
 
     function testFormatSQLfmTypeNone_2()
@@ -358,11 +353,6 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             $expected, PMA_Util::formatSql($sql, $unparsed)
         );
-
-        $expected = "SELECT * from `tTable`;";
-        $this->assertEquals(
-            $expected, PMA_Util::formatSql($sql)
-        );
     }
 
     function testFormatSQLfmTypeNone_3()
@@ -500,11 +490,6 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             $expected, PMA_Util::formatSql($sql, $unparsed)
         );
-
-        $expected = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;';
-        $this->assertEquals(
-            $expected, PMA_Util::formatSql($sql)
-        );
     }
 
     function testFormatSQLError()
@@ -514,7 +499,7 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
         $sql = array("raw" => "& \" < >");
         $this->assertEquals(
             "&amp; &quot; &lt; &gt;",
-            PMA_Util::formatSql($sql)
+            PMA_Util::formatSql($sql, "& \" < >")
         );
         $SQP_errorString = false;
     }
-- 
cgit v1.2.3