Removed the old parser.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>

40 files changed, 0 insertions, 674 deletions

diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php
index 84dc7905f1..5b19bcadc3 100644
--- a/test/classes/PMA_DBQbe_test.php
+++ b/test/classes/PMA_DBQbe_test.php
@@ -16,7 +16,6 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Tracker.class.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 
 /**
  * Tests for PMA_DBQbe class
diff --git a/test/classes/PMA_TableSearch_test.php b/test/classes/PMA_TableSearch_test.php
index 725355bffc..96b89da7df 100644
--- a/test/classes/PMA_TableSearch_test.php
+++ b/test/classes/PMA_TableSearch_test.php
@@ -16,7 +16,6 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Tracker.class.php';
 require_once 'libraries/Types.class.php';
diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php
index 1bd637638c..f6eaed3758 100644
--- a/test/classes/PMA_Table_test.php
+++ b/test/classes/PMA_Table_test.php
@@ -10,7 +10,6 @@
  * Include to test.
  */
 require_once 'libraries/Table.class.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/mysql_charsets.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php
index 227ed15164..0b95e49b72 100644
--- a/test/classes/PMA_Theme_test.php
+++ b/test/classes/PMA_Theme_test.php
@@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/Theme_Manager.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/url_generating.lib.php';
 
 /**
diff --git a/test/classes/dbi/DBIDrizzle_test.php b/test/classes/dbi/DBIDrizzle_test.php
index 83d6c28fe6..66003c2624 100644
--- a/test/classes/dbi/DBIDrizzle_test.php
+++ b/test/classes/dbi/DBIDrizzle_test.php
@@ -32,7 +32,6 @@ function drizzle_version()
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/dbi/DBIMysql_test.php b/test/classes/dbi/DBIMysql_test.php
index 3bb9969d41..9183165a66 100644
--- a/test/classes/dbi/DBIMysql_test.php
+++ b/test/classes/dbi/DBIMysql_test.php
@@ -11,7 +11,6 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/dbi/DBIMysqli_test.php b/test/classes/dbi/DBIMysqli_test.php
index a9d0c7c889..e6fc7f3db5 100644
--- a/test/classes/dbi/DBIMysqli_test.php
+++ b/test/classes/dbi/DBIMysqli_test.php
@@ -11,7 +11,6 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php
index a646f8a3b8..dd68dc80c6 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/PMA_ExportSql_test.php
@@ -17,7 +17,6 @@ require_once 'libraries/mysql_charsets.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/transformations.lib.php';
 require_once 'libraries/Table.class.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/charset_conversion.lib.php';
 require_once 'export.php';
 /**
diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/PMA_ExportTexytext_test.php
index a7eb5c4524..eaaace230b 100644
--- a/test/classes/plugin/export/PMA_ExportTexytext_test.php
+++ b/test/classes/plugin/export/PMA_ExportTexytext_test.php
@@ -14,7 +14,6 @@ require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
 require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/transformations.lib.php';
 require_once 'export.php';
 /**
diff --git a/test/classes/plugin/transformations/Transformation_Plugins_test.php b/test/classes/plugin/transformations/Transformation_Plugins_test.php
index a764aa6155..eea5c67179 100644
--- a/test/classes/plugin/transformations/Transformation_Plugins_test.php
+++ b/test/classes/plugin/transformations/Transformation_Plugins_test.php
@@ -35,7 +35,6 @@ require_once 'libraries/plugins/transformations/output/'
     . 'Text_Plain_Imagelink.class.php';
 require_once 'libraries/plugins/transformations/output/'
     . 'Text_Plain_Sql.class.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/plugins/transformations/Text_Plain_Link.class.php';
 require_once 'libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php';
 require_once 'libraries/plugins/transformations/Text_Plain_Preappend.class.php';
diff --git a/test/classes/schema/Dia_Relation_Schema_test.php b/test/classes/schema/Dia_Relation_Schema_test.php
index b51c5c7c49..04754a6d42 100644
--- a/test/classes/schema/Dia_Relation_Schema_test.php
+++ b/test/classes/schema/Dia_Relation_Schema_test.php
@@ -11,7 +11,6 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/schema/Eps_Relation_Schema_test.php b/test/classes/schema/Eps_Relation_Schema_test.php
index 5b82256442..14daedd228 100644
--- a/test/classes/schema/Eps_Relation_Schema_test.php
+++ b/test/classes/schema/Eps_Relation_Schema_test.php
@@ -11,7 +11,6 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/schema/Pdf_Relation_Schema_test.php b/test/classes/schema/Pdf_Relation_Schema_test.php
index 7bb825de5a..3ad8485049 100644
--- a/test/classes/schema/Pdf_Relation_Schema_test.php
+++ b/test/classes/schema/Pdf_Relation_Schema_test.php
@@ -11,7 +11,6 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/Table.class.php';
diff --git a/test/classes/schema/Svg_Relation_Schema_test.php b/test/classes/schema/Svg_Relation_Schema_test.php
index c492584941..c630e04ee8 100644
--- a/test/classes/schema/Svg_Relation_Schema_test.php
+++ b/test/classes/schema/Svg_Relation_Schema_test.php
@@ -11,7 +11,6 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Index.class.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index 05950af671..b0742a8a42 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -6,7 +6,6 @@
  * @package PhpMyAdmin-test
  */
 
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/Util.class.php';
 /*
  * Include to test
diff --git a/test/libraries/PMA_SQL_parse_analyze_test.php b/test/libraries/PMA_SQL_parse_analyze_test.php
deleted file mode 100644
index ccff5fc9f3..0000000000
--- a/test/libraries/PMA_SQL_parse_analyze_test.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for correctness of SQL parser analyze data
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/Util.class.php';
-require_once 'libraries/sqlparser.lib.php';
-
-/**
- * PMA_SQLParserAnalyze_Test class
- *
- * this class is for testing sqlparser.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SQLParserAnalyze_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_SQP_getParserAnalyze
-     *
-     * @return void
-     */
-    public function testGetParserAnalyzeMap()
-    {
-        //select statement
-        $sql_query = "select * from PMA.PMAParse";
-        $db = "PMA";
-        $data = PMA_SQP_getParserAnalyzeMap($sql_query, $db);
-
-        $this->assertEquals(
-            array(
-                'type' => 'alpha_reservedWord',
-                'data' => 'select',
-                'pos' => 6,
-                'forbidden' => true,
-            ),
-            $data['parsed_sql'][0]
-        );
-        $this->assertEquals(
-            'select * from PMA.PMAParse',
-            $data['analyzed_sql'][0]['unsorted_query']
-        );
-
-        $this->assertTrue($data['is_select']);
-        $this->assertFalse($data['is_group']);
-        $this->assertFalse($data['is_show']);
-
-        //update statement
-        $sql_query = "UPDATE `11`.`pma_bookmark` SET `id` = '2' WHERE `pma_bookmark`.`id` = 1;";
-        $db = "PMA";
-        $data = PMA_SQP_getParserAnalyzeMap($sql_query, $db);
-
-        $this->assertEquals(
-            array(
-                'type' => 'alpha_reservedWord',
-                'data' => 'UPDATE',
-                'pos' => 6,
-                'forbidden' => true,
-            ),
-            $data['parsed_sql'][0]
-        );
-        $this->assertEquals(
-            $sql_query,
-            $data['analyzed_sql'][0]['unsorted_query']
-        );
-        $this->assertFalse($data['is_group']);
-        $this->assertFalse($data['is_show']);
-        $this->assertTrue($data['is_affected']);
-        $this->assertFalse($data['is_select']);
-    }
-}
-
-?>
diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php
deleted file mode 100644
index 41f321f597..0000000000
--- a/test/libraries/PMA_SQL_parser_data_test.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for correctness of SQL parser data
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/sqlparser.data.php';
-require_once 'libraries/sqlparser.lib.php';
-
-/**
- * PMA_SQLParser_Data_Test class
- *
- * this class is for testing sqlparser.data.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * assert Sorted values
-     *
-     * @param array $array Sorted values array
-     *
-     * @return null
-     */
-    private function _assertSorted($array)
-    {
-        $copy = $array;
-        sort($copy);
-        $difference = array_diff_assoc($array, $copy);
-        $this->assertEquals($difference, array());
-    }
-
-    /**
-     * assert Parser values
-     *
-     * @param string $name Parser Data key
-     *
-     * @return null
-     */
-    private function _assertParserData($name)
-    {
-        $this->_assertSorted($GLOBALS[$name]);
-    }
-
-
-    /**
-     * Test for PMA_SQPdata
-     *
-     * @return void
-     */
-    public function testData()
-    {
-        $data = PMA_SQP_getParserDataMap();
-        $this->_assertSorted($data['PMA_SQPdata_function_name']);
-        $this->_assertSorted($data['PMA_SQPdata_column_attrib']);
-        $this->_assertSorted($data['PMA_SQPdata_reserved_word']);
-        $this->_assertSorted($data['PMA_SQPdata_forbidden_word']);
-        $this->_assertSorted($data['PMA_SQPdata_column_type']);
-    }
-
-
-    /**
-     * Test for PMA_SQPdata_function_name
-     *
-     * @return void
-     */
-    public function testFunctionName()
-    {
-        $this->_assertParserData('PMA_SQPdata_function_name');
-    }
-
-
-    /**
-     * Test for PMA_SQPdata_column_attrib
-     *
-     * @return void
-     */
-    public function testColumnAttrib()
-    {
-        $this->_assertParserData('PMA_SQPdata_column_attrib');
-    }
-
-
-    /**
-     * Test for PMA_SQPdata_reserved_word
-     *
-     * @return void
-     */
-    public function testReservedWord()
-    {
-        $this->_assertParserData('PMA_SQPdata_reserved_word');
-    }
-
-
-    /**
-     * Test for PMA_SQPdata_forbidden_word
-     *
-     * @return void
-     */
-    public function testForbiddenWord()
-    {
-        $this->_assertParserData('PMA_SQPdata_forbidden_word');
-    }
-
-
-    /**
-     * Test for PMA_SQPdata_column_type
-     *
-     * @return void
-     */
-    public function testColumnType()
-    {
-        $this->_assertParserData('PMA_SQPdata_column_type');
-    }
-}
-
-?>
diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php
deleted file mode 100644
index 3cda3964c4..0000000000
--- a/test/libraries/PMA_SQL_parser_test.php
+++ /dev/null
@@ -1,435 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for correctness of SQL parser
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/sqlparser.lib.php';
-require_once 'libraries/sqlparser.data.php';
-require_once 'libraries/php-gettext/gettext.inc';
-require_once 'libraries/Message.class.php';
-require_once 'libraries/Util.class.php';
-require_once 'libraries/Theme.class.php';
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- * PMA_SQLParser_Test class
- *
- * this class is for testing sqlparser.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        if (function_exists('mb_internal_encoding')) {
-            mb_internal_encoding('utf-8');
-        }
-        $_SESSION['PMA_Theme'] = new PMA_Theme();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-    }
-
-    /**
-     * Testing of SQL parser.
-     *
-     * @param string $sql      SQL query to parse
-     * @param array  $expected Expected parse result
-     * @param string $error    Expected error message
-     *
-     * @return void
-     *
-     * @dataProvider parserData
-     * @group medium
-     */
-    public function testParser($sql, $expected, $error = '')
-    {
-        PMA_SQP_resetError();
-        $this->expectOutputString($error);
-        $parsed_sql = PMA_SQP_parse($sql);
-        $this->assertEquals('', PMA_SQP_getErrorString());
-        $this->assertEquals($expected, $parsed_sql);
-    }
-
-    /**
-     * Test for PMA_SQP_isKeyWord
-     *
-     * @return void
-     */
-    public function testPmaSqpIsKeyWord()
-    {
-        PMA_SQP_resetError();
-        $this->assertTrue(PMA_SQP_isKeyWord("ACCESSIBLE"));
-        $this->assertTrue(PMA_SQP_isKeyWord("accessible"));
-        $this->assertTrue(PMA_SQP_isKeyWord("ASC"));
-        $this->assertFalse(PMA_SQP_isKeyWord("hello"));
-    }
-
-    /**
-     * Test PMA_SQP_typeCheck
-     *
-     * @return void
-     */
-    public function testPmaSqpTypeCheck()
-    {
-        $this->assertTrue(
-            PMA_SQP_typeCheck("VARCHAR", "VARCHAR")
-        );
-
-        $this->assertFalse(
-            PMA_SQP_typeCheck("VARCHAR", "VARCHAR_INT")
-        );
-
-        $this->assertTrue(
-            PMA_SQP_typeCheck("VARCHAR_INT", "VARCHAR")
-        );
-
-        $this->assertFalse(
-            PMA_SQP_typeCheck("TIME_INT", "VARCHAR")
-        );
-    }
-
-    /**
-     * Test PMA_SQP_throwError
-     *
-     * @return void
-     */
-    public function testPmaSqpThrowError()
-    {
-        global $SQP_errorString;
-        $message = "error from testPMA_SQP_throwError";
-        $sql = "select * from PMA.PMABookmark";
-        PMA_SQP_throwError($message, $sql);
-
-        $this->assertContains(
-            "There seems to be an error in your SQL query.",
-            $SQP_errorString
-        );
-
-        $this->assertContains(
-            'ERROR: ' . $message,
-            $SQP_errorString
-        );
-
-        $this->assertContains(
-            'SQL: ' . htmlspecialchars($sql),
-            $SQP_errorString
-        );
-    }
-
-    /**
-     * Data provider for parser testing
-     *
-     * @return array with test data
-     */
-    public function parserData()
-    {
-        return array(
-            array(
-                'SELECT 1;',
-                array(
-                    'raw' => 'SELECT 1;',
-                    0 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'SELECT',
-                        'pos' => 6,
-                        'forbidden' => true,
-                    ),
-                    1 => array(
-                        'type' => 'digit_integer',
-                        'data' => '1',
-                        'pos' => 8,
-                    ),
-                    2 => array(
-                        'type' => 'punct_queryend',
-                        'data' => ';',
-                        'pos' => 9,
-                    ),
-                    'len' => 3,
-                )
-            ),
-            array(
-                'SELECT * from aaa;',
-                array(
-                    'raw' => 'SELECT * from aaa;',
-                    0 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'SELECT',
-                        'pos' => 6,
-                        'forbidden' => true,
-                    ),
-                    1 => array(
-                        'type' => 'punct',
-                        'data' => '*',
-                        'pos' => 8,
-                    ),
-                    2 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'from',
-                        'pos' => 13,
-                        'forbidden' => true,
-                    ),
-                    3 => array(
-                        'type' => 'alpha_identifier',
-                        'data' => 'aaa',
-                        'pos' => 17,
-                        'forbidden' => false,
-                    ),
-                    4 => array(
-                        'type' => 'punct_queryend',
-                        'data' => ';',
-                        'pos' => 18,
-                    ),
-                    'len' => 5,
-                )
-            ),
-            array(
-                'SELECT * from `aaa`;',
-                array(
-                    'raw' => 'SELECT * from `aaa`;',
-                    0 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'SELECT',
-                        'pos' => 6,
-                        'forbidden' => true,
-                    ),
-                    1 => array(
-                        'type' => 'punct',
-                        'data' => '*',
-                        'pos' => 8,
-                    ),
-                    2 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'from',
-                        'pos' => 13,
-                        'forbidden' => true,
-                    ),
-                    3 => array(
-                        'type' => 'quote_backtick',
-                        'data' => '`aaa`',
-                        'pos' => 19,
-                    ),
-                    4 => array(
-                        'type' => 'punct_queryend',
-                        'data' => ';',
-                        'pos' => 20,
-                    ),
-                    'len' => 5,
-                )
-            ),
-            array(
-                'SELECT * from `aaa;',
-                array(
-                    'raw' => 'SELECT * from `aaa`;',
-                    0 => array (
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'SELECT',
-                        'pos' => 6,
-                        'forbidden' => true,
-                    ),
-                    1 => array(
-                        'type' => 'punct',
-                        'data' => '*',
-                        'pos' => 8,
-                    ),
-                    2 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'from',
-                        'pos' => 13,
-                        'forbidden' => true,
-                    ),
-                    3 => array(
-                        'type' => 'quote_backtick',
-                        'data' => '`aaa`',
-                        'pos' => 19,
-                    ),
-                    4 => array(
-                        'type' => 'punct_queryend',
-                        'data' => ';',
-                        'pos' => 20,
-                    ),
-                    'len' => 5,
-                ),
-                '<div class="notice"><img src="theme/s_notice.png" '
-                . 'title="" alt="" /> Automatically appended '
-                . 'backtick to the end of query!</div>'
-            ),
-            array(
-                'SELECT * FROM `a_table` tbla INNER JOIN b_table` tblb ON '
-                . 'tblb.id = tbla.id WHERE tblb.field1 != tbla.field1`;',
-                array(
-                    'raw' => 'SELECT * FROM `a_table` tbla INNER JOIN '
-                        . 'b_table` tblb ON tblb.id = tbla.id WHERE '
-                        . 'tblb.field1 != tbla.field1`;',
-                    0 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'SELECT',
-                        'pos' => 6,
-                        'forbidden' => true,
-                    ),
-                    1 => array(
-                        'type' => 'punct',
-                        'data' => '*',
-                        'pos' => 8,
-                    ),
-                    2 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'FROM',
-                        'pos' => 13,
-                        'forbidden' => true,
-                    ),
-                    3 => array(
-                        'type' => 'quote_backtick',
-                        'data' => '`a_table`',
-                        'pos' => 23,
-                    ),
-                    4 => array(
-                        'type' => 'alpha_identifier',
-                        'data' => 'tbla',
-                        'pos' => 28,
-                        'forbidden' => false,
-                    ),
-                    5 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'INNER',
-                        'pos' => 34,
-                        'forbidden' => true,
-                    ),
-                    6 => array(
-                        'type' => 'alpha_reservedWord',
-                        'data' => 'JOIN',
-                        'pos' => 39,
-                        'forbidden' => true,
-                    ),
-                    7 => array(
-                        'type' => 'alpha_identifier',
-                        'data' => 'b_table',
-                        'pos' => 47,
-                        'forbidden' => false,
-                    ),
-                    8 => array(
-                        'type' => 'quote_backtick',
-                        'data' => '` tblb ON tblb.id = tbla.id WHERE '
-                            . 'tblb.field1 != tbla.field1`',
-                        'pos' => 108,
-                    ),
-                    9 => array(
-                        'type' => 'punct_queryend',
-                        'data' => ';',
-                        'pos' => 109,
-                    ),
-                    'len' => 10,
-                )
-            ),
-        );
-    }
-
-    /**
-     * Data provider for testPmaSqpGetAliasesFromQuery
-     *
-     * @return array with test data
-     */
-    public function aliasDataProvider()
-    {
-        return array(
-            array(
-                'select i.name as `n`,abcdef gh from qwerty i',
-                'mydb',
-                array(
-                    'mydb' => array(
-                        'alias' => null,
-                        'tables' => array(
-                            'qwerty' => array(
-                                'alias' => 'i',
-                                'columns' => array(
-                                    'name' => 'n',
-                                    'abcdef' => 'gh'
-                                )
-                            )
-                        )
-                    )
-                )
-            ),
-            array(
-                'select film_id id,title from film',
-                'sakila',
-                array(
-                    'sakila' => array(
-                        'alias' => null,
-                        'tables' => array(
-                            'film' => array(
-                                'alias' => null,
-                                'columns' => array(
-                                    'film_id' => 'id'
-                                )
-                            )
-                        )
-                    )
-                )
-            ),
-            array(
-                'select `sakila`.`A`.`actor_id` as aid,`F`.`film_id` `fid`,'
-                . 'last_update updated from `sakila`.actor A join `film_actor` as '
-                . '`F` on F.actor_id = A.`actor_id`',
-                'sakila',
-                array(
-                    'sakila' => array(
-                        'alias' => null,
-                        'tables' => array(
-                            'film_actor' => array(
-                                'alias' => 'F',
-                                'columns' => array(
-                                    'film_id' => 'fid',
-                                    'last_update' => 'updated'
-                                )
-                            ),
-                            'actor' => array(
-                                'alias'=> 'A',
-                                'columns' => array(
-                                    'actor_id' => 'aid',
-                                    'last_update' => 'updated'
-                                )
-                            )
-                        )
-                    )
-                )
-            ),
-            array(
-                '',
-                '',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Testing of PMA_SQP_getAliasesFromQuery.
-     *
-     * @param string $select_query The Select SQL Query
-     * @param string $db           Current DB
-     * @param array  $expected     Expected parse result
-     *
-     * @return void
-     *
-     * @dataProvider aliasDataProvider
-     * @group medium
-     */
-    public function testPmaSqpGetAliasesFromQuery($select_query, $db, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA_SQP_getAliasesFromQuery($select_query, $db)
-        );
-    }
-}
-?>
diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php
index 787cd2c7ca..d7b408256d 100644
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/libraries/PMA_central_columns_test.php
@@ -21,7 +21,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/Types.class.php';
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/central_columns.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 
 /**
  * tests for central_columns.lib.php
diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php
index 29df119e81..e1e84685d4 100644
--- a/test/libraries/PMA_display_export_test.php
+++ b/test/libraries/PMA_display_export_test.php
@@ -22,7 +22,6 @@ require_once 'libraries/charset_conversion.lib.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/plugin_interface.lib.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 
diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php
index 96472e08e2..055301a002 100644
--- a/test/libraries/PMA_import_test.php
+++ b/test/libraries/PMA_import_test.php
@@ -24,7 +24,6 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/url_generating.lib.php';
 
 /**
diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php
index ce5572569a..b6523117b2 100644
--- a/test/libraries/PMA_mult_submits_test.php
+++ b/test/libraries/PMA_mult_submits_test.php
@@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation_cleanup.lib.php';
 require_once 'libraries/relation.lib.php';
diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php
index f7700bf1a6..d7753b67ed 100644
--- a/test/libraries/PMA_select_server_test.php
+++ b/test/libraries/PMA_select_server_test.php
@@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_binlog_test.php b/test/libraries/PMA_server_binlog_test.php
index 1e7bd442cf..13db2a1150 100644
--- a/test/libraries/PMA_server_binlog_test.php
+++ b/test/libraries/PMA_server_binlog_test.php
@@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
 
diff --git a/test/libraries/PMA_server_collations_test.php b/test/libraries/PMA_server_collations_test.php
index 9391e162a8..f19cc02fae 100644
--- a/test/libraries/PMA_server_collations_test.php
+++ b/test/libraries/PMA_server_collations_test.php
@@ -35,7 +35,6 @@ require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/Tracker.class.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/server_common.inc.php';
diff --git a/test/libraries/PMA_server_databases_test.php b/test/libraries/PMA_server_databases_test.php
index e0842a6ad6..fb5825c476 100644
--- a/test/libraries/PMA_server_databases_test.php
+++ b/test/libraries/PMA_server_databases_test.php
@@ -19,7 +19,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/config.default.php';
diff --git a/test/libraries/PMA_server_engines_test.php b/test/libraries/PMA_server_engines_test.php
index 0f66bcc04e..b133b407dd 100644
--- a/test/libraries/PMA_server_engines_test.php
+++ b/test/libraries/PMA_server_engines_test.php
@@ -18,7 +18,6 @@ require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/StorageEngine.class.php';
 
diff --git a/test/libraries/PMA_server_plugins_test.php b/test/libraries/PMA_server_plugins_test.php
index 38412bc92d..8e8f02f50a 100644
--- a/test/libraries/PMA_server_plugins_test.php
+++ b/test/libraries/PMA_server_plugins_test.php
@@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index f989a849d3..24e84316cc 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -16,7 +16,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/Response.class.php';
diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php
index ab0b1734f6..4358931102 100644
--- a/test/libraries/PMA_server_replication_test.php
+++ b/test/libraries/PMA_server_replication_test.php
@@ -19,7 +19,6 @@ require_once 'libraries/replication_gui.lib.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php
index ff3eb442eb..a28cc6f4a6 100644
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@@ -19,7 +19,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index 1efe0b4121..c49be83ac0 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index c67defd7cf..75d6294a5e 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -19,7 +19,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index cfc4db842d..c21ceedd50 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_server_variables_test.php b/test/libraries/PMA_server_variables_test.php
index 7d23753354..bd4aa62fdb 100644
--- a/test/libraries/PMA_server_variables_test.php
+++ b/test/libraries/PMA_server_variables_test.php
@@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php
index 3f97e9a883..1b0ad82f16 100644
--- a/test/libraries/PMA_sql_query_form_test.php
+++ b/test/libraries/PMA_sql_query_form_test.php
@@ -19,7 +19,6 @@ require_once 'libraries/relation.lib.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/sql_query_form.lib.php';
diff --git a/test/libraries/PMA_structure_test.php b/test/libraries/PMA_structure_test.php
index a44613577d..0cc505f287 100644
--- a/test/libraries/PMA_structure_test.php
+++ b/test/libraries/PMA_structure_test.php
@@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/Tracker.class.php';
 require_once 'libraries/Table.class.php';
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php
index 7aa9d5e998..9d0cd85191 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -11,7 +11,6 @@
  * Include to test.
  */
 require_once 'libraries/Util.class.php';
-require_once 'libraries/sqlparser.lib.php';
 
 /**
  ** Test for PMA_Util::formatSql from Util.class.php
diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php
index b5d837a9e0..d68c9e1501 100644
--- a/test/libraries/common/PMA_quoting_slashing_test.php
+++ b/test/libraries/common/PMA_quoting_slashing_test.php
@@ -11,7 +11,6 @@
  * Include to test.
  */
 require_once 'libraries/Util.class.php';
-require_once 'libraries/sqlparser.data.php';
 
 /**
  * Test for quoting, slashing/backslashing
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index 44061c9090..b483c29e5c 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -8,7 +8,6 @@
 
 $GLOBALS['server'] = 0;
 require_once 'libraries/Util.class.php';
-require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/url_generating.lib.php';
 require_once './libraries/Types.class.php';