diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 46c34eddbe..c4cba5b16e 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -3018,4 +3018,22 @@ function PMA_SQP_isKeyWord($column)
     return in_array(strtoupper($column), $PMA_SQPdata_forbidden_word);
 }
 
+
+/**
+ * Get Parser Data Map from sqlparser.data.php
+ *
+ * @return Array Parser Data Map from sqlparser.data.php
+ */
+function PMA_SQP_getParserDataMap()
+{
+    include 'libraries/sqlparser.data.php';
+    return array(
+        'PMA_SQPdata_function_name'  => $PMA_SQPdata_function_name,
+        'PMA_SQPdata_column_attrib'  => $PMA_SQPdata_column_attrib,
+        'PMA_SQPdata_reserved_word'  => $PMA_SQPdata_reserved_word,
+        'PMA_SQPdata_forbidden_word' => $PMA_SQPdata_forbidden_word,
+        'PMA_SQPdata_column_type'    => $PMA_SQPdata_column_type,
+    );
+}
+
 ?>
diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php
index 01f6dc2fcc..22f694c4a4 100644
--- a/test/libraries/PMA_SQL_parser_data_test.php
+++ b/test/libraries/PMA_SQL_parser_data_test.php
@@ -10,6 +10,7 @@
  * Include to test.
  */
 require_once 'libraries/sqlparser.data.php';
+require_once 'libraries/sqlparser.lib.php';
 
 class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
 {
@@ -26,6 +27,16 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
         $this->_assertSorted($GLOBALS[$name]);
     }
 
+    public function testPMA_SQPdata()
+    {
+        $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']);
+    }
+
     public function testPMA_SQPdata_function_name()
     {
         $this->_assertParserData('PMA_SQPdata_function_name');
@@ -52,4 +63,5 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
     }
 
 }
+
 ?>