Skip to content
This repository has been archived by the owner on Jun 22, 2020. It is now read-only.

Commit

Permalink
Merge branch 'QA_4_6'
Browse files Browse the repository at this point in the history 
Signed-off-by: Michal Čihař <[email protected]>
  • Loading branch information
@nijel
nijel committed Jan 23, 2017
2 parents d6adb18 + e4bf536 commit 27fb0b5
Show file tree
Hide file tree
Showing 22 changed files with 105 additions and 107 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"ext-xml": "*",
"ext-pcre": "*",
"ext-json": "*",
"phpmyadmin/sql-parser": "^3.4",
"phpmyadmin/sql-parser": "^4.0",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"tecnickcom/tcpdf": "^6.2",
Expand Down
2 changes: 1 addition & 1 deletion db_sql_format.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

$query = !empty($_POST['sql']) ? $_POST['sql'] : '';

$query = SqlParser\Utils\Formatter::format($query);
$query = PhpMyAdmin\SqlParser\Utils\Formatter::format($query);

$response = Response::getInstance();
$response->addJSON("sql", $query);
6 changes: 3 additions & 3 deletions export.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,12 @@
// Merge SQL Query aliases with Export aliases from
// export page, Export page aliases are given more
// preference over SQL Query aliases.
$parser = new SqlParser\Parser($sql_query);
$parser = new \PhpMyAdmin\SqlParser\Parser($sql_query);
$aliases = array();
if ((!empty($parser->statements[0]))
&& ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement)
&& ($parser->statements[0] instanceof \PhpMyAdmin\SqlParser\Statements\SelectStatement)
) {
$aliases = SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
$aliases = \PhpMyAdmin\SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
}
if (!empty($_REQUEST['aliases'])) {
$aliases = PMA_mergeAliases($aliases, $_REQUEST['aliases']);
Expand Down
4 changes: 2 additions & 2 deletions libraries/DisplayResults.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
namespace PMA\libraries;

use SqlParser\Utils\Query;
use PhpMyAdmin\SqlParser\Utils\Query;
use PMA\libraries\plugins\transformations\Text_Plain_Link;
use PMA\libraries\URL;
use PMA\libraries\Sanitize;
Expand Down Expand Up @@ -4247,7 +4247,7 @@ public function getTable(

/**
* The statement this table is built for.
* @var \SqlParser\Statements\SelectStatement
* @var \PhpMyAdmin\SqlParser\Statements\SelectStatement
*/
$statement = $analyzed_sql_results['statement'];

Expand Down
8 changes: 4 additions & 4 deletions libraries/Linter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
*/
namespace PMA\libraries;

use SqlParser\Lexer;
use SqlParser\Parser;
use SqlParser\UtfString;
use SqlParser\Utils\Error as ParserError;
use PhpMyAdmin\SqlParser\Lexer;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\UtfString;
use PhpMyAdmin\SqlParser\Utils\Error as ParserError;

/**
* The linter itself.
Expand Down
22 changes: 11 additions & 11 deletions libraries/Table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
namespace PMA\libraries;

use PMA\libraries\plugins\export\ExportSql;
use SqlParser\Components\Expression;
use SqlParser\Components\OptionsArray;
use SqlParser\Context;
use SqlParser\Parser;
use SqlParser\Statements\DropStatement;
use PhpMyAdmin\SqlParser\Components\Expression;
use PhpMyAdmin\SqlParser\Components\OptionsArray;
use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Statements\DropStatement;

/**
* Handles everything related to tables
Expand Down Expand Up @@ -905,7 +905,7 @@ static public function moveCopy($source_db, $source_table, $target_db,

/**
* The CREATE statement of this structure.
* @var \SqlParser\Statements\CreateStatement $statement
* @var \PhpMyAdmin\SqlParser\Statements\CreateStatement $statement
*/
$statement = $parser->statements[0];

Expand All @@ -932,7 +932,7 @@ static public function moveCopy($source_db, $source_table, $target_db,

/**
* The ALTER statement that generates the constraints.
* @var \SqlParser\Statements\AlterStatement $statement
* @var \PhpMyAdmin\SqlParser\Statements\AlterStatement $statement
*/
$statement = $parser->statements[0];

Expand Down Expand Up @@ -971,7 +971,7 @@ static public function moveCopy($source_db, $source_table, $target_db,
$GLOBALS['sql_indexes'] = '';
/**
* The ALTER statement that generates the indexes.
* @var \SqlParser\Statements\AlterStatement $statement
* @var \PhpMyAdmin\SqlParser\Statements\AlterStatement $statement
*/
foreach ($parser->statements as $statement) {

Expand Down Expand Up @@ -1013,7 +1013,7 @@ static public function moveCopy($source_db, $source_table, $target_db,

/**
* The ALTER statement that alters the AUTO_INCREMENT value.
* @var \SqlParser\Statements\AlterStatement $statement
* @var \PhpMyAdmin\SqlParser\Statements\AlterStatement $statement
*/
$statement = $parser->statements[0];

Expand Down Expand Up @@ -2432,10 +2432,10 @@ public function getColumnGenerationExpression($column = null)

$parser = new Parser($createTable);
/**
* @var \SqlParser\Statements\CreateStatement $stmt
* @var \PhpMyAdmin\SqlParser\Statements\CreateStatement $stmt
*/
$stmt = $parser->statements[0];
$fields = \SqlParser\Utils\Table::getFields($stmt);
$fields = \PhpMyAdmin\SqlParser\Utils\Table::getFields($stmt);
if ($column != null) {
$expression = isset($fields[$column]['expr']) ?
substr($fields[$column]['expr'], 1, -1) : '';
Expand Down
18 changes: 9 additions & 9 deletions libraries/Tracker.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ static public function parseQuery($query)
// $parsed_sql = PMA_SQP_parse($query);
// $sql_info = PMA_SQP_analyze($parsed_sql);

$parser = new \SqlParser\Parser($query);
$parser = new \PhpMyAdmin\SqlParser\Parser($query);

$tokens = $parser->list->tokens;

Expand All @@ -638,7 +638,7 @@ static public function parseQuery($query)
$result['type'] = 'DDL';

// Parse CREATE statement
if ($statement instanceof \SqlParser\Statements\CreateStatement) {
if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\CreateStatement) {
if (empty($options) || !isset($options[6])) {
return $result;
}
Expand Down Expand Up @@ -666,7 +666,7 @@ static public function parseQuery($query)
}

// Parse ALTER statement
elseif ($statement instanceof \SqlParser\Statements\AlterStatement) {
elseif ($statement instanceof \PhpMyAdmin\SqlParser\Statements\AlterStatement) {
if (empty($options) || !isset($options[3])) {
return $result;
}
Expand All @@ -683,7 +683,7 @@ static public function parseQuery($query)
}

// Parse DROP statement
elseif ($statement instanceof \SqlParser\Statements\DropStatement) {
elseif ($statement instanceof \PhpMyAdmin\SqlParser\Statements\DropStatement) {
if (empty($options) || !isset($options[1])) {
return $result;
}
Expand All @@ -703,7 +703,7 @@ static public function parseQuery($query)
}

// Prase RENAME statement
elseif ($statement instanceof \SqlParser\Statements\RenameStatement) {
elseif ($statement instanceof \PhpMyAdmin\SqlParser\Statements\RenameStatement) {
$result['identifier'] = 'RENAME TABLE';
$result['tablename'] = $statement->renames[0]->old->table;
$result['tablename_after_rename'] = $statement->renames[0]->new->table;
Expand All @@ -719,25 +719,25 @@ static public function parseQuery($query)
$result['type'] = 'DML';

// Parse UPDATE statement
if ($statement instanceof \SqlParser\Statements\UpdateStatement) {
if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\UpdateStatement) {
$result['identifier'] = 'UPDATE';
$result['tablename'] = $statement->tables[0]->table;
}

// Parse INSERT INTO statement
if ($statement instanceof \SqlParser\Statements\InsertStatement) {
if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\InsertStatement) {
$result['identifier'] = 'INSERT';
$result['tablename'] = $statement->into->dest->table;
}

// Parse DELETE statement
if ($statement instanceof \SqlParser\Statements\DeleteStatement) {
if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\DeleteStatement) {
$result['identifier'] = 'DELETE';
$result['tablename'] = $statement->from[0]->table;
}

// Parse TRUNCATE statement
if ($statement instanceof \SqlParser\Statements\TruncateStatement) {
if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\TruncateStatement) {
$result['identifier'] = 'TRUNCATE' ;
$result['tablename'] = $statement->table->table;
}
Expand Down
10 changes: 5 additions & 5 deletions libraries/Util.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
namespace PMA\libraries;

use PMA\libraries\plugins\ImportPlugin;
use SqlParser\Context;
use SqlParser\Lexer;
use SqlParser\Parser;
use SqlParser\Token;
use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Lexer;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use stdClass;
use SqlParser\Utils\Error as ParserError;
use PMA\libraries\URL;
use PMA\libraries\Sanitize;
use PMA\libraries\Template;
use PhpMyAdmin\SqlParser\Utils\Error as ParserError;

if (! defined('PHPMYADMIN')) {
exit;
Expand Down
4 changes: 2 additions & 2 deletions libraries/common.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,11 +800,11 @@
$GLOBALS['PMA_Types'] = new TypesMySQL();

// Loads closest context to this version.
SqlParser\Context::loadClosest('MySql' . PMA_MYSQL_INT_VERSION);
PhpMyAdmin\SqlParser\Context::loadClosest('MySql' . PMA_MYSQL_INT_VERSION);

// Sets the default delimiter (if specified).
if (!empty($_REQUEST['sql_delimiter'])) {
SqlParser\Lexer::$DEFAULT_DELIMITER = $_REQUEST['sql_delimiter'];
PhpMyAdmin\SqlParser\Lexer::$DEFAULT_DELIMITER = $_REQUEST['sql_delimiter'];
}

// TODO: Set SQL modes too.
Expand Down
13 changes: 7 additions & 6 deletions libraries/controllers/table/TableStructureController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
use PMA\libraries\Template;
use PMA\libraries\Util;
use PMA\Util as Util_lib;
use SqlParser;
use SqlParser\Statements\CreateStatement;
use PhpMyAdmin\SqlParser;
use PhpMyAdmin\SqlParser\Statements\CreateStatement;
use PhpMyAdmin\SqlParser\Utils\Table as SqlTable;
use PMA\libraries\Table;
use PMA\libraries\controllers\TableController;
use PMA\libraries\URL;
Expand Down Expand Up @@ -145,11 +146,11 @@ public function indexAction()
$columns_names = $_REQUEST['field_name'];
$reserved_keywords_names = array();
foreach ($columns_names as $column) {
if (SqlParser\Context::isKeyword(trim($column), true)) {
if (\PhpMyAdmin\SqlParser\Context::isKeyword(trim($column), true)) {
$reserved_keywords_names[] = trim($column);
}
}
if (SqlParser\Context::isKeyword(trim($this->table), true)) {
if (\PhpMyAdmin\SqlParser\Context::isKeyword(trim($this->table), true)) {
$reserved_keywords_names[] = trim($this->table);
}
if (count($reserved_keywords_names) == 0) {
Expand Down Expand Up @@ -548,9 +549,9 @@ private function _extractPartitionDetails()
return null;
}

$parser = new SqlParser\Parser($createTable);
$parser = new \PhpMyAdmin\SqlParser\Parser($createTable);
/**
* @var $stmt SqlParser\Statements\CreateStatement
* @var $stmt PhpMyAdmin\SqlParser\Statements\CreateStatement
*/
$stmt = $parser->statements[0];

Expand Down
Loading

0 comments on commit 27fb0b5

Please sign in to comment.