From 52fa45e149e1a55300f417f819304721465e452c Mon Sep 17 00:00:00 2001 From: Mike Lewis Date: Sat, 21 Jan 2017 15:28:44 -0500 Subject: [PATCH 01/13] Use correct-case table name in message for successful rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, the name returned was the name used in the request, rather than the name after the correcting for the server’s `lower_case_table_names` setting. Following up on issue #12901 and @b2e2e77. Signed-off-by: Mike Lewis --- libraries/operations.lib.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 733deb7383..efdf6c1cab 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -2083,8 +2083,15 @@ function PMA_moveOrCopyTable($db, $table) $old = Util::backquote($db) . '.' . Util::backquote($table); $message->addParam($old); + + + $new_name = $_REQUEST['new_name']; + if ($GLOBALS['dbi']->getLowerCaseNames() === '1') { + $new_name = strtolower($new_name); + } + $new = Util::backquote($_REQUEST['target_db']) . '.' - . Util::backquote($_REQUEST['new_name']); + . Util::backquote($new_name); $message->addParam($new); /* Check: Work on new table or on old table? */ From d06f92de67e4eca0087f587b1c41af19703397c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20He=C3=9Fe?= Date: Fri, 20 Jan 2017 22:55:13 +0000 Subject: [PATCH 02/13] Translated using Weblate (German) Currently translated at 99.7% (3213 of 3222 strings) [CI skip] --- po/de.po | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/po/de.po b/po/de.po index 987eb6cf7f..fc29571059 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-12-13 10:40+0100\n" -"PO-Revision-Date: 2016-12-21 16:04+0000\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2017-01-20 22:55+0000\n" +"Last-Translator: Daniel Heße \n" "Language-Team: German " "\n" "Language: de\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.10\n" +"X-Generator: Weblate 2.11-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -12059,6 +12059,9 @@ msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to view/export this routine." msgstr "" +"Keine Routine mit dem Namen %1$s in der Datenbank %2$s gefunden. " +"Möglicherweise fehlen Ihnen die nötigen Rechte un diese Routine anzusehen/zu " +"exportieren." #: libraries/rte/rte_words.lib.php:42 #, php-format @@ -12083,17 +12086,14 @@ msgid "trigger" msgstr "Trigger" #: libraries/rte/rte_words.lib.php:54 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a trigger" msgid "You do not have the necessary privileges to create a trigger." msgstr "" -"Sie haben nicht die notwendigen Rechte um einen neuen Trigger zu erstellen" +"Sie haben nicht die notwendigen Rechte um einen neuen Trigger zu erstellen." #: libraries/rte/rte_words.lib.php:56 -#, fuzzy, php-format -#| msgid "No trigger with name %1$s found in database %2$s" +#, php-format msgid "No trigger with name %1$s found in database %2$s." -msgstr "Keine Trigger namens %1$s in der Datenbank %2$s gefunden" +msgstr "Keine Trigger namens %1$s in der Datenbank %2$s gefunden." #: libraries/rte/rte_words.lib.php:57 msgid "There are no triggers to display." @@ -12113,17 +12113,15 @@ msgid "event" msgstr "Ereignis" #: libraries/rte/rte_words.lib.php:68 -#, fuzzy -#| msgid "You do not have the necessary privileges to create an event" msgid "You do not have the necessary privileges to create an event." msgstr "" -"Sie haben nicht die erforderlichen Rechte, um ein neues Ereignis zu erstellen" +"Sie haben nicht die erforderlichen Rechte, um ein neues Ereignis zu " +"erstellen." #: libraries/rte/rte_words.lib.php:70 -#, fuzzy, php-format -#| msgid "No event with name %1$s found in database %2$s" +#, php-format msgid "No event with name %1$s found in database %2$s." -msgstr "Es wurde kein Ereignis mit dem Namen %1$s in Datenbank %2$s gefunden" +msgstr "Es wurde kein Ereignis mit dem Namen %1$s in Datenbank %2$s gefunden." #: libraries/rte/rte_words.lib.php:71 msgid "There are no events to display." @@ -13970,14 +13968,12 @@ msgstr "Eine öffnende Klammer wurde erwartet." #: libraries/sql-parser/src/Statements/InsertStatement.php:227 #: libraries/sql-parser/src/Statements/ReplaceStatement.php:165 #: libraries/sql-parser/src/Statements/ReplaceStatement.php:193 -#, fuzzy -#| msgid "Unexpected token." msgid "Unexpected keyword." -msgstr "Unerwartetes Zeichen." +msgstr "Unerwartetes Schlüsselwort." #: libraries/sql-parser/src/Components/CaseExpression.php:202 msgid "Unexpected end of CASE expression" -msgstr "" +msgstr "Unerwartetes Ende eines CASE Ausdrucks" #: libraries/sql-parser/src/Components/CreateDefinition.php:227 msgid "" @@ -14034,7 +14030,7 @@ msgstr "Diese Option widerspricht „%1$s“." #, fuzzy, php-format #| msgid "Ending quote %1$s was expected." msgid "Value/Expression for the option %1$s was expected" -msgstr "Schließendes Anführungszeichen %1$s wurde erzeugt." +msgstr "Wert/Ausdruck für die Option %1$s erwartet" #: libraries/sql-parser/src/Components/RenameOperation.php:101 msgid "The old name of the table was expected." From 47cac05712c98abb68c878221eecb8aaa306497a Mon Sep 17 00:00:00 2001 From: Kurt Eilertsen Date: Sat, 21 Jan 2017 20:37:34 +0000 Subject: [PATCH 03/13] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 56.9% (1846 of 3239 strings) [CI skip] --- po/nb.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/nb.po b/po/nb.po index 3830e807c4..773e6b2f1b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-12-13 10:40+0100\n" -"PO-Revision-Date: 2016-05-19 17:17+0000\n" -"Last-Translator: Axel Magnus Gaasø \n" -"Language-Team: Norwegian Bokmål \n" +"PO-Revision-Date: 2017-01-21 20:37+0000\n" +"Last-Translator: Kurt Eilertsen \n" +"Language-Team: Norwegian Bokmål " +"\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.7-dev\n" +"X-Generator: Weblate 2.11-dev\n" #: changelog.php:39 license.php:34 #, fuzzy, php-format @@ -768,7 +768,7 @@ msgstr "" #: index.php:515 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "Sikkerhets passordet i konfigurasjon (blowfish_secret) er for kort" #: index.php:529 msgid "" @@ -945,7 +945,7 @@ msgstr "Uleselig data" #: js/messages.php:96 msgid "Are you sure you wish to change the collation and convert the data?" -msgstr "" +msgstr "Er du sikker på du ønsker å endre sortering og konvertere data?" #: js/messages.php:98 msgid "" @@ -962,10 +962,10 @@ msgid "" "Are you sure you wish to change all the column collations and convert the " "data?" msgstr "" +"Er du sikker på at du ønsker å endre alle kolonnesorteringene og konvertere " +"data?" #: js/messages.php:111 -#, fuzzy -#| msgid "Save & Close" msgid "Save & close" msgstr "Lagre & Lukk" @@ -975,10 +975,8 @@ msgid "Reset" msgstr "Tilbakestill" #: js/messages.php:113 -#, fuzzy -#| msgid "Reset All" msgid "Reset all" -msgstr "Nullstill Alle" +msgstr "Tilbakestill alle" #: js/messages.php:116 msgid "Missing value in the form!" From 15909c30bc85c2313b2c16d2f5a1f53b623960f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 12:30:52 +0100 Subject: [PATCH 04/13] Update to use motranslator 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It uses PSR-4 prefix for PhpMyAdmin namespace. See https://github.com/phpmyadmin/sql-parser/issues/126 Signed-off-by: Michal Čihař --- composer.json | 2 +- libraries/common.inc.php | 2 +- test/bootstrap-dist.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 131ab1d68d..86b09555c3 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "ext-pcre": "*", "ext-json": "*", "phpmyadmin/sql-parser": "^3.4", - "phpmyadmin/motranslator": "^2.0", + "phpmyadmin/motranslator": "~3.0", "phpmyadmin/shapefile": "^1.0", "tecnickcom/tcpdf": "^6.2", "phpseclib/phpseclib": "^2.0", diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 53eb937f6a..c3da119807 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -80,7 +80,7 @@ require_once './vendor/autoload.php'; /** * Load gettext functions. */ -MoTranslator\Loader::loadFunctions(); +PhpMyAdmin\MoTranslator\Loader::loadFunctions(); /** * initialize the error handler diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 9a8bb186c4..4a042a79ff 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -61,7 +61,7 @@ if (PHP_SAPI == 'cli') { require_once 'libraries/vendor_config.php'; require_once 'vendor/autoload.php'; require_once 'libraries/core.lib.php'; -MoTranslator\Loader::loadFunctions(); +PhpMyAdmin\MoTranslator\Loader::loadFunctions(); $CFG = new PMA\libraries\Config(); // Initialize PMA_VERSION variable define('PMA_VERSION', $CFG->get('PMA_VERSION')); From 92f73acef0137f7528e74f79aa2172273d122b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 12:55:03 +0100 Subject: [PATCH 05/13] Use ^ operator for motranslator version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 86b09555c3..cc9db79741 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "ext-pcre": "*", "ext-json": "*", "phpmyadmin/sql-parser": "^3.4", - "phpmyadmin/motranslator": "~3.0", + "phpmyadmin/motranslator": "^3.0", "phpmyadmin/shapefile": "^1.0", "tecnickcom/tcpdf": "^6.2", "phpseclib/phpseclib": "^2.0", From b87362b7d23b74afc57fc38751a2c04bf310f8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 12:56:24 +0100 Subject: [PATCH 06/13] Update to use shapefile 2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It uses PSR-4 prefix for PhpMyAdmin namespace. See https://github.com/phpmyadmin/sql-parser/issues/126 Signed-off-by: Michal Čihař --- composer.json | 2 +- libraries/plugins/import/ShapeFileImport.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index cc9db79741..435eb265d5 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "ext-json": "*", "phpmyadmin/sql-parser": "^3.4", "phpmyadmin/motranslator": "^3.0", - "phpmyadmin/shapefile": "^1.0", + "phpmyadmin/shapefile": "^2.0", "tecnickcom/tcpdf": "^6.2", "phpseclib/phpseclib": "^2.0", "google/recaptcha": "^1.1" diff --git a/libraries/plugins/import/ShapeFileImport.php b/libraries/plugins/import/ShapeFileImport.php index 0f2a537f2c..fef78a5c1f 100644 --- a/libraries/plugins/import/ShapeFileImport.php +++ b/libraries/plugins/import/ShapeFileImport.php @@ -9,7 +9,7 @@ */ namespace PMA\libraries\plugins\import; -use ShapeFile\ShapeFile; +use PhpMyAdmin\ShapeFile\ShapeFile; class ShapeFileImport extends ShapeFile { From c654a50d87a725f9dabbb97326a2b7855b8254ec Mon Sep 17 00:00:00 2001 From: Kurt Eilertsen Date: Sat, 21 Jan 2017 20:37:32 +0000 Subject: [PATCH 07/13] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 57.4% (1851 of 3222 strings) [CI skip] --- po/nb.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/nb.po b/po/nb.po index 5533560041..f68d62732c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-12-13 10:40+0100\n" -"PO-Revision-Date: 2016-05-19 17:18+0000\n" -"Last-Translator: Axel Magnus Gaasø \n" -"Language-Team: Norwegian Bokmål \n" +"PO-Revision-Date: 2017-01-21 20:37+0000\n" +"Last-Translator: Kurt Eilertsen \n" +"Language-Team: Norwegian Bokmål " +"\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.7-dev\n" +"X-Generator: Weblate 2.11-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -784,7 +784,7 @@ msgstr "" #: index.php:509 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "Sikkerhets passordet i konfigurasjon (blowfish_secret) er for kort" #: index.php:523 msgid "" @@ -957,7 +957,7 @@ msgstr "Uleselig data" #: js/messages.php:91 msgid "Are you sure you wish to change the collation and convert the data?" -msgstr "" +msgstr "Er du sikker på du ønsker å endre sortering og konvertere data?" #: js/messages.php:93 msgid "" @@ -974,10 +974,10 @@ msgid "" "Are you sure you wish to change all the column collations and convert the " "data?" msgstr "" +"Er du sikker på at du ønsker å endre alle kolonnesorteringene og konvertere " +"data?" #: js/messages.php:106 -#, fuzzy -#| msgid "Save & Close" msgid "Save & close" msgstr "Lagre & Lukk" @@ -987,10 +987,8 @@ msgid "Reset" msgstr "Tilbakestill" #: js/messages.php:108 -#, fuzzy -#| msgid "Reset All" msgid "Reset all" -msgstr "Nullstill Alle" +msgstr "Tilbakestill alle" #: js/messages.php:111 msgid "Missing value in the form!" From e4bf53690679332c23d0ff2b4865ad844d60d996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 13:56:35 +0100 Subject: [PATCH 08/13] Update to SQL Parser 4.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It now follows PSR-4 and uses PhpMyAdmin namespace prefix. See https://github.com/phpmyadmin/sql-parser/issues/126 Signed-off-by: Michal Čihař --- db_sql_format.php | 2 +- export.php | 6 +- libraries/DisplayResults.php | 4 +- libraries/Linter.php | 8 +- libraries/Table.php | 22 +-- libraries/Util.php | 10 +- libraries/autoloader.php | 2 +- libraries/common.inc.php | 4 +- .../table/TableStructureController.php | 14 +- libraries/import.lib.php | 40 ++--- libraries/parse_analyze.lib.php | 2 +- libraries/plugins/export/ExportSql.php | 12 +- libraries/plugins/import/ImportSql.php | 3 +- libraries/relation.lib.php | 6 +- libraries/rte/rte_list.lib.php | 6 +- libraries/rte/rte_routines.lib.php | 6 +- libraries/sql-parser/ClassLoader.php | 4 +- libraries/sql-parser/autoload.php | 6 +- libraries/sql-parser/src/Component.php | 2 +- .../src/Components/AlterOperation.php | 10 +- .../sql-parser/src/Components/Array2d.php | 10 +- .../sql-parser/src/Components/ArrayObj.php | 10 +- .../src/Components/CaseExpression.php | 10 +- .../sql-parser/src/Components/Condition.php | 10 +- .../src/Components/CreateDefinition.php | 12 +- .../sql-parser/src/Components/DataType.php | 10 +- .../sql-parser/src/Components/Expression.php | 12 +- .../src/Components/ExpressionArray.php | 10 +- .../src/Components/FunctionCall.php | 10 +- .../sql-parser/src/Components/IntoKeyword.php | 10 +- .../sql-parser/src/Components/JoinKeyword.php | 10 +- libraries/sql-parser/src/Components/Key.php | 12 +- libraries/sql-parser/src/Components/Limit.php | 10 +- .../src/Components/OptionsArray.php | 10 +- .../src/Components/OrderKeyword.php | 10 +- .../src/Components/ParameterDefinition.php | 12 +- .../src/Components/PartitionDefinition.php | 12 +- .../sql-parser/src/Components/Reference.php | 12 +- .../src/Components/RenameOperation.php | 10 +- .../src/Components/SetOperation.php | 10 +- .../src/Components/UnionKeyword.php | 6 +- libraries/sql-parser/src/Context.php | 8 +- .../src/Contexts/ContextMySql50000.php | 4 +- .../src/Contexts/ContextMySql50100.php | 4 +- .../src/Contexts/ContextMySql50500.php | 4 +- .../src/Contexts/ContextMySql50600.php | 4 +- .../src/Contexts/ContextMySql50700.php | 4 +- .../src/Exceptions/LexerException.php | 2 +- .../src/Exceptions/ParserException.php | 4 +- libraries/sql-parser/src/Lexer.php | 5 +- libraries/sql-parser/src/Parser.php | 154 +++++++++--------- libraries/sql-parser/src/Statement.php | 8 +- .../src/Statements/AlterStatement.php | 16 +- .../src/Statements/AnalyzeStatement.php | 6 +- .../src/Statements/BackupStatement.php | 2 +- .../src/Statements/CallStatement.php | 6 +- .../src/Statements/CheckStatement.php | 2 +- .../src/Statements/ChecksumStatement.php | 2 +- .../src/Statements/CreateStatement.php | 26 +-- .../src/Statements/DeleteStatement.php | 24 +-- .../src/Statements/DropStatement.php | 6 +- .../src/Statements/ExplainStatement.php | 2 +- .../src/Statements/InsertStatement.php | 18 +- .../src/Statements/MaintenanceStatement.php | 14 +- .../Statements/NotImplementedStatement.php | 10 +- .../src/Statements/OptimizeStatement.php | 6 +- .../src/Statements/RenameStatement.php | 12 +- .../src/Statements/RepairStatement.php | 2 +- .../src/Statements/ReplaceStatement.php | 20 +-- .../src/Statements/RestoreStatement.php | 2 +- .../src/Statements/SelectStatement.php | 20 +-- .../src/Statements/SetStatement.php | 8 +- .../src/Statements/ShowStatement.php | 2 +- .../src/Statements/TransactionStatement.php | 10 +- .../src/Statements/TruncateStatement.php | 6 +- .../src/Statements/UpdateStatement.php | 14 +- libraries/sql-parser/src/Token.php | 2 +- libraries/sql-parser/src/TokensList.php | 2 +- libraries/sql-parser/src/UtfString.php | 2 +- .../sql-parser/src/Utils/BufferedQuery.php | 4 +- libraries/sql-parser/src/Utils/CLI.php | 6 +- libraries/sql-parser/src/Utils/Error.php | 6 +- libraries/sql-parser/src/Utils/Formatter.php | 16 +- libraries/sql-parser/src/Utils/Misc.php | 6 +- libraries/sql-parser/src/Utils/Query.php | 50 +++--- libraries/sql-parser/src/Utils/Routine.php | 12 +- libraries/sql-parser/src/Utils/Table.php | 4 +- libraries/sql-parser/src/Utils/Tokens.php | 8 +- libraries/sql.lib.php | 16 +- tbl_export.php | 20 +-- test/classes/DisplayResultsTest.php | 4 +- test/libraries/PMA_import_test.php | 2 +- .../common/PMA_quoting_slashing_test.php | 4 +- 93 files changed, 492 insertions(+), 496 deletions(-) diff --git a/db_sql_format.php b/db_sql_format.php index c89ace5f81..0ec6f9e1dc 100644 --- a/db_sql_format.php +++ b/db_sql_format.php @@ -14,7 +14,7 @@ require_once 'libraries/common.inc.php'; $query = !empty($_POST['sql']) ? $_POST['sql'] : ''; -$query = SqlParser\Utils\Formatter::format($query); +$query = PhpMyAdmin\SqlParser\Utils\Formatter::format($query); $response = PMA\libraries\Response::getInstance(); $response->addJSON("sql", $query); diff --git a/export.php b/export.php index 785972b7dd..f22932165b 100644 --- a/export.php +++ b/export.php @@ -280,12 +280,12 @@ if (!defined('TESTSUITE')) { // 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']); diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 98a3804a0b..84505c2d0a 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -7,7 +7,7 @@ */ namespace PMA\libraries; -use SqlParser\Utils\Query; +use PhpMyAdmin\SqlParser\Utils\Query; use PMA\libraries\plugins\transformations\Text_Plain_Link; require_once './libraries/transformations.lib.php'; @@ -4237,7 +4237,7 @@ class DisplayResults /** * The statement this table is built for. - * @var \SqlParser\Statements\SelectStatement + * @var \PhpMyAdmin\SqlParser\Statements\SelectStatement */ $statement = $analyzed_sql_results['statement']; diff --git a/libraries/Linter.php b/libraries/Linter.php index ed53ce2187..34f6003f5a 100644 --- a/libraries/Linter.php +++ b/libraries/Linter.php @@ -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. diff --git a/libraries/Table.php b/libraries/Table.php index 5aae6a7043..23e126dcb5 100644 --- a/libraries/Table.php +++ b/libraries/Table.php @@ -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 @@ -939,7 +939,7 @@ class Table /** * The CREATE statement of this structure. - * @var \SqlParser\Statements\CreateStatement $statement + * @var \PhpMyAdmin\SqlParser\Statements\CreateStatement $statement */ $statement = $parser->statements[0]; @@ -966,7 +966,7 @@ class Table /** * The ALTER statement that generates the constraints. - * @var \SqlParser\Statements\AlterStatement $statement + * @var \PhpMyAdmin\SqlParser\Statements\AlterStatement $statement */ $statement = $parser->statements[0]; @@ -1005,7 +1005,7 @@ class Table $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) { @@ -1047,7 +1047,7 @@ class Table /** * The ALTER statement that alters the AUTO_INCREMENT value. - * @var \SqlParser\Statements\AlterStatement $statement + * @var \PhpMyAdmin\SqlParser\Statements\AlterStatement $statement */ $statement = $parser->statements[0]; @@ -2454,10 +2454,10 @@ class Table $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) : ''; diff --git a/libraries/Util.php b/libraries/Util.php index 9b6eba4d58..5ffba78949 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -8,12 +8,12 @@ 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 PhpMyAdmin\SqlParser\Utils\Error as ParserError; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/autoloader.php b/libraries/autoloader.php index dfc4c21ecb..a80c9935c0 100644 --- a/libraries/autoloader.php +++ b/libraries/autoloader.php @@ -15,5 +15,5 @@ $loader->register(); // register the base directories for the namespace prefix $loader->addNamespace('PMA', '.'); -$loader->addNamespace('SqlParser', './libraries/sql-parser/src'); +$loader->addNamespace('PhpMyAdmin\SqlParser', './libraries/sql-parser/src'); $loader->addNamespace('phpseclib', PHPSECLIB_INC_DIR); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 9326b1f936..93ac72f6cf 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -942,11 +942,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { include_once SQL_PARSER_AUTOLOAD; // 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. diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php index 059eef4f29..d2c16a3342 100644 --- a/libraries/controllers/table/TableStructureController.php +++ b/libraries/controllers/table/TableStructureController.php @@ -15,9 +15,9 @@ use PMA\libraries\Message; use PMA\libraries\Template; use PMA\libraries\Util; use PMA\Util as Util_lib; -use SqlParser; -use SqlParser\Statements\CreateStatement; -use SqlParser\Utils\Table as SqlTable; +use PhpMyAdmin\SqlParser; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Utils\Table as SqlTable; use PMA\libraries\Table; use PMA\libraries\controllers\TableController; @@ -147,11 +147,11 @@ class TableStructureController extends TableController $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) { @@ -550,9 +550,9 @@ class TableStructureController extends TableController 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]; diff --git a/libraries/import.lib.php b/libraries/import.lib.php index ad6402247a..a3072ddcd6 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1381,7 +1381,7 @@ function PMA_handleSimulateDMLRequest() } // Parsing the query. - $parser = new SqlParser\Parser($sql_query); + $parser = new PhpMyAdmin\SqlParser\Parser($sql_query); if (empty($parser->statements[0])) { continue; @@ -1395,15 +1395,15 @@ function PMA_handleSimulateDMLRequest() 'statement' => $statement, ); - if ((!(($statement instanceof SqlParser\Statements\UpdateStatement) - || ($statement instanceof SqlParser\Statements\DeleteStatement))) + if ((!(($statement instanceof PhpMyAdmin\SqlParser\Statements\UpdateStatement) + || ($statement instanceof PhpMyAdmin\SqlParser\Statements\DeleteStatement))) || (!empty($statement->join)) ) { $error = $error_msg; break; } - $tables = SqlParser\Utils\Query::getTables($statement); + $tables = PhpMyAdmin\SqlParser\Utils\Query::getTables($statement); if (count($tables) > 1) { $error = $error_msg; break; @@ -1439,9 +1439,9 @@ function PMA_getMatchedRows($analyzed_sql_results = array()) $statement = $analyzed_sql_results['statement']; $matched_row_query = ''; - if ($statement instanceof SqlParser\Statements\DeleteStatement) { + if ($statement instanceof PhpMyAdmin\SqlParser\Statements\DeleteStatement) { $matched_row_query = PMA_getSimulatedDeleteQuery($analyzed_sql_results); - } elseif ($statement instanceof SqlParser\Statements\UpdateStatement) { + } elseif ($statement instanceof PhpMyAdmin\SqlParser\Statements\UpdateStatement) { $matched_row_query = PMA_getSimulatedUpdateQuery($analyzed_sql_results); } @@ -1471,11 +1471,11 @@ function PMA_getMatchedRows($analyzed_sql_results = array()) */ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) { - $table_references = SqlParser\Utils\Query::getTables( + $table_references = PhpMyAdmin\SqlParser\Utils\Query::getTables( $analyzed_sql_results['statement'] ); - $where = SqlParser\Utils\Query::getClause( + $where = PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'WHERE' @@ -1498,7 +1498,7 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) $order_and_limit = ''; if (!empty($analyzed_sql_results['statement']->order)) { - $order_and_limit .= ' ORDER BY ' . SqlParser\Utils\Query::getClause( + $order_and_limit .= ' ORDER BY ' . PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'ORDER BY' @@ -1506,7 +1506,7 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) } if (!empty($analyzed_sql_results['statement']->limit)) { - $order_and_limit .= ' LIMIT ' . SqlParser\Utils\Query::getClause( + $order_and_limit .= ' LIMIT ' . PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'LIMIT' @@ -1527,11 +1527,11 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) */ function PMA_getSimulatedDeleteQuery($analyzed_sql_results) { - $table_references = SqlParser\Utils\Query::getTables( + $table_references = PhpMyAdmin\SqlParser\Utils\Query::getTables( $analyzed_sql_results['statement'] ); - $where = SqlParser\Utils\Query::getClause( + $where = PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'WHERE' @@ -1544,7 +1544,7 @@ function PMA_getSimulatedDeleteQuery($analyzed_sql_results) $order_and_limit = ''; if (!empty($analyzed_sql_results['statement']->order)) { - $order_and_limit .= ' ORDER BY ' . SqlParser\Utils\Query::getClause( + $order_and_limit .= ' ORDER BY ' . PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'ORDER BY' @@ -1552,7 +1552,7 @@ function PMA_getSimulatedDeleteQuery($analyzed_sql_results) } if (!empty($analyzed_sql_results['statement']->limit)) { - $order_and_limit .= ' LIMIT ' . SqlParser\Utils\Query::getClause( + $order_and_limit .= ' LIMIT ' . PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'LIMIT' @@ -1635,7 +1635,7 @@ function PMA_handleRollbackRequest($sql_query) */ function PMA_checkIfRollbackPossible($sql_query) { - $parser = new SqlParser\Parser($sql_query); + $parser = new PhpMyAdmin\SqlParser\Parser($sql_query); if (empty($parser->statements[0])) { return false; @@ -1644,16 +1644,16 @@ function PMA_checkIfRollbackPossible($sql_query) $statement = $parser->statements[0]; // Check if query is supported. - if (!(($statement instanceof SqlParser\Statements\InsertStatement) - || ($statement instanceof SqlParser\Statements\UpdateStatement) - || ($statement instanceof SqlParser\Statements\DeleteStatement) - || ($statement instanceof SqlParser\Statements\ReplaceStatement)) + if (!(($statement instanceof PhpMyAdmin\SqlParser\Statements\InsertStatement) + || ($statement instanceof PhpMyAdmin\SqlParser\Statements\UpdateStatement) + || ($statement instanceof PhpMyAdmin\SqlParser\Statements\DeleteStatement) + || ($statement instanceof PhpMyAdmin\SqlParser\Statements\ReplaceStatement)) ) { return false; } // Get table_references from the query. - $tables = SqlParser\Utils\Query::getTables($statement); + $tables = PhpMyAdmin\SqlParser\Utils\Query::getTables($statement); // Check if each table is 'InnoDB'. foreach ($tables as $table) { diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index 81945467b8..52e0101746 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -25,7 +25,7 @@ function PMA_parseAnalyze($sql_query, $db) $GLOBALS['unparsed_sql'] = $sql_query; // Get details about the SQL query. - $analyzed_sql_results = SqlParser\Utils\Query::getAll($sql_query); + $analyzed_sql_results = PhpMyAdmin\SqlParser\Utils\Query::getAll($sql_query); extract($analyzed_sql_results); $table = ''; diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php index b44ddc07c3..c7812aed95 100644 --- a/libraries/plugins/export/ExportSql.php +++ b/libraries/plugins/export/ExportSql.php @@ -20,11 +20,11 @@ use PMA\libraries\plugins\ExportPlugin; use PMA\libraries\Util; use PMA\libraries\properties\options\items\RadioPropertyItem; use PMA\libraries\properties\options\items\SelectPropertyItem; -use SqlParser\Components\CreateDefinition; -use SqlParser\Context; -use SqlParser\Parser; -use SqlParser\Statements\SelectStatement; -use SqlParser\Token; +use PhpMyAdmin\SqlParser\Components\CreateDefinition; +use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statements\SelectStatement; +use PhpMyAdmin\SqlParser\Token; use PMA\libraries\properties\options\items\TextPropertyItem; /** @@ -2656,7 +2656,7 @@ class ExportSql extends ExportPlugin /** * The statement that represents the query. * - * @var \SqlParser\Statements\CreateStatement $statement + * @var \PhpMyAdmin\SqlParser\Statements\CreateStatement $statement */ $statement = $parser->statements[0]; diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php index 8926830ed7..07744277d6 100644 --- a/libraries/plugins/import/ImportSql.php +++ b/libraries/plugins/import/ImportSql.php @@ -15,7 +15,6 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; use PMA; use PMA\libraries\plugins\ImportPlugin; use PMA\libraries\properties\options\items\SelectPropertyItem; -use SqlParser; /** * Handles the import for the SQL format @@ -111,7 +110,7 @@ class ImportSql extends ImportPlugin // Handle compatibility options. $this->_setSQLMode($GLOBALS['dbi'], $_REQUEST); - $bq = new SqlParser\Utils\BufferedQuery(); + $bq = new \PhpMyAdmin\SqlParser\Utils\BufferedQuery(); if (isset($_POST['sql_delimiter'])) { $bq->setDelimiter($_POST['sql_delimiter']); } diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 7d01c6af35..3184a91234 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -8,7 +8,7 @@ use PMA\libraries\Message; use PMA\libraries\Table; use PMA\libraries\RecentFavoriteTable; -use SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; /** * Executes a query as controluser if possible, otherwise as normal user @@ -773,12 +773,12 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') $tableObj = new Table($table, $db); $show_create_table = $tableObj->showCreate(); if ($show_create_table) { - $parser = new SqlParser\Parser($show_create_table); + $parser = new PhpMyAdmin\SqlParser\Parser($show_create_table); /** * @var CreateStatement $stmt */ $stmt = $parser->statements[0]; - $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys( + $foreign['foreign_keys_data'] = PhpMyAdmin\SqlParser\Utils\Table::getForeignKeys( $stmt ); } diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index eb8efc4542..1a57caed56 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -use SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; if (! defined('PHPMYADMIN')) { exit; @@ -243,14 +243,14 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') $db, $routine['type'], $routine['name'] ); if ($definition !== false) { - $parser = new SqlParser\Parser($definition); + $parser = new PhpMyAdmin\SqlParser\Parser($definition); /** * @var CreateStatement $stmt */ $stmt = $parser->statements[0]; - $params = SqlParser\Utils\Routine::getParameters($stmt); + $params = PhpMyAdmin\SqlParser\Utils\Routine::getParameters($stmt); if (PMA\libraries\Util::currentUserHasPrivilege('EXECUTE', $db)) { $execute_action = 'execute_routine'; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index fba5b79c44..7ea3aade9e 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -8,7 +8,7 @@ use PMA\libraries\Message; use PMA\libraries\Response; use PMA\libraries\Util; -use SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; if (! defined('PHPMYADMIN')) { exit; @@ -607,14 +607,14 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) return false; } - $parser = new SqlParser\Parser($definition); + $parser = new PhpMyAdmin\SqlParser\Parser($definition); /** * @var CreateStatement $stmt */ $stmt = $parser->statements[0]; - $params = SqlParser\Utils\Routine::getParameters($stmt); + $params = PhpMyAdmin\SqlParser\Utils\Routine::getParameters($stmt); $retval['item_num_params'] = $params['num']; $retval['item_param_dir'] = $params['dir']; $retval['item_param_name'] = $params['name']; diff --git a/libraries/sql-parser/ClassLoader.php b/libraries/sql-parser/ClassLoader.php index 3ff2f69de3..3b154415ef 100644 --- a/libraries/sql-parser/ClassLoader.php +++ b/libraries/sql-parser/ClassLoader.php @@ -9,7 +9,7 @@ * @package SqlParser * @subpackage Autoload */ -namespace SqlParser\Autoload; +namespace PhpMyAdmin\SqlParser\Autoload; /** * ClassLoader implements a PSR-4 class loader, @@ -232,7 +232,7 @@ class ClassLoader } } -if (!function_exists('SqlParser\\Autoload\\includeFile')) { +if (!function_exists('PhpMyAdmin\\SqlParser\\Autoload\\includeFile')) { /** * Scope isolated include. diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php index f12057f211..864a264142 100644 --- a/libraries/sql-parser/autoload.php +++ b/libraries/sql-parser/autoload.php @@ -13,14 +13,14 @@ */ namespace SqlParser\Autoload; -if (!class_exists('SqlParser\\Autoload\\ClassLoader')) { +if (!class_exists('PhpMyAdmin\\SqlParser\\Autoload\\ClassLoader')) { if (! file_exists('./libraries/sql-parser/ClassLoader.php')) { die('Invalid invocation'); } include_once './libraries/sql-parser/ClassLoader.php'; } -use SqlParser\Autoload\ClassLoader; +use PhpMyAdmin\SqlParser\Autoload\ClassLoader; /** * Initializes the autoloader. @@ -73,6 +73,6 @@ require_once GETTEXT_INC; // Initializing the autoloader. return AutoloaderInit::getLoader( array( - 'SqlParser\\' => array(dirname(__FILE__) . '/src'), + 'PhpMyAdmin\\SqlParser\\' => array(dirname(__FILE__) . '/src'), ) ); diff --git a/libraries/sql-parser/src/Component.php b/libraries/sql-parser/src/Component.php index 107756ca90..c022a7098b 100644 --- a/libraries/sql-parser/src/Component.php +++ b/libraries/sql-parser/src/Component.php @@ -9,7 +9,7 @@ * count on the *Component classes to do their job. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; require_once 'common.php'; diff --git a/libraries/sql-parser/src/Components/AlterOperation.php b/libraries/sql-parser/src/Components/AlterOperation.php index 43bd14ae77..c3951731a8 100644 --- a/libraries/sql-parser/src/Components/AlterOperation.php +++ b/libraries/sql-parser/src/Components/AlterOperation.php @@ -4,12 +4,12 @@ * Parses an alter operation. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses an alter operation. diff --git a/libraries/sql-parser/src/Components/Array2d.php b/libraries/sql-parser/src/Components/Array2d.php index e8da84b4f9..05981b36d1 100644 --- a/libraries/sql-parser/src/Components/Array2d.php +++ b/libraries/sql-parser/src/Components/Array2d.php @@ -4,12 +4,12 @@ * `VALUES` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `VALUES` keyword parser. diff --git a/libraries/sql-parser/src/Components/ArrayObj.php b/libraries/sql-parser/src/Components/ArrayObj.php index 8a046a8668..aa0cc7d521 100644 --- a/libraries/sql-parser/src/Components/ArrayObj.php +++ b/libraries/sql-parser/src/Components/ArrayObj.php @@ -4,12 +4,12 @@ * Parses an array. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses an array. diff --git a/libraries/sql-parser/src/Components/CaseExpression.php b/libraries/sql-parser/src/Components/CaseExpression.php index 0971ed8cec..d55809e741 100644 --- a/libraries/sql-parser/src/Components/CaseExpression.php +++ b/libraries/sql-parser/src/Components/CaseExpression.php @@ -4,12 +4,12 @@ * Parses a reference to a CASE expression. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses a reference to a CASE expression. diff --git a/libraries/sql-parser/src/Components/Condition.php b/libraries/sql-parser/src/Components/Condition.php index 1971c09b78..79899e8155 100644 --- a/libraries/sql-parser/src/Components/Condition.php +++ b/libraries/sql-parser/src/Components/Condition.php @@ -4,12 +4,12 @@ * `WHERE` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `WHERE` keyword parser. diff --git a/libraries/sql-parser/src/Components/CreateDefinition.php b/libraries/sql-parser/src/Components/CreateDefinition.php index 567602abd0..a69e9a5be4 100644 --- a/libraries/sql-parser/src/Components/CreateDefinition.php +++ b/libraries/sql-parser/src/Components/CreateDefinition.php @@ -6,13 +6,13 @@ * Used for parsing `CREATE TABLE` statement. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Context; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses the create definition of a column or a key. diff --git a/libraries/sql-parser/src/Components/DataType.php b/libraries/sql-parser/src/Components/DataType.php index 04ec79d755..561e70a400 100644 --- a/libraries/sql-parser/src/Components/DataType.php +++ b/libraries/sql-parser/src/Components/DataType.php @@ -4,12 +4,12 @@ * Parses a data type. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses a data type. diff --git a/libraries/sql-parser/src/Components/Expression.php b/libraries/sql-parser/src/Components/Expression.php index 9c71d25c08..b0a26b2cb7 100644 --- a/libraries/sql-parser/src/Components/Expression.php +++ b/libraries/sql-parser/src/Components/Expression.php @@ -5,13 +5,13 @@ * call, mathematical expression, etc.). */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Context; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses a reference to an expression (column, table or database name, function diff --git a/libraries/sql-parser/src/Components/ExpressionArray.php b/libraries/sql-parser/src/Components/ExpressionArray.php index 1901048c5e..7ce71020a8 100644 --- a/libraries/sql-parser/src/Components/ExpressionArray.php +++ b/libraries/sql-parser/src/Components/ExpressionArray.php @@ -4,12 +4,12 @@ * Parses a list of expressions delimited by a comma. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses a list of expressions delimited by a comma. diff --git a/libraries/sql-parser/src/Components/FunctionCall.php b/libraries/sql-parser/src/Components/FunctionCall.php index 3d9b33b6f3..8334676821 100644 --- a/libraries/sql-parser/src/Components/FunctionCall.php +++ b/libraries/sql-parser/src/Components/FunctionCall.php @@ -4,12 +4,12 @@ * Parses a function call. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses a function call. diff --git a/libraries/sql-parser/src/Components/IntoKeyword.php b/libraries/sql-parser/src/Components/IntoKeyword.php index c7d0d407b5..a8e80b4b01 100644 --- a/libraries/sql-parser/src/Components/IntoKeyword.php +++ b/libraries/sql-parser/src/Components/IntoKeyword.php @@ -4,12 +4,12 @@ * `INTO` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `INTO` keyword parser. diff --git a/libraries/sql-parser/src/Components/JoinKeyword.php b/libraries/sql-parser/src/Components/JoinKeyword.php index 8954482449..1f41ef752d 100644 --- a/libraries/sql-parser/src/Components/JoinKeyword.php +++ b/libraries/sql-parser/src/Components/JoinKeyword.php @@ -4,12 +4,12 @@ * `JOIN` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `JOIN` keyword parser. diff --git a/libraries/sql-parser/src/Components/Key.php b/libraries/sql-parser/src/Components/Key.php index a33122a59b..bc71f4d057 100644 --- a/libraries/sql-parser/src/Components/Key.php +++ b/libraries/sql-parser/src/Components/Key.php @@ -4,13 +4,13 @@ * Parses the definition of a key. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Context; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses the definition of a key. diff --git a/libraries/sql-parser/src/Components/Limit.php b/libraries/sql-parser/src/Components/Limit.php index d19294952d..e6571cf37d 100644 --- a/libraries/sql-parser/src/Components/Limit.php +++ b/libraries/sql-parser/src/Components/Limit.php @@ -4,12 +4,12 @@ * `LIMIT` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `LIMIT` keyword parser. diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index e7694b348e..cd348cb9eb 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -4,12 +4,12 @@ * Parses a list of options. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses a list of options. diff --git a/libraries/sql-parser/src/Components/OrderKeyword.php b/libraries/sql-parser/src/Components/OrderKeyword.php index 1a7a5f28d0..b17b115043 100644 --- a/libraries/sql-parser/src/Components/OrderKeyword.php +++ b/libraries/sql-parser/src/Components/OrderKeyword.php @@ -4,12 +4,12 @@ * `ORDER BY` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `ORDER BY` keyword parser. diff --git a/libraries/sql-parser/src/Components/ParameterDefinition.php b/libraries/sql-parser/src/Components/ParameterDefinition.php index bc74776ea3..1f3c929b17 100644 --- a/libraries/sql-parser/src/Components/ParameterDefinition.php +++ b/libraries/sql-parser/src/Components/ParameterDefinition.php @@ -4,13 +4,13 @@ * The definition of a parameter of a function or procedure. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Context; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * The definition of a parameter of a function or procedure. diff --git a/libraries/sql-parser/src/Components/PartitionDefinition.php b/libraries/sql-parser/src/Components/PartitionDefinition.php index c688f5531e..d346bd1bb3 100644 --- a/libraries/sql-parser/src/Components/PartitionDefinition.php +++ b/libraries/sql-parser/src/Components/PartitionDefinition.php @@ -6,12 +6,12 @@ * Used for parsing `CREATE TABLE` statement. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Parses the create definition of a partition. @@ -179,7 +179,7 @@ class PartitionDefinition extends Component $parser, $list, array( - 'type' => 'SqlParser\\Components\\PartitionDefinition', + 'type' => 'PhpMyAdmin\\SqlParser\\Components\\PartitionDefinition', ) ); ++$list->idx; diff --git a/libraries/sql-parser/src/Components/Reference.php b/libraries/sql-parser/src/Components/Reference.php index 447e3cfc7c..0f708fe4bf 100644 --- a/libraries/sql-parser/src/Components/Reference.php +++ b/libraries/sql-parser/src/Components/Reference.php @@ -4,13 +4,13 @@ * `REFERENCES` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Context; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Context; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `REFERENCES` keyword parser. diff --git a/libraries/sql-parser/src/Components/RenameOperation.php b/libraries/sql-parser/src/Components/RenameOperation.php index 84c4aed885..8a4e17eca6 100644 --- a/libraries/sql-parser/src/Components/RenameOperation.php +++ b/libraries/sql-parser/src/Components/RenameOperation.php @@ -4,12 +4,12 @@ * `RENAME TABLE` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `RENAME TABLE` keyword parser. diff --git a/libraries/sql-parser/src/Components/SetOperation.php b/libraries/sql-parser/src/Components/SetOperation.php index 2bd600bbbc..c0c83e67cf 100644 --- a/libraries/sql-parser/src/Components/SetOperation.php +++ b/libraries/sql-parser/src/Components/SetOperation.php @@ -4,12 +4,12 @@ * `SET` keyword parser. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `SET` keyword parser. diff --git a/libraries/sql-parser/src/Components/UnionKeyword.php b/libraries/sql-parser/src/Components/UnionKeyword.php index 8e4923a773..e875cbbfdb 100644 --- a/libraries/sql-parser/src/Components/UnionKeyword.php +++ b/libraries/sql-parser/src/Components/UnionKeyword.php @@ -4,10 +4,10 @@ * `UNION` keyword builder. */ -namespace SqlParser\Components; +namespace PhpMyAdmin\SqlParser\Components; -use SqlParser\Component; -use SqlParser\Statements\SelectStatement; +use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Statements\SelectStatement; /** * `UNION` keyword builder. diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index 3ea42debc6..b9d98fc8b8 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -7,7 +7,7 @@ * parsing. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; /** * Holds the configuration of the context that is currently used. @@ -51,14 +51,14 @@ abstract class Context * * @var string */ - public static $defaultContext = '\\SqlParser\\Contexts\\ContextMySql50700'; + public static $defaultContext = '\\PhpMyAdmin\\SqlParser\\Contexts\\ContextMySql50700'; /** * The name of the loaded context. * * @var string */ - public static $loadedContext = '\\SqlParser\\Contexts\\ContextMySql50700'; + public static $loadedContext = '\\PhpMyAdmin\\SqlParser\\Contexts\\ContextMySql50700'; /** * The prefix concatenated to the context name when an incomplete class name @@ -66,7 +66,7 @@ abstract class Context * * @var string */ - public static $contextPrefix = '\\SqlParser\\Contexts\\Context'; + public static $contextPrefix = '\\PhpMyAdmin\\SqlParser\\Contexts\\Context'; /** * List of keywords. diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index 5044ad7833..2ed30353d8 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -8,9 +8,9 @@ * @see https://dev.mysql.com/doc/refman/5.0/en/keywords.html */ -namespace SqlParser\Contexts; +namespace PhpMyAdmin\SqlParser\Contexts; -use SqlParser\Context; +use PhpMyAdmin\SqlParser\Context; /** * Context for MySQL 5. diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index cb1c0cd551..e6d9ed3b6d 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -8,9 +8,9 @@ * @see https://dev.mysql.com/doc/refman/5.1/en/keywords.html */ -namespace SqlParser\Contexts; +namespace PhpMyAdmin\SqlParser\Contexts; -use SqlParser\Context; +use PhpMyAdmin\SqlParser\Context; /** * Context for MySQL 5.1. diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index ed4dd1f822..370319f645 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -8,9 +8,9 @@ * @see https://dev.mysql.com/doc/refman/5.5/en/keywords.html */ -namespace SqlParser\Contexts; +namespace PhpMyAdmin\SqlParser\Contexts; -use SqlParser\Context; +use PhpMyAdmin\SqlParser\Context; /** * Context for MySQL 5.5. diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index af7fe40356..3994a75bd6 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -8,9 +8,9 @@ * @see https://dev.mysql.com/doc/refman/5.6/en/keywords.html */ -namespace SqlParser\Contexts; +namespace PhpMyAdmin\SqlParser\Contexts; -use SqlParser\Context; +use PhpMyAdmin\SqlParser\Context; /** * Context for MySQL 5.6. diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 39057601c4..fbc276d911 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -8,9 +8,9 @@ * @see https://dev.mysql.com/doc/refman/5.7/en/keywords.html */ -namespace SqlParser\Contexts; +namespace PhpMyAdmin\SqlParser\Contexts; -use SqlParser\Context; +use PhpMyAdmin\SqlParser\Context; /** * Context for MySQL 5.7. diff --git a/libraries/sql-parser/src/Exceptions/LexerException.php b/libraries/sql-parser/src/Exceptions/LexerException.php index e60c332fdf..61e88c9b64 100644 --- a/libraries/sql-parser/src/Exceptions/LexerException.php +++ b/libraries/sql-parser/src/Exceptions/LexerException.php @@ -4,7 +4,7 @@ * Exception thrown by the lexer. */ -namespace SqlParser\Exceptions; +namespace PhpMyAdmin\SqlParser\Exceptions; /** * Exception thrown by the lexer. diff --git a/libraries/sql-parser/src/Exceptions/ParserException.php b/libraries/sql-parser/src/Exceptions/ParserException.php index 07f30c7440..eb1365342d 100644 --- a/libraries/sql-parser/src/Exceptions/ParserException.php +++ b/libraries/sql-parser/src/Exceptions/ParserException.php @@ -4,9 +4,9 @@ * Exception thrown by the parser. */ -namespace SqlParser\Exceptions; +namespace PhpMyAdmin\SqlParser\Exceptions; -use SqlParser\Token; +use PhpMyAdmin\SqlParser\Token; /** * Exception thrown by the parser. diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index 8222013a54..cbdcb7d7e8 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -8,11 +8,11 @@ * Depends on context to extract lexemes. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; require_once 'common.php'; -use SqlParser\Exceptions\LexerException; +use PhpMyAdmin\SqlParser\Exceptions\LexerException; if (!defined('USE_UTF_STRINGS')) { // NOTE: In previous versions of PHP (5.5 and older) the default @@ -572,6 +572,7 @@ class Lexer ) { $token .= $this->str[$this->last]; } + return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_BASH); } diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 1ad5bb8eb8..eb719554ca 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -6,13 +6,13 @@ * This is one of the most important components, along with the lexer. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; require_once 'common.php'; -use SqlParser\Exceptions\ParserException; -use SqlParser\Statements\SelectStatement; -use SqlParser\Statements\TransactionStatement; +use PhpMyAdmin\SqlParser\Exceptions\ParserException; +use PhpMyAdmin\SqlParser\Statements\SelectStatement; +use PhpMyAdmin\SqlParser\Statements\TransactionStatement; /** * Takes multiple tokens (contained in a Lexer instance) as input and builds a @@ -31,9 +31,9 @@ class Parser */ public static $STATEMENT_PARSERS = array( // MySQL Utility Statements - 'DESCRIBE' => 'SqlParser\\Statements\\ExplainStatement', - 'DESC' => 'SqlParser\\Statements\\ExplainStatement', - 'EXPLAIN' => 'SqlParser\\Statements\\ExplainStatement', + 'DESCRIBE' => 'PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement', + 'DESC' => 'PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement', + 'EXPLAIN' => 'PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement', 'FLUSH' => '', 'GRANT' => '', 'HELP' => '', @@ -43,38 +43,38 @@ class Parser // Table Maintenance Statements // https://dev.mysql.com/doc/refman/5.7/en/table-maintenance-sql.html - 'ANALYZE' => 'SqlParser\\Statements\\AnalyzeStatement', - 'BACKUP' => 'SqlParser\\Statements\\BackupStatement', - 'CHECK' => 'SqlParser\\Statements\\CheckStatement', - 'CHECKSUM' => 'SqlParser\\Statements\\ChecksumStatement', - 'OPTIMIZE' => 'SqlParser\\Statements\\OptimizeStatement', - 'REPAIR' => 'SqlParser\\Statements\\RepairStatement', - 'RESTORE' => 'SqlParser\\Statements\\RestoreStatement', + 'ANALYZE' => 'PhpMyAdmin\\SqlParser\\Statements\\AnalyzeStatement', + 'BACKUP' => 'PhpMyAdmin\\SqlParser\\Statements\\BackupStatement', + 'CHECK' => 'PhpMyAdmin\\SqlParser\\Statements\\CheckStatement', + 'CHECKSUM' => 'PhpMyAdmin\\SqlParser\\Statements\\ChecksumStatement', + 'OPTIMIZE' => 'PhpMyAdmin\\SqlParser\\Statements\\OptimizeStatement', + 'REPAIR' => 'PhpMyAdmin\\SqlParser\\Statements\\RepairStatement', + 'RESTORE' => 'PhpMyAdmin\\SqlParser\\Statements\\RestoreStatement', // Database Administration Statements // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-server-administration.html - 'SET' => 'SqlParser\\Statements\\SetStatement', - 'SHOW' => 'SqlParser\\Statements\\ShowStatement', + 'SET' => 'PhpMyAdmin\\SqlParser\\Statements\\SetStatement', + 'SHOW' => 'PhpMyAdmin\\SqlParser\\Statements\\ShowStatement', // Data Definition Statements. // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-data-definition.html - 'ALTER' => 'SqlParser\\Statements\\AlterStatement', - 'CREATE' => 'SqlParser\\Statements\\CreateStatement', - 'DROP' => 'SqlParser\\Statements\\DropStatement', - 'RENAME' => 'SqlParser\\Statements\\RenameStatement', - 'TRUNCATE' => 'SqlParser\\Statements\\TruncateStatement', + 'ALTER' => 'PhpMyAdmin\\SqlParser\\Statements\\AlterStatement', + 'CREATE' => 'PhpMyAdmin\\SqlParser\\Statements\\CreateStatement', + 'DROP' => 'PhpMyAdmin\\SqlParser\\Statements\\DropStatement', + 'RENAME' => 'PhpMyAdmin\\SqlParser\\Statements\\RenameStatement', + 'TRUNCATE' => 'PhpMyAdmin\\SqlParser\\Statements\\TruncateStatement', // Data Manipulation Statements. // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-data-manipulation.html - 'CALL' => 'SqlParser\\Statements\\CallStatement', - 'DELETE' => 'SqlParser\\Statements\\DeleteStatement', + 'CALL' => 'PhpMyAdmin\\SqlParser\\Statements\\CallStatement', + 'DELETE' => 'PhpMyAdmin\\SqlParser\\Statements\\DeleteStatement', 'DO' => '', 'HANDLER' => '', - 'INSERT' => 'SqlParser\\Statements\\InsertStatement', + 'INSERT' => 'PhpMyAdmin\\SqlParser\\Statements\\InsertStatement', 'LOAD' => '', - 'REPLACE' => 'SqlParser\\Statements\\ReplaceStatement', - 'SELECT' => 'SqlParser\\Statements\\SelectStatement', - 'UPDATE' => 'SqlParser\\Statements\\UpdateStatement', + 'REPLACE' => 'PhpMyAdmin\\SqlParser\\Statements\\ReplaceStatement', + 'SELECT' => 'PhpMyAdmin\\SqlParser\\Statements\\SelectStatement', + 'UPDATE' => 'PhpMyAdmin\\SqlParser\\Statements\\UpdateStatement', // Prepared Statements. // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-prepared-statements.html @@ -84,10 +84,10 @@ class Parser // Transactional and Locking Statements // https://dev.mysql.com/doc/refman/5.7/en/commit.html - 'BEGIN' => 'SqlParser\\Statements\\TransactionStatement', - 'COMMIT' => 'SqlParser\\Statements\\TransactionStatement', - 'ROLLBACK' => 'SqlParser\\Statements\\TransactionStatement', - 'START TRANSACTION' => 'SqlParser\\Statements\\TransactionStatement', + 'BEGIN' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement', + 'COMMIT' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement', + 'ROLLBACK' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement', + 'START TRANSACTION' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement', ); /** @@ -104,203 +104,203 @@ class Parser // This is not a proper keyword and was added here to help the // builder. '_OPTIONS' => array( - 'class' => 'SqlParser\\Components\\OptionsArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\OptionsArray', 'field' => 'options', ), '_END_OPTIONS' => array( - 'class' => 'SqlParser\\Components\\OptionsArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\OptionsArray', 'field' => 'end_options', ), 'UNION' => array( - 'class' => 'SqlParser\\Components\\UnionKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\UnionKeyword', 'field' => 'union', ), 'UNION ALL' => array( - 'class' => 'SqlParser\\Components\\UnionKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\UnionKeyword', 'field' => 'union', ), 'UNION DISTINCT' => array( - 'class' => 'SqlParser\\Components\\UnionKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\UnionKeyword', 'field' => 'union', ), // Actual clause parsers. 'ALTER' => array( - 'class' => 'SqlParser\\Components\\Expression', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Expression', 'field' => 'table', 'options' => array('parseField' => 'table'), ), 'ANALYZE' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'BACKUP' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'CALL' => array( - 'class' => 'SqlParser\\Components\\FunctionCall', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\FunctionCall', 'field' => 'call', ), 'CHECK' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'CHECKSUM' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'CROSS JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'DROP' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'fields', 'options' => array('parseField' => 'table'), ), 'FROM' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'from', 'options' => array('field' => 'table'), ), 'GROUP BY' => array( - 'class' => 'SqlParser\\Components\\OrderKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\OrderKeyword', 'field' => 'group', ), 'HAVING' => array( - 'class' => 'SqlParser\\Components\\Condition', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Condition', 'field' => 'having', ), 'INTO' => array( - 'class' => 'SqlParser\\Components\\IntoKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\IntoKeyword', 'field' => 'into', ), 'JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'LEFT JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'LEFT OUTER JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'ON' => array( - 'class' => 'SqlParser\\Components\\Expression', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Expression', 'field' => 'table', 'options' => array('parseField' => 'table'), ), 'RIGHT JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'RIGHT OUTER JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'INNER JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'FULL JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'FULL OUTER JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'NATURAL JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'NATURAL LEFT JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'NATURAL RIGHT JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'NATURAL LEFT OUTER JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'NATURAL RIGHT OUTER JOIN' => array( - 'class' => 'SqlParser\\Components\\JoinKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'LIMIT' => array( - 'class' => 'SqlParser\\Components\\Limit', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Limit', 'field' => 'limit', ), 'OPTIMIZE' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'ORDER BY' => array( - 'class' => 'SqlParser\\Components\\OrderKeyword', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\OrderKeyword', 'field' => 'order', ), 'PARTITION' => array( - 'class' => 'SqlParser\\Components\\ArrayObj', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ArrayObj', 'field' => 'partition', ), 'PROCEDURE' => array( - 'class' => 'SqlParser\\Components\\FunctionCall', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\FunctionCall', 'field' => 'procedure', ), 'RENAME' => array( - 'class' => 'SqlParser\\Components\\RenameOperation', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\RenameOperation', 'field' => 'renames', ), 'REPAIR' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'RESTORE' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'SET' => array( - 'class' => 'SqlParser\\Components\\SetOperation', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\SetOperation', 'field' => 'set', ), 'SELECT' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'expr', ), 'TRUNCATE' => array( - 'class' => 'SqlParser\\Components\\Expression', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Expression', 'field' => 'table', 'options' => array('parseField' => 'table'), ), 'UPDATE' => array( - 'class' => 'SqlParser\\Components\\ExpressionArray', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('parseField' => 'table'), ), 'VALUE' => array( - 'class' => 'SqlParser\\Components\\Array2d', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Array2d', 'field' => 'values', ), 'VALUES' => array( - 'class' => 'SqlParser\\Components\\Array2d', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Array2d', 'field' => 'values', ), 'WHERE' => array( - 'class' => 'SqlParser\\Components\\Condition', + 'class' => 'PhpMyAdmin\\SqlParser\\Components\\Condition', 'field' => 'where', ), ); diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index a907b99942..1539b323da 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -7,9 +7,9 @@ * A statement represents the result of parsing the lexemes. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; -use SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * Abstract statement definition. @@ -255,7 +255,7 @@ abstract class Statement // ON DUPLICATE KEY UPDATE ... // has to be parsed in parent statement (INSERT or REPLACE) // so look for it and break - if (get_class($this) === 'SqlParser\Statements\SelectStatement' + if (get_class($this) === 'PhpMyAdmin\SqlParser\Statements\SelectStatement' && $token->value === 'ON' ) { ++$list->idx; // Skip ON @@ -351,7 +351,7 @@ abstract class Statement } elseif ($class === null) { // Handle special end options in Select statement // See Statements\SelectStatement::$END_OPTIONS - if (get_class($this) === 'SqlParser\Statements\SelectStatement' + if (get_class($this) === 'PhpMyAdmin\SqlParser\Statements\SelectStatement' && ($token->value === 'FOR UPDATE' || $token->value === 'LOCK IN SHARE MODE') ) { diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index 487ad4325c..e1fbc9052b 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -4,15 +4,15 @@ * `ALTER` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Components\AlterOperation; -use SqlParser\Components\Expression; -use SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\AlterOperation; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * `ALTER` statement. diff --git a/libraries/sql-parser/src/Statements/AnalyzeStatement.php b/libraries/sql-parser/src/Statements/AnalyzeStatement.php index aaa5850bfd..1b36fc164a 100644 --- a/libraries/sql-parser/src/Statements/AnalyzeStatement.php +++ b/libraries/sql-parser/src/Statements/AnalyzeStatement.php @@ -4,10 +4,10 @@ * `ANALYZE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Expression; /** * `ANALYZE` statement. diff --git a/libraries/sql-parser/src/Statements/BackupStatement.php b/libraries/sql-parser/src/Statements/BackupStatement.php index b207a4286e..bef39d4c3a 100644 --- a/libraries/sql-parser/src/Statements/BackupStatement.php +++ b/libraries/sql-parser/src/Statements/BackupStatement.php @@ -4,7 +4,7 @@ * `BACKUP` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `BACKUP` statement. diff --git a/libraries/sql-parser/src/Statements/CallStatement.php b/libraries/sql-parser/src/Statements/CallStatement.php index 80e49d35e2..0b0f29ea94 100644 --- a/libraries/sql-parser/src/Statements/CallStatement.php +++ b/libraries/sql-parser/src/Statements/CallStatement.php @@ -4,10 +4,10 @@ * `CALL` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\FunctionCall; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\FunctionCall; /** * `CALL` statement. diff --git a/libraries/sql-parser/src/Statements/CheckStatement.php b/libraries/sql-parser/src/Statements/CheckStatement.php index 6d852cc092..dd4b13431d 100644 --- a/libraries/sql-parser/src/Statements/CheckStatement.php +++ b/libraries/sql-parser/src/Statements/CheckStatement.php @@ -4,7 +4,7 @@ * `CHECK` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `CHECK` statement. diff --git a/libraries/sql-parser/src/Statements/ChecksumStatement.php b/libraries/sql-parser/src/Statements/ChecksumStatement.php index d8001e6880..b400e485fb 100644 --- a/libraries/sql-parser/src/Statements/ChecksumStatement.php +++ b/libraries/sql-parser/src/Statements/ChecksumStatement.php @@ -4,7 +4,7 @@ * `CHECKSUM` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `CHECKSUM` statement. diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 891fb50a58..c3217fd68f 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -4,19 +4,19 @@ * `CREATE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Components\ArrayObj; -use SqlParser\Components\DataType; -use SqlParser\Components\CreateDefinition; -use SqlParser\Components\PartitionDefinition; -use SqlParser\Components\Expression; -use SqlParser\Components\OptionsArray; -use SqlParser\Components\ParameterDefinition; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\ArrayObj; +use PhpMyAdmin\SqlParser\Components\DataType; +use PhpMyAdmin\SqlParser\Components\CreateDefinition; +use PhpMyAdmin\SqlParser\Components\PartitionDefinition; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Components\ParameterDefinition; /** * `CREATE` statement. @@ -531,7 +531,7 @@ class CreateStatement extends Statement $parser, $list, array( - 'type' => 'SqlParser\\Components\\PartitionDefinition', + 'type' => 'PhpMyAdmin\\SqlParser\\Components\\PartitionDefinition', ) ); } diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php index 621d032166..39b9282dab 100644 --- a/libraries/sql-parser/src/Statements/DeleteStatement.php +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -4,19 +4,19 @@ * `DELETE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Components\ArrayObj; -use SqlParser\Components\Expression; -use SqlParser\Components\ExpressionArray; -use SqlParser\Components\Limit; -use SqlParser\Components\OrderKeyword; -use SqlParser\Components\Condition; -use SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\ArrayObj; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\ExpressionArray; +use PhpMyAdmin\SqlParser\Components\Limit; +use PhpMyAdmin\SqlParser\Components\OrderKeyword; +use PhpMyAdmin\SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * `DELETE` statement. diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php index ebcae4a75c..4231aa6508 100644 --- a/libraries/sql-parser/src/Statements/DropStatement.php +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -4,10 +4,10 @@ * `DROP` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Expression; /** * `DROP` statement. diff --git a/libraries/sql-parser/src/Statements/ExplainStatement.php b/libraries/sql-parser/src/Statements/ExplainStatement.php index 482f53f143..96a5828674 100644 --- a/libraries/sql-parser/src/Statements/ExplainStatement.php +++ b/libraries/sql-parser/src/Statements/ExplainStatement.php @@ -4,7 +4,7 @@ * `EXPLAIN` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `EXPLAIN` statement. diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php index 6c76df6468..a4b3555e40 100644 --- a/libraries/sql-parser/src/Statements/InsertStatement.php +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -4,16 +4,16 @@ * `INSERT` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Statement; -use SqlParser\Components\IntoKeyword; -use SqlParser\Components\Array2d; -use SqlParser\Components\OptionsArray; -use SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\IntoKeyword; +use PhpMyAdmin\SqlParser\Components\Array2d; +use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Components\SetOperation; /** * `INSERT` statement. diff --git a/libraries/sql-parser/src/Statements/MaintenanceStatement.php b/libraries/sql-parser/src/Statements/MaintenanceStatement.php index 5ce55d656d..c1b3aaaeca 100644 --- a/libraries/sql-parser/src/Statements/MaintenanceStatement.php +++ b/libraries/sql-parser/src/Statements/MaintenanceStatement.php @@ -4,14 +4,14 @@ * Maintenance statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Components\Expression; -use SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * Maintenance statement. diff --git a/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/libraries/sql-parser/src/Statements/NotImplementedStatement.php index 6796af778a..e534cdfe45 100644 --- a/libraries/sql-parser/src/Statements/NotImplementedStatement.php +++ b/libraries/sql-parser/src/Statements/NotImplementedStatement.php @@ -4,12 +4,12 @@ * Not implemented (yet) statements. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Not implemented (yet) statements. diff --git a/libraries/sql-parser/src/Statements/OptimizeStatement.php b/libraries/sql-parser/src/Statements/OptimizeStatement.php index 7fd7045afe..7e28ad1708 100644 --- a/libraries/sql-parser/src/Statements/OptimizeStatement.php +++ b/libraries/sql-parser/src/Statements/OptimizeStatement.php @@ -4,10 +4,10 @@ * `OPTIMIZE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Expression; /** * `OPTIMIZE` statement. diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php index e14223c6cc..7e47fbd254 100644 --- a/libraries/sql-parser/src/Statements/RenameStatement.php +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -4,13 +4,13 @@ * `RENAME` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Components\RenameOperation; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\RenameOperation; /** * `RENAME` statement. diff --git a/libraries/sql-parser/src/Statements/RepairStatement.php b/libraries/sql-parser/src/Statements/RepairStatement.php index f4ce53d54c..c16d603311 100644 --- a/libraries/sql-parser/src/Statements/RepairStatement.php +++ b/libraries/sql-parser/src/Statements/RepairStatement.php @@ -4,7 +4,7 @@ * `REPAIR` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `REPAIR` statement. diff --git a/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index 0b4af1385e..28bba5bf49 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -4,16 +4,16 @@ * `REPLACE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Statement; -use SqlParser\Components\Array2d; -use SqlParser\Components\IntoKeyword; -use SqlParser\Components\OptionsArray; -use SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Array2d; +use PhpMyAdmin\SqlParser\Components\IntoKeyword; +use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Components\SetOperation; /** * `REPLACE` statement. @@ -117,8 +117,6 @@ class ReplaceStatement extends Statement ); ++$list->idx; - $token = $list->tokens[$list->idx]; - /** * The state of the parser. * diff --git a/libraries/sql-parser/src/Statements/RestoreStatement.php b/libraries/sql-parser/src/Statements/RestoreStatement.php index 720f907044..db07ac4b54 100644 --- a/libraries/sql-parser/src/Statements/RestoreStatement.php +++ b/libraries/sql-parser/src/Statements/RestoreStatement.php @@ -4,7 +4,7 @@ * `RESTORE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `RESTORE` statement. diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 511334c6da..d3d9ee291f 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -4,17 +4,17 @@ * `SELECT` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\ArrayObj; -use SqlParser\Components\FunctionCall; -use SqlParser\Components\Expression; -use SqlParser\Components\IntoKeyword; -use SqlParser\Components\JoinKeyword; -use SqlParser\Components\Limit; -use SqlParser\Components\OrderKeyword; -use SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\ArrayObj; +use PhpMyAdmin\SqlParser\Components\FunctionCall; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\IntoKeyword; +use PhpMyAdmin\SqlParser\Components\JoinKeyword; +use PhpMyAdmin\SqlParser\Components\Limit; +use PhpMyAdmin\SqlParser\Components\OrderKeyword; +use PhpMyAdmin\SqlParser\Components\Condition; /** * `SELECT` statement. diff --git a/libraries/sql-parser/src/Statements/SetStatement.php b/libraries/sql-parser/src/Statements/SetStatement.php index 5329b07c1f..4978a5624d 100644 --- a/libraries/sql-parser/src/Statements/SetStatement.php +++ b/libraries/sql-parser/src/Statements/SetStatement.php @@ -4,11 +4,11 @@ * `SET` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\SetOperation; -use SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * `SET` statement. diff --git a/libraries/sql-parser/src/Statements/ShowStatement.php b/libraries/sql-parser/src/Statements/ShowStatement.php index be233a70ca..1568177687 100644 --- a/libraries/sql-parser/src/Statements/ShowStatement.php +++ b/libraries/sql-parser/src/Statements/ShowStatement.php @@ -4,7 +4,7 @@ * `SHOW` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; /** * `SHOW` statement. diff --git a/libraries/sql-parser/src/Statements/TransactionStatement.php b/libraries/sql-parser/src/Statements/TransactionStatement.php index 9e11daaf74..6ae0c95223 100644 --- a/libraries/sql-parser/src/Statements/TransactionStatement.php +++ b/libraries/sql-parser/src/Statements/TransactionStatement.php @@ -4,12 +4,12 @@ * Transaction statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\TokensList; -use SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * Transaction statement. diff --git a/libraries/sql-parser/src/Statements/TruncateStatement.php b/libraries/sql-parser/src/Statements/TruncateStatement.php index 20ad4b84a7..6f58929a0e 100644 --- a/libraries/sql-parser/src/Statements/TruncateStatement.php +++ b/libraries/sql-parser/src/Statements/TruncateStatement.php @@ -4,10 +4,10 @@ * `TRUNCATE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Expression; /** * `TRUNCATE` statement. diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php index 796a722fad..768374fa3e 100644 --- a/libraries/sql-parser/src/Statements/UpdateStatement.php +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -4,14 +4,14 @@ * `UPDATE` statement. */ -namespace SqlParser\Statements; +namespace PhpMyAdmin\SqlParser\Statements; -use SqlParser\Statement; -use SqlParser\Components\Expression; -use SqlParser\Components\Limit; -use SqlParser\Components\OrderKeyword; -use SqlParser\Components\SetOperation; -use SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\Limit; +use PhpMyAdmin\SqlParser\Components\OrderKeyword; +use PhpMyAdmin\SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Components\Condition; /** * `UPDATE` statement. diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index d8472245ee..db56aff215 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -6,7 +6,7 @@ * An array of tokens will result after parsing the query. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; /** * A structure representing a lexeme that explicitly indicates its diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index 512fcb566a..6ddce49066 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -4,7 +4,7 @@ * Defines an array of tokens and utility functions to iterate through it. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; /** * A structure representing a list of tokens. diff --git a/libraries/sql-parser/src/UtfString.php b/libraries/sql-parser/src/UtfString.php index 91aa19e72a..e3dc5126f2 100644 --- a/libraries/sql-parser/src/UtfString.php +++ b/libraries/sql-parser/src/UtfString.php @@ -11,7 +11,7 @@ * implemented. */ -namespace SqlParser; +namespace PhpMyAdmin\SqlParser; /** * Implements array-like access for UTF-8 strings. diff --git a/libraries/sql-parser/src/Utils/BufferedQuery.php b/libraries/sql-parser/src/Utils/BufferedQuery.php index 045513d49f..acd11e0a62 100644 --- a/libraries/sql-parser/src/Utils/BufferedQuery.php +++ b/libraries/sql-parser/src/Utils/BufferedQuery.php @@ -4,9 +4,9 @@ * Buffered query utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Context; +use PhpMyAdmin\SqlParser\Context; /** * Buffer query utilities. diff --git a/libraries/sql-parser/src/Utils/CLI.php b/libraries/sql-parser/src/Utils/CLI.php index a5ed0be8df..b66cc8d877 100644 --- a/libraries/sql-parser/src/Utils/CLI.php +++ b/libraries/sql-parser/src/Utils/CLI.php @@ -4,10 +4,10 @@ * CLI interface. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Parser; -use SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Lexer; /** * CLI interface. diff --git a/libraries/sql-parser/src/Utils/Error.php b/libraries/sql-parser/src/Utils/Error.php index 568af0afcd..f80daa30e3 100644 --- a/libraries/sql-parser/src/Utils/Error.php +++ b/libraries/sql-parser/src/Utils/Error.php @@ -4,10 +4,10 @@ * Error related utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Lexer; -use SqlParser\Parser; +use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; /** * Error related utilities. diff --git a/libraries/sql-parser/src/Utils/Formatter.php b/libraries/sql-parser/src/Utils/Formatter.php index b488a6a67a..4e0fd0ed7a 100644 --- a/libraries/sql-parser/src/Utils/Formatter.php +++ b/libraries/sql-parser/src/Utils/Formatter.php @@ -4,12 +4,12 @@ * Utilities that are used for formatting queries. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Lexer; -use SqlParser\Parser; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Utilities that are used for formatting queries. @@ -334,7 +334,7 @@ class Formatter /** * Token parsed at this moment. * - * @var Token $curr + * @var Token */ $curr = $list->tokens[$list->idx]; @@ -349,10 +349,8 @@ class Formatter } // Checking if pointers were initialized. - /** + /* * Previous Token. - * - * @var Token $prev */ if ($prev !== null) { // Checking if a new clause started. diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 84ec3d183b..9374db336b 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -4,10 +4,10 @@ * Miscellaneous utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Components\Expression; -use SqlParser\Statements\SelectStatement; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statements\SelectStatement; /** * Miscellaneous utilities. diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index 1a5162de00..32bc96d21b 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -4,32 +4,32 @@ * Statement utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Lexer; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Components\Expression; -use SqlParser\Statements\AlterStatement; -use SqlParser\Statements\AnalyzeStatement; -use SqlParser\Statements\CallStatement; -use SqlParser\Statements\CheckStatement; -use SqlParser\Statements\ChecksumStatement; -use SqlParser\Statements\CreateStatement; -use SqlParser\Statements\DeleteStatement; -use SqlParser\Statements\DropStatement; -use SqlParser\Statements\ExplainStatement; -use SqlParser\Statements\InsertStatement; -use SqlParser\Statements\OptimizeStatement; -use SqlParser\Statements\RenameStatement; -use SqlParser\Statements\RepairStatement; -use SqlParser\Statements\ReplaceStatement; -use SqlParser\Statements\SelectStatement; -use SqlParser\Statements\ShowStatement; -use SqlParser\Statements\TruncateStatement; -use SqlParser\Statements\UpdateStatement; +use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statements\AlterStatement; +use PhpMyAdmin\SqlParser\Statements\AnalyzeStatement; +use PhpMyAdmin\SqlParser\Statements\CallStatement; +use PhpMyAdmin\SqlParser\Statements\CheckStatement; +use PhpMyAdmin\SqlParser\Statements\ChecksumStatement; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Statements\DeleteStatement; +use PhpMyAdmin\SqlParser\Statements\DropStatement; +use PhpMyAdmin\SqlParser\Statements\ExplainStatement; +use PhpMyAdmin\SqlParser\Statements\InsertStatement; +use PhpMyAdmin\SqlParser\Statements\OptimizeStatement; +use PhpMyAdmin\SqlParser\Statements\RenameStatement; +use PhpMyAdmin\SqlParser\Statements\RepairStatement; +use PhpMyAdmin\SqlParser\Statements\ReplaceStatement; +use PhpMyAdmin\SqlParser\Statements\SelectStatement; +use PhpMyAdmin\SqlParser\Statements\ShowStatement; +use PhpMyAdmin\SqlParser\Statements\TruncateStatement; +use PhpMyAdmin\SqlParser\Statements\UpdateStatement; /** * Statement utilities. diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 5b0d5b95ff..4413f9ab18 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -4,13 +4,13 @@ * Routine utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Lexer; -use SqlParser\Parser; -use SqlParser\Components\DataType; -use SqlParser\Components\ParameterDefinition; -use SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Components\DataType; +use PhpMyAdmin\SqlParser\Components\ParameterDefinition; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; /** * Routine utilities. diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index 58d4366460..7624974091 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -4,9 +4,9 @@ * Table utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Statements\CreateStatement; +use PhpMyAdmin\SqlParser\Statements\CreateStatement; /** * Table utilities. diff --git a/libraries/sql-parser/src/Utils/Tokens.php b/libraries/sql-parser/src/Utils/Tokens.php index 4637ed1680..6520a7939b 100644 --- a/libraries/sql-parser/src/Utils/Tokens.php +++ b/libraries/sql-parser/src/Utils/Tokens.php @@ -4,11 +4,11 @@ * Token utilities. */ -namespace SqlParser\Utils; +namespace PhpMyAdmin\SqlParser\Utils; -use SqlParser\Lexer; -use SqlParser\Token; -use SqlParser\TokensList; +use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Token utilities. diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index c61452660f..a639faec7c 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -61,19 +61,19 @@ function PMA_handleSortOrder( ); // Create the new query. - $full_sql_query = SqlParser\Utils\Query::replaceClause( + $full_sql_query = PhpMyAdmin\SqlParser\Utils\Query::replaceClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'ORDER BY ' . $sortCol ); // TODO: Avoid reparsing the query. - $analyzed_sql_results = SqlParser\Utils\Query::getAll($full_sql_query); + $analyzed_sql_results = PhpMyAdmin\SqlParser\Utils\Query::getAll($full_sql_query); } else { // Store the remembered table into session. $pmatable->setUiProp( Table::PROP_SORTED_COLUMN, - SqlParser\Utils\Query::getClause( + PhpMyAdmin\SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'ORDER BY' @@ -91,7 +91,7 @@ function PMA_handleSortOrder( */ function PMA_getSqlWithLimitClause(&$analyzed_sql_results) { - return SqlParser\Utils\Query::replaceClause( + return PhpMyAdmin\SqlParser\Utils\Query::replaceClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'LIMIT ' . $_SESSION['tmpval']['pos'] . ', ' @@ -1156,7 +1156,7 @@ function PMA_countQueryResults( // For UNION statements, only a SQL_CALC_FOUND_ROWS is required // after the first SELECT. - $count_query = SqlParser\Utils\Query::replaceClause( + $count_query = PhpMyAdmin\SqlParser\Utils\Query::replaceClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'SELECT SQL_CALC_FOUND_ROWS', @@ -1299,7 +1299,7 @@ function PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results) { include_once 'libraries/transformations.lib.php'; $statement = $analyzed_sql_results['statement']; - if ($statement instanceof SqlParser\Statements\AlterStatement) { + if ($statement instanceof PhpMyAdmin\SqlParser\Statements\AlterStatement) { if (!empty($statement->altered[0]) && $statement->altered[0]->options->has('DROP') ) { @@ -1311,7 +1311,7 @@ function PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results) ); } } - } elseif ($statement instanceof SqlParser\Statements\DropStatement) { + } elseif ($statement instanceof PhpMyAdmin\SqlParser\Statements\DropStatement) { PMA_clearTransformations($db, $table); } } @@ -1867,7 +1867,7 @@ function PMA_getQueryResponseForResultsReturned($result, $analyzed_sql_results, $updatableView = false; $statement = $analyzed_sql_results['statement']; - if ($statement instanceof SqlParser\Statements\SelectStatement) { + if ($statement instanceof PhpMyAdmin\SqlParser\Statements\SelectStatement) { if (!empty($statement->expr)) { if ($statement->expr[0]->expr === '*') { $_table = new Table($table, $db); diff --git a/tbl_export.php b/tbl_export.php index 740e2249fa..6ad16df3ce 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -47,10 +47,10 @@ $export_page_title = __('View dump (schema) of table'); // generate WHERE clause (if we are asked to export specific rows) if (! empty($sql_query)) { - $parser = new SqlParser\Parser($sql_query); + $parser = new PhpMyAdmin\SqlParser\Parser($sql_query); if ((!empty($parser->statements[0])) - && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement) + && ($parser->statements[0] instanceof PhpMyAdmin\SqlParser\Statements\SelectStatement) ) { // Finding aliases and removing them, but we keep track of them to be @@ -72,7 +72,7 @@ if (! empty($sql_query)) { ) { $replaces = array( array( - 'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build( + 'FROM', 'FROM ' . PhpMyAdmin\SqlParser\Components\ExpressionArray::build( $parser->statements[0]->from ), ), @@ -90,33 +90,33 @@ if (! empty($sql_query)) { $replaces[] = array('LIMIT', ''); // Replacing the clauses. - $sql_query = SqlParser\Utils\Query::replaceClauses( + $sql_query = PhpMyAdmin\SqlParser\Utils\Query::replaceClauses( $parser->statements[0], $parser->list, $replaces ); // Removing the aliases by finding the alias followed by a dot. - $tokens = SqlParser\Lexer::getTokens($sql_query); + $tokens = PhpMyAdmin\SqlParser\Lexer::getTokens($sql_query); foreach ($aliases as $alias => $table) { - $tokens = SqlParser\Utils\Tokens::replaceTokens( + $tokens = PhpMyAdmin\SqlParser\Utils\Tokens::replaceTokens( $tokens, array( array( 'value_str' => $alias, ), array( - 'type' => SqlParser\Token::TYPE_OPERATOR, + 'type' => PhpMyAdmin\SqlParser\Token::TYPE_OPERATOR, 'value_str' => '.', ) ), array( - new SqlParser\Token($table), - new SqlParser\Token('.',SqlParser\Token::TYPE_OPERATOR) + new PhpMyAdmin\SqlParser\Token($table), + new PhpMyAdmin\SqlParser\Token('.',PhpMyAdmin\SqlParser\Token::TYPE_OPERATOR) ) ); } - $sql_query = SqlParser\TokensList::build($tokens); + $sql_query = PhpMyAdmin\SqlParser\TokensList::build($tokens); } echo PMA\libraries\Util::getMessage(PMA\libraries\Message::success()); diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php index 26a01840af..b294e39941 100644 --- a/test/classes/DisplayResultsTest.php +++ b/test/classes/DisplayResultsTest.php @@ -89,7 +89,7 @@ class DisplayResultsTest extends PMATestCase */ public function testisSelect() { - $parser = new \SqlParser\Parser('SELECT * FROM pma'); + $parser = new \PhpMyAdmin\SqlParser\Parser('SELECT * FROM pma'); $this->assertTrue( $this->_callPrivateFunction( '_isSelect', @@ -1233,7 +1233,7 @@ class DisplayResultsTest extends PMATestCase */ public function dataProviderForTestSetHighlightedColumnGlobalField() { - $parser = new SqlParser\Parser( + $parser = new PhpMyAdmin\SqlParser\Parser( 'SELECT * FROM db_name WHERE `db_name`.`tbl`.id > 0 AND `id` < 10' ); return array( diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php index 5f2556307e..8f86b630e2 100644 --- a/test/libraries/PMA_import_test.php +++ b/test/libraries/PMA_import_test.php @@ -385,7 +385,7 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase */ function simulatedQueryTest($sql_query, $simulated_query) { - $parser = new SqlParser\Parser($sql_query); + $parser = new PhpMyAdmin\SqlParser\Parser($sql_query); $analyzed_sql_results = array( 'query' => $sql_query, 'parser' => $parser, diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 1cf9e30f31..0a5fb8af19 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -169,8 +169,8 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase */ public function testBackquoteForbidenWords() { - foreach (SqlParser\Context::$KEYWORDS as $keyword => $type) { - if ($type & SqlParser\Token::FLAG_KEYWORD_RESERVED) { + foreach (PhpMyAdmin\SqlParser\Context::$KEYWORDS as $keyword => $type) { + if ($type & PhpMyAdmin\SqlParser\Token::FLAG_KEYWORD_RESERVED) { $this->assertEquals( "`" . $keyword . "`", PMA\libraries\Util::backquote($keyword, false) From b6468d9b8a4876d4c946dca3b75d4f67bb743e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 14:19:08 +0100 Subject: [PATCH 09/13] Remove po files from sql-parser on creating tarball MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #12013 Signed-off-by: Michal Čihař --- scripts/create-release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 874a81e8aa..0cabeec4dd 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -213,6 +213,7 @@ if [ ! -d libraries/tcpdf ] ; then rm -rf \ vendor/phpmyadmin/sql-parser/tests/ \ vendor/phpmyadmin/sql-parser/tools/ \ + vendor/phpmyadmin/sql-parser/locale/*/LC_MESSAGES/sqlparser.po \ vendor/phpmyadmin/motranslator/tests/ \ vendor/phpmyadmin/shapefile/tests/ \ vendor/phpmyadmin/shapefile/examples/ \ From 4b8fe37b053a092c4b2b4c828505f1340bc49ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 14:20:34 +0100 Subject: [PATCH 10/13] Remove phpmyadmin vendor from being translated here MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every library should handle localization on it's own. Fixes #12013 Signed-off-by: Michal Čihař --- scripts/update-po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-po b/scripts/update-po index 2847c047f8..315a1e58b3 100755 --- a/scripts/update-po +++ b/scripts/update-po @@ -24,7 +24,7 @@ xgettext \ --from-code=utf-8 \ --keyword=__ --keyword=_pgettext:1c,2 --keyword=_ngettext:1,2 \ --copyright-holder="phpMyAdmin devel team" \ - `find \( -name '*.php' -o -name '*.phtml' \) -not -path './test/*' -not -path './po/*' \( -not -path './release/*' -not -path './vendor/*' -o -path './vendor/phpmyadmin/*' \) | sort` + `find \( -name '*.php' -o -name '*.phtml' \) -not -path './test/*' -not -path './po/*' \( -not -path './release/*' -not -path './vendor/*' \) | sort` # Generate PHP code for advisor rules From eb1f277af960817ebdbcbc34783d79cfc79de3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 14:23:03 +0100 Subject: [PATCH 11/13] Require sql-parser 4.1 to get localized messages from it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #12013 Signed-off-by: Michal Čihař --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d7e8ff614d..f96b60d8ad 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "ext-xml": "*", "ext-pcre": "*", "ext-json": "*", - "phpmyadmin/sql-parser": "^4.0", + "phpmyadmin/sql-parser": "^4.1", "phpmyadmin/motranslator": "^3.0", "phpmyadmin/shapefile": "^2.0", "tecnickcom/tcpdf": "^6.2", From 50003dcbfb7cf29962b2f521170e146e374d5f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Jan 2017 14:25:15 +0100 Subject: [PATCH 12/13] Update po files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [CI skip] Signed-off-by: Michal Čihař --- po/af.po | 1823 ++++++++++++++++++---------------------- po/ar.po | 1874 +++++++++++++++++++---------------------- po/az.po | 1906 ++++++++++++++++++++--------------------- po/be.po | 1856 +++++++++++++++++++--------------------- po/be@latin.po | 1857 +++++++++++++++++++--------------------- po/bg.po | 1911 ++++++++++++++++++++---------------------- po/bn.po | 1905 +++++++++++++++++++---------------------- po/br.po | 1834 ++++++++++++++++++---------------------- po/brx.po | 1713 +++++++++++++++++-------------------- po/bs.po | 1829 ++++++++++++++++++---------------------- po/ca.po | 1929 +++++++++++++++++++++--------------------- po/ckb.po | 1807 ++++++++++++++++++--------------------- po/cs.po | 1937 ++++++++++++++++++++---------------------- po/cy.po | 1859 +++++++++++++++++++--------------------- po/da.po | 2022 ++++++++++++++++++++++---------------------- po/de.po | 1934 +++++++++++++++++++++--------------------- po/el.po | 1927 +++++++++++++++++++++--------------------- po/en_GB.po | 1920 ++++++++++++++++++++---------------------- po/eo.po | 1739 +++++++++++++++++--------------------- po/es.po | 1938 +++++++++++++++++++++--------------------- po/et.po | 1923 +++++++++++++++++++++--------------------- po/eu.po | 1831 ++++++++++++++++++---------------------- po/fa.po | 1828 ++++++++++++++++++---------------------- po/fi.po | 1874 +++++++++++++++++++---------------------- po/fil.po | 1713 +++++++++++++++++-------------------- po/fr.po | 1927 +++++++++++++++++++++--------------------- po/fy.po | 1783 ++++++++++++++++++--------------------- po/gl.po | 1914 ++++++++++++++++++++---------------------- po/gu.po | 1713 +++++++++++++++++-------------------- po/he.po | 1831 ++++++++++++++++++---------------------- po/hi.po | 1858 +++++++++++++++++++--------------------- po/hr.po | 1861 +++++++++++++++++++--------------------- po/hu.po | 1927 +++++++++++++++++++++--------------------- po/hy.po | 1854 +++++++++++++++++++--------------------- po/ia.po | 1928 +++++++++++++++++++++--------------------- po/id.po | 2050 ++++++++++++++++++++++----------------------- po/ig.po | 1720 +++++++++++++++++-------------------- po/it.po | 1926 +++++++++++++++++++++--------------------- po/ja.po | 1920 ++++++++++++++++++++---------------------- po/ka.po | 1838 ++++++++++++++++++---------------------- po/kab.po | 1713 +++++++++++++++++-------------------- po/kk.po | 1820 ++++++++++++++++++---------------------- po/km.po | 1799 ++++++++++++++++++--------------------- po/kn.po | 1731 +++++++++++++++++--------------------- po/ko.po | 1961 +++++++++++++++++++++---------------------- po/ksh.po | 1728 +++++++++++++++++--------------------- po/ky.po | 1774 +++++++++++++++++---------------------- po/li.po | 1713 +++++++++++++++++-------------------- po/lt.po | 1891 +++++++++++++++++++---------------------- po/lv.po | 1833 ++++++++++++++++++---------------------- po/mk.po | 1833 ++++++++++++++++++---------------------- po/ml.po | 1794 ++++++++++++++++++--------------------- po/mn.po | 1836 +++++++++++++++++++--------------------- po/ms.po | 1823 ++++++++++++++++++---------------------- po/nb.po | 1916 ++++++++++++++++++++---------------------- po/ne.po | 1735 +++++++++++++++++--------------------- po/nl.po | 1926 +++++++++++++++++++++--------------------- po/pa.po | 1775 +++++++++++++++++---------------------- po/phpmyadmin.pot | 1715 +++++++++++++++++-------------------- po/pl.po | 1917 ++++++++++++++++++++---------------------- po/pt.po | 1900 +++++++++++++++++++---------------------- po/pt_BR.po | 1937 +++++++++++++++++++++--------------------- po/ro.po | 1932 ++++++++++++++++++++---------------------- po/ru.po | 1907 ++++++++++++++++++++--------------------- po/si.po | 1902 +++++++++++++++++++---------------------- po/sk.po | 1890 ++++++++++++++++++++--------------------- po/sl.po | 1934 +++++++++++++++++++++--------------------- po/sq.po | 1943 +++++++++++++++++++++--------------------- po/sr.po | 1854 +++++++++++++++++++--------------------- po/sr@latin.po | 1870 +++++++++++++++++++---------------------- po/sv.po | 1933 +++++++++++++++++++++--------------------- po/ta.po | 1867 +++++++++++++++++++---------------------- po/te.po | 1840 +++++++++++++++++++--------------------- po/th.po | 1832 ++++++++++++++++++---------------------- po/tk.po | 1775 +++++++++++++++++---------------------- po/tr.po | 1924 +++++++++++++++++++++--------------------- po/tt.po | 1849 +++++++++++++++++++--------------------- po/ug.po | 1827 ++++++++++++++++++---------------------- po/uk.po | 1918 ++++++++++++++++++++---------------------- po/ur.po | 1846 +++++++++++++++++++--------------------- po/uz.po | 1887 +++++++++++++++++++---------------------- po/uz@latin.po | 1889 +++++++++++++++++++---------------------- po/vi.po | 1941 +++++++++++++++++++++--------------------- po/vls.po | 1713 +++++++++++++++++-------------------- po/zh_CN.po | 1919 ++++++++++++++++++++---------------------- po/zh_TW.po | 1923 +++++++++++++++++++++--------------------- 86 files changed, 74155 insertions(+), 85769 deletions(-) diff --git a/po/af.po b/po/af.po index d62268325e..e698bb2b79 100644 --- a/po/af.po +++ b/po/af.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2016-12-13 10:40+0100\n" +"POT-Creation-Date: 2017-01-23 14:24+0100\n" "PO-Revision-Date: 2015-10-15 11:30+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Afrikaans