From ee6dd2e7c06331262619cb2ee472a350e7685185 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 13 Jun 2015 13:53:01 +0300 Subject: [PATCH 01/57] Added sql-parser with a modified version of the Composer autoloader to load the library. Signed-off-by: Dan Ungureanu --- libraries/common.inc.php | 1 + libraries/sql-parser/autoload.php | 7 + libraries/sql-parser/composer/ClassLoader.php | 413 +++++++++++++ .../sql-parser/composer/autoload_psr4.php | 10 + .../sql-parser/composer/autoload_real.php | 40 ++ libraries/sql-parser/src/Context.php | 475 ++++++++++++++ .../src/Exceptions/LexerException.php | 41 ++ .../src/Exceptions/ParserException.php | 32 + libraries/sql-parser/src/Fragment.php | 30 + .../src/Fragments/ArrayFragment.php | 95 +++ .../sql-parser/src/Fragments/CallKeyword.php | 86 +++ .../src/Fragments/CreateDefFragment.php | 108 ++++ .../src/Fragments/DataTypeFragment.php | 109 ++++ .../src/Fragments/FieldDefFragment.php | 181 ++++++ .../src/Fragments/FieldFragment.php | 173 ++++++ .../sql-parser/src/Fragments/FromKeyword.php | 68 +++ .../sql-parser/src/Fragments/IntoKeyword.php | 108 ++++ .../sql-parser/src/Fragments/JoinKeyword.php | 89 +++ .../sql-parser/src/Fragments/LimitKeyword.php | 91 +++ .../src/Fragments/OptionsFragment.php | 136 +++++ .../sql-parser/src/Fragments/OrderKeyword.php | 90 +++ .../src/Fragments/ParamDefFragment.php | 128 ++++ .../src/Fragments/RenameKeyword.php | 117 ++++ .../src/Fragments/SelectKeyword.php | 68 +++ .../sql-parser/src/Fragments/SetKeyword.php | 105 ++++ .../src/Fragments/ValuesKeyword.php | 115 ++++ .../sql-parser/src/Fragments/WhereKeyword.php | 100 +++ libraries/sql-parser/src/Lexer.php | 578 ++++++++++++++++++ libraries/sql-parser/src/Parser.php | 189 ++++++ libraries/sql-parser/src/Statement.php | 145 +++++ .../src/Statements/CallStatement.php | 19 + .../src/Statements/CreateStatement.php | 81 +++ .../src/Statements/DeleteStatement.php | 74 +++ .../src/Statements/InsertStatement.php | 78 +++ .../src/Statements/RenameStatement.php | 23 + .../src/Statements/ReplaceStatement.php | 63 ++ .../src/Statements/SelectStatement.php | 130 ++++ .../src/Statements/UpdateStatement.php | 79 +++ libraries/sql-parser/src/Token.php | 253 ++++++++ libraries/sql-parser/src/TokensList.php | 118 ++++ libraries/sql-parser/src/UtfString.php | 220 +++++++ libraries/sql-parser/src/Utils/Misc.php | 91 +++ libraries/sql-parser/src/Utils/Routine.php | 46 ++ 43 files changed, 5203 insertions(+) create mode 100644 libraries/sql-parser/autoload.php create mode 100644 libraries/sql-parser/composer/ClassLoader.php create mode 100644 libraries/sql-parser/composer/autoload_psr4.php create mode 100644 libraries/sql-parser/composer/autoload_real.php create mode 100644 libraries/sql-parser/src/Context.php create mode 100644 libraries/sql-parser/src/Exceptions/LexerException.php create mode 100644 libraries/sql-parser/src/Exceptions/ParserException.php create mode 100644 libraries/sql-parser/src/Fragment.php create mode 100644 libraries/sql-parser/src/Fragments/ArrayFragment.php create mode 100644 libraries/sql-parser/src/Fragments/CallKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/CreateDefFragment.php create mode 100644 libraries/sql-parser/src/Fragments/DataTypeFragment.php create mode 100644 libraries/sql-parser/src/Fragments/FieldDefFragment.php create mode 100644 libraries/sql-parser/src/Fragments/FieldFragment.php create mode 100644 libraries/sql-parser/src/Fragments/FromKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/IntoKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/JoinKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/LimitKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/OptionsFragment.php create mode 100644 libraries/sql-parser/src/Fragments/OrderKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/ParamDefFragment.php create mode 100644 libraries/sql-parser/src/Fragments/RenameKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/SelectKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/SetKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/ValuesKeyword.php create mode 100644 libraries/sql-parser/src/Fragments/WhereKeyword.php create mode 100644 libraries/sql-parser/src/Lexer.php create mode 100644 libraries/sql-parser/src/Parser.php create mode 100644 libraries/sql-parser/src/Statement.php create mode 100644 libraries/sql-parser/src/Statements/CallStatement.php create mode 100644 libraries/sql-parser/src/Statements/CreateStatement.php create mode 100644 libraries/sql-parser/src/Statements/DeleteStatement.php create mode 100644 libraries/sql-parser/src/Statements/InsertStatement.php create mode 100644 libraries/sql-parser/src/Statements/RenameStatement.php create mode 100644 libraries/sql-parser/src/Statements/ReplaceStatement.php create mode 100644 libraries/sql-parser/src/Statements/SelectStatement.php create mode 100644 libraries/sql-parser/src/Statements/UpdateStatement.php create mode 100644 libraries/sql-parser/src/Token.php create mode 100644 libraries/sql-parser/src/TokensList.php create mode 100644 libraries/sql-parser/src/UtfString.php create mode 100644 libraries/sql-parser/src/Utils/Misc.php create mode 100644 libraries/sql-parser/src/Utils/Routine.php diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ee4bba0fd0..282423fe59 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1057,6 +1057,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { * SQL Parser code */ include_once './libraries/sqlparser.lib.php'; + include_once './libraries/sql-parser/autoload.php'; /** * the PMA_List_Database class diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php new file mode 100644 index 0000000000..a88e87984f --- /dev/null +++ b/libraries/sql-parser/autoload.php @@ -0,0 +1,7 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0 class loader + * + * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier + * @author Jordi Boggiano + */ +class ClassLoader +{ + // PSR-4 + private $prefixLengthsPsr4 = array(); + private $prefixDirsPsr4 = array(); + private $fallbackDirsPsr4 = array(); + + // PSR-0 + private $prefixesPsr0 = array(); + private $fallbackDirsPsr0 = array(); + + private $useIncludePath = false; + private $classMap = array(); + + private $classMapAuthoritative = false; + + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', $this->prefixesPsr0); + } + + return array(); + } + + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + */ + public function add($prefix, $paths, $prepend = false) + { + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + (array) $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + (array) $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = (array) $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + (array) $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-0 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + (array) $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + (array) $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + (array) $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 base directories + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + } + + /** + * Unregisters this instance as an autoloader. + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return bool|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + includeFile($file); + + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 + if ('\\' == $class[0]) { + $class = substr($class, 1); + } + + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative) { + return false; + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if ($file === null && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if ($file === null) { + // Remember that this class does not exist. + return $this->classMap[$class] = false; + } + + return $file; + } + + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { + if (0 === strpos($class, $prefix)) { + foreach ($this->prefixDirsPsr4[$prefix] as $dir) { + if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + } +} + +/** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + */ +function includeFile($file) +{ + include $file; +} diff --git a/libraries/sql-parser/composer/autoload_psr4.php b/libraries/sql-parser/composer/autoload_psr4.php new file mode 100644 index 0000000000..31419d5807 --- /dev/null +++ b/libraries/sql-parser/composer/autoload_psr4.php @@ -0,0 +1,10 @@ + array($vendorDir . '/src'), +); diff --git a/libraries/sql-parser/composer/autoload_real.php b/libraries/sql-parser/composer/autoload_real.php new file mode 100644 index 0000000000..7ada1d9da6 --- /dev/null +++ b/libraries/sql-parser/composer/autoload_real.php @@ -0,0 +1,40 @@ + $path) { + $loader->setPsr4($namespace, $path); + } + + $loader->register(true); + + return $loader; + } +} + +function composerRequire($file) +{ + require $file; +} diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php new file mode 100644 index 0000000000..2b43e568a1 --- /dev/null +++ b/libraries/sql-parser/src/Context.php @@ -0,0 +1,475 @@ + 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, 'ON' => 1, + 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, 'DIV' => 1, + 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, 'NOT' => 1, + 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, 'CHAR' => 1, + 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, 'EACH' => 1, 'ELSE' => 1, + 'EXIT' => 1, 'FROM' => 1, 'GOTO' => 1, 'INT1' => 1, 'INT2' => 1, + 'INT3' => 1, 'INT4' => 1, 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, + 'KEYS' => 1, 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, 'READ' => 1, + 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, 'TRUE' => 1, 'UNDO' => 1, + 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, 'FETCH' => 1, + 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, 'GROUP' => 1, 'INDEX' => 1, + 'INNER' => 1, 'INOUT' => 1, 'LABEL' => 1, 'LEAVE' => 1, 'LIMIT' => 1, + 'LINES' => 1, 'MATCH' => 1, 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, + 'RANGE' => 1, 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, + 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, 'WHILE' => 1, + 'WRITE' => 1, + 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, + 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, + 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, + 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, + 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, + 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, + 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'SONAME' => 1, + 'UNIQUE' => 1, 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, + 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, + 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, + 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, + 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, + 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, + 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'UPGRADE' => 1, 'VARCHAR' => 1, + 'VARYING' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, 'DESCRIBE' => 1, + 'DISTINCT' => 1, 'ENCLOSED' => 1, 'FULLTEXT' => 1, 'INTERVAL' => 1, + 'LONGBLOB' => 1, 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, + 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, 'SMALLINT' => 1, + 'SPECIFIC' => 1, 'SQLSTATE' => 1, 'STARTING' => 1, 'TINYBLOB' => 1, + 'TINYTEXT' => 1, 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, + 'UTC_TIME' => 1, 'ZEROFILL' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, 'LOCALTIME' => 1, + 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, 'PARTITION' => 1, 'PRECISION' => 1, + 'PROCEDURE' => 1, 'SENSITIVE' => 1, 'SEPARATOR' => 1, 'VARBINARY' => 1, + 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONNECTION' => 1, + 'CONSTRAINT' => 1, 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, + 'MEDIUMBLOB' => 1, 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, + 'READ_WRITE' => 1, 'REFERENCES' => 1, 'SQLWARNING' => 1, + 'TERMINATED' => 1, 'YEAR_MONTH' => 1, + 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, + 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, + 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, + 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, + 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, + 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, + 'IO_AFTER_GTIDS' => 1, 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, + 'DAY_MICROSECOND' => 1, 'IO_BEFORE_GTIDS' => 1, 'OPTIMIZER_COSTS' => 1, + 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, + 'CURRENT_TIMESTAMP' => 1, + 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, + 'SECOND_MICROSECOND' => 1, + 'SQL_CALC_FOUND_ROWS' => 1, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, + + /* + * Secondary group of keywords. + * + * Keywords below are either words that are used as keywords, but not + * defined as proper keywords or are group of keywords which are parsed + * easier when found grouped. + */ + + 'END' => 2, + 'INDEX' => 2, 'VALUE' => 2, + 'ENGINE' => 2, + 'CHARSET' => 2, 'COMMENT' => 2, 'RETURNS' => 2, 'STORAGE' => 2, + 'CHECKSUM' => 2, 'MAX_ROWS' => 2, 'MIN_ROWS' => 2, 'NOT NULL' => 2, + 'PASSWORD' => 2, + 'INDEX KEY' => 2, 'PACK_KEYS' => 2, + 'ROW_FORMAT' => 2, 'TABLESPACE' => 2, + 'UNIQUE KEY' => 2, + 'FOREIGN KEY' => 2, 'PRIMARY KEY' => 2, 'PRIMARY KEY' => 2, + 'SPATIAL KEY' => 2, + 'FULLTEXT KEY' => 2, 'UNIQUE INDEX' => 2, + 'CHARACTER SET' => 2, 'IF NOT EXISTS' => 2, 'INSERT_METHOD' => 2, + 'SPATIAL INDEX' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'DATA DIRECTORY' => 2, + 'FULLTEXT INDEX' => 2, 'KEY_BLOCK_SIZE' => 2, + 'DEFAULT COLLATE' => 2, + 'DELAY_KEY_WRITE' => 2, 'INDEX DIRECTORY' => 2, + 'DEFAULT CHARACTER SET' => 2, + ); + + // ------------------------------------------------------------------------- + // Keys and Data Types. + + /** + * Types of keys. + * + * @var array + */ + public static $KEY_TYPES = array( + 'FOREIGN KEY' => 1, 'FULLTEXT INDEX' => 1, 'FULLTEXT KEY' => 1, + 'INDEX KEY' => 1, 'INDEX' => 1, 'KEY' => 1, 'PRIMARY KEY' => 1, + 'SPATIAL INDEX' => 1, 'SPATIAL KEY' => 1, 'UNIQUE INDEX' => 1, + 'UNIQUE KEY' => 1, 'UNIQUE' => 1, + ); + + /** + * All data types. + * + * @var array + */ + public static $DATA_TYPES = array( + 'ARRAY' => 1, 'BIGINT' => 1, 'BINARY VARYING' => 1, 'BINARY' => 1, + 'BOOLEAN' => 1, 'CHARACTER' => 1, 'CHARACTER' => 1, 'DATE' => 1, + 'DECIMAL' => 1, 'DOUBLE' => 1, 'FLOAT' => 1, 'FLOAT' => 1, 'INT' => 1, + 'INTEGER' => 1, 'INTERVAL' => 1, 'MULTISET' => 1, 'NUMERIC' => 1, + 'REAL' => 1, 'SMALLINT' => 1, 'TIME' => 1, 'TIMESTAMP' => 1, + 'VARBINARY' => 1, 'VARCHAR' => 1, 'XML' => 1, + ); + + // ------------------------------------------------------------------------- + // Operators. + + /** + * List of operators and their flags. + * + * @var array + */ + public static $OPERATORS = array( + + // Some operators (*, =) may have ambigous flags, because they depend on + // the context they are being used in. + // For example: 1. SELECT * FROM table; # SQL specific (wildcard) + // SELECT 2 * 3; # arithmetic + // 2. SELECT * FROM table WHERE foo = 'bar'; + // SET @i = 0; + + // @see Token::FLAG_OPERATOR_ARITHMETIC + '%' => 1, '*' => 1, '+' => 1, '-' => 1, '/' => 1, + + // @see Token::FLAG_OPERATOR_LOGICAL + '!' => 2, '!==' => 2, '&&' => 2, '<' => 2, '<=' => 2, + '<=>' => 2, '<>' => 2, '=' => 2, '>' => 2, '>=' => 2, + '||' => 2, + + // @see Token::FLAG_OPERATOR_BITWISE + '&' => 4, '<<' => 4, '>>' => 4, '^' => 4, '|' => 4, + '~' => 4, + + // @see Token::FLAG_OPERATOR_ASSIGNMENT + ':=' => 8, + + // @see Token::FLAG_OPERATOR_SQL + '(' => 16, ')' => 16, '.' => 16, ',' => 16, + ); + + // ------------------------------------------------------------------------- + // SQL Modes. + + /* + * Server SQL Modes + * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html + */ + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_allow_invalid_dates + const ALLOW_INVALID_DATES = 1; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_ansi_quotes + const ANSI_QUOTES = 2; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_error_for_division_by_zero + const ERROR_FOR_DIVISION_BY_ZERO = 4; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_high_not_precedence + const HIGH_NOT_PRECEDENCE = 8; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_ignore_space + const IGNORE_SPACE = 16; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_auto_create_user + const NO_AUTO_CREATE_USER = 32; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_auto_value_on_zero + const NO_AUTO_VALUE_ON_ZERO = 64; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_backslash_escapes + const NO_BACKSLASH_ESCAPES = 128; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_dir_in_create + const NO_DIR_IN_CREATE = 256; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_dir_in_create + const NO_ENGINE_SUBSTITUTION = 512; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_field_options + const NO_FIELD_OPTIONS = 1024; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_key_options + const NO_KEY_OPTIONS = 2048; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_table_options + const NO_TABLE_OPTIONS = 4096; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_unsigned_subtraction + const NO_UNSIGNED_SUBTRACTION = 8192; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_zero_date + const NO_ZERO_DATE = 16384; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_zero_in_date + const NO_ZERO_IN_DATE = 32768; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_only_full_group_by + const ONLY_FULL_GROUP_BY = 65536; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_pipes_as_concat + const PIPES_AS_CONCAT = 131072; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_real_as_float + const REAL_AS_FLOAT = 262144; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_strict_all_tables + const STRICT_ALL_TABLES = 524288; + + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_strict_trans_tables + const STRICT_TRANS_TABLES = 1048576; + + /* + * Combination SQL Modes + * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sql-mode-combo + */ + + // REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE + const SQL_MODE_ANSI = 393234; + + // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS, + // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS, + const SQL_MODE_DB2 = 138258; + + // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS, + // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS, NO_AUTO_CREATE_USER + const SQL_MODE_MAXDB = 138290; + + // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS, + // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS + const SQL_MODE_MSSQL = 138258; + + // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS, + // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS, NO_AUTO_CREATE_USER + const SQL_MODE_ORACLE = 138290; + + // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS, + // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS + const SQL_MODE_POSTGRESQL = 138258; + + // STRICT_TRANS_TABLES, STRICT_ALL_TABLES, NO_ZERO_IN_DATE, NO_ZERO_DATE, + // ERROR_FOR_DIVISION_BY_ZERO, NO_AUTO_CREATE_USER + const SQL_MODE_TRADITIONAL = 1622052; + + // ------------------------------------------------------------------------- + // Keyword. + + /** + * Checks if the given string is a keyword. + * + * @param string $str + * @param bool $strict + * + * @return bool + */ + public static function isKeyword($str, $strict = false) + { + $str = strtoupper($str); + + if (isset(static::$KEYWORDS[$str])) { + return $strict ? static::$KEYWORDS[$str] === 1 : true; + } + + return false; + } + + // ------------------------------------------------------------------------- + // Operator. + + /** + * Checks if the given string is an operator. + * + * @param string $str + * + * @return int The appropriate flag for the operator. + */ + public static function isOperator($str) + { + if (!isset(static::$OPERATORS[$str])) { + return null; + } + return static::$OPERATORS[$str]; + } + + // ------------------------------------------------------------------------- + // Whitespace. + + /** + * Checks if the given character is a whitespace. + * + * @param string $ch + * + * @return bool + */ + public static function isWhitespace($ch) + { + return ($ch === ' ') || ($ch === "\r") || ($ch === "\n") || ($ch === "\t"); + } + + // ------------------------------------------------------------------------- + // Comment. + + /** + * Checks if the given string is the beginning of a whitespace. + * + * @param string $str + * + * @return int The appropriate flag for the comment type. + */ + public static function isComment($str) + { + $len = strlen($str); + if ($str[0] === '#') { + return Token::FLAG_COMMENT_BASH; + } elseif (($len > 1) && ((($str[0] === '/') && ($str[1] === '*')) || + (($str[0] === '*') && ($str[1] === '/')))) { + return Token::FLAG_COMMENT_C; + } elseif (($len > 2) && ($str[0] === '-') && + ($str[1] === '-') && ($str[2] !== "\n") && + (static::isWhitespace($str[2]))) { + return Token::FLAG_COMMENT_SQL; + } + return null; + } + + // ------------------------------------------------------------------------- + // Bool. + + /** + * Checks if the given string is a boolean value. + * This actually check only for `TRUE` and `FALSE` because `1` or `0` are + * actually numbers and are parsed by specific methods. + * + * @param string $ch + * + * @return bool + */ + public static function isBool($ch) + { + $ch = strtoupper($ch); + return ($ch === 'TRUE') || ($ch === 'FALSE'); + } + + // ------------------------------------------------------------------------- + // Number. + + /** + * Checks if the given character can be a part of a number. + * + * @param string $ch + * + * @return bool + */ + public static function isNumber($ch) + { + return (($ch >= '0') && ($ch <= '9')) || ($ch === '.') || + ($ch === '-') || ($ch === '+') || ($ch === 'e') || ($ch === 'E'); + } + + // ------------------------------------------------------------------------- + // Symbol. + + /** + * Checks if the given character is the beginning of a symbol. A symbol + * can be either a variable or a field name. + * + * @param string $ch + * + * @return int The appropriate flag for the symbol type. + */ + public static function isSymbol($ch) + { + if ($ch[0] === '@') { + return Token::FLAG_SYMBOL_VARIABLE; + } elseif ($ch[0] === '`') { + return Token::FLAG_SYMBOL_BACKTICK; + } + return null; + } + + // ------------------------------------------------------------------------- + // String. + + /** + * Checks if the given character is the beginning of a string. + * + * @param string $str + * + * @return int The appropriate flag for the string type. + */ + public static function isString($str) + { + if ($str[0] === '\'') { + return Token::FLAG_STRING_SINGLE_QUOTES; + } elseif ($str[0] === '"') { + return Token::FLAG_STRING_DOUBLE_QUOTES; + } + return null; + } + + // ------------------------------------------------------------------------- + // Delimiter. + + /** + * Checks if the given character can be a separator for two lexems. + * + * @param string $ch + * + * @return bool + */ + public static function isSeparator($ch) + { + return !ctype_alnum($ch) && $ch !== '_'; + } +} diff --git a/libraries/sql-parser/src/Exceptions/LexerException.php b/libraries/sql-parser/src/Exceptions/LexerException.php new file mode 100644 index 0000000000..f346d83dca --- /dev/null +++ b/libraries/sql-parser/src/Exceptions/LexerException.php @@ -0,0 +1,41 @@ +ch = $ch; + $this->pos = $pos; + } +} diff --git a/libraries/sql-parser/src/Exceptions/ParserException.php b/libraries/sql-parser/src/Exceptions/ParserException.php new file mode 100644 index 0000000000..e23d03daf7 --- /dev/null +++ b/libraries/sql-parser/src/Exceptions/ParserException.php @@ -0,0 +1,32 @@ +token = $token; + } +} diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php new file mode 100644 index 0000000000..e9a4620527 --- /dev/null +++ b/libraries/sql-parser/src/Fragment.php @@ -0,0 +1,30 @@ + 1 + * + * 1 ------------------[ array element ]-----------------> 2 + * + * 2 ------------------------[ , ]-----------------------> 1 + * 2 ------------------------[ ) ]-----------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + if (($token->type !== Token::TYPE_OPERATOR) || ($token->value !== '(')) { + $parser->error('An open bracket was expected.', $token); + break; + } + $state = 1; + } elseif ($state === 1) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ')')) { + // Empty array. + break; + } + $ret->array[] = $token->value; + $ret->tokens[] = $token; + $state = 2; + } elseif ($state === 2) { + if (($token->type !== Token::TYPE_OPERATOR) || (($token->value !== ',') && ($token->value !== ')'))) { + $parser->error('Symbols \')\' or \',\' were expected', $token); + break; + } + if ($token->value === ',') { + $state = 1; + } else { // ) + break; + } + } + + } + + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php new file mode 100644 index 0000000000..00b7838e71 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -0,0 +1,86 @@ + 1 + * + * 1 --------------------[ parameters ]-------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + $ret->name = $token->value; + $ret->tokens[] = $token; + $state = 1; + } elseif ($state === 1) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $parameters = ArrayFragment::parse($parser, $list); + $ret->parameters = $parameters->array; + $ret->tokens = array_merge($ret->tokens, $parameters->tokens); + } + break; + } + + } + + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/CreateDefFragment.php b/libraries/sql-parser/src/Fragments/CreateDefFragment.php new file mode 100644 index 0000000000..708ce11b85 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/CreateDefFragment.php @@ -0,0 +1,108 @@ + array(1, 'var'), + 'AUTO_INCREMENT' => array(2, 'var'), + 'AVG_ROW_LENGTH' => array(3, 'var'), + 'DEFAULT CHARACTER SET' => array(4, 'var'), + 'CHARACTER SET' => array(4, 'var'), + 'CHECKSUM' => array(5, 'var'), + 'DEFAULT COLLATE' => array(5, 'var'), + 'COLLATE' => array(6, 'var'), + 'COMMENT' => array(7, 'var'), + 'CONNECTION' => array(8, 'var'), + 'DATA DIRECTORY' => array(9, 'var'), + 'DELAY_KEY_WRITE' => array(10, 'var'), + 'INDEX DIRECTORY' => array(11, 'var'), + 'INSERT_METHOD' => array(12, 'var'), + 'KEY_BLOCK_SIZE' => array(13, 'var'), + 'MAX_ROWS' => array(14, 'var'), + 'MIN_ROWS' => array(15, 'var'), + 'PACK_KEYS' => array(16, 'var'), + 'PASSWORD' => array(17, 'var'), + 'ROW_FORMAT' => array(18, 'var'), + 'TABLESPACE' => array(19, 'var'), + 'STORAGE' => array(20, 'var'), + 'UNION' => array(21, 'var'), + ); + + /** + * All function options. + * + * @var array + */ + public static $FUNC_OPTIONS = array( + 'COMMENT' => array(1, 'var'), + 'LANGUAGE SQL' => 2, + 'DETERMINISTIC' => 3, + 'NOT DETERMINISTIC' => 3, + 'CONSTAINS SQL' => 4, + 'NO SQL' => 4, + 'READS SQL DATA' => 4, + 'MODIFIES SQL DATA' => 4, + 'SQL SEQURITY DEFINER' => array(5, 'var'), + ); + + /** + * The name of the new table. + * + * @var string + */ + public $name; + + /** + * @param Parser $parser + * @param TokensList $list + * @param array $options + * + * @return CreateDefFragment + */ + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + $ret = new CreateDefFragment(); + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + break; + } + + $ret->tokens[] = $token; + $ret->name .= $token->value; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php new file mode 100644 index 0000000000..a5c8eca7de --- /dev/null +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -0,0 +1,109 @@ + 1, + 'CHARACTER SET' => array(2, 'var'), + 'CHARSET' => array(3, 'var'), + 'COLLATE' => 4, + 'UNSIGNED' => 5, + 'ZEROFILL' => 6, + ); + + /** + * The name of the data type. + * + * @var string + */ + public $name; + + /** + * The size of this data type. + * + * @var array + */ + public $size = array(); + + /** + * The options of this data type. + * + * @var OptionsFragment + */ + public $options = array(); + + /** + * @param Parser $parser + * @param TokensList $list + * @param array $options + * + * @return DataTypeFragment[] + */ + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + $ret = new DataTypeFragment(); + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 -------------------[ data type ]--------------------> 1 + * + * 1 ----------------[ size and options ]----------------> 2 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + $ret->name = $token->value; + $ret->tokens[] = $token; + if (!isset(Context::$DATA_TYPES[$token->value])) { + $parser->error('Unrecognized data type.', $token); + } + $state = 1; + } elseif ($state === 1) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $size = ArrayFragment::parse($parser, $list); + $ret->size = $size->array; + $ret->tokens = array_merge($ret->tokens, $size->tokens); + ++$list->idx; + } + $ret->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + ++$list->idx; + break; + } + + } + + if (empty($ret->name)) { + return null; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php new file mode 100644 index 0000000000..fe941849a5 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -0,0 +1,181 @@ + 1, + 'NULL' => 1, + 'DEFAULT' => array(2, 'var'), + 'AUTO_INCREMENT' => 3, + 'PRIMARY' => 4, + 'PRIMARY KEY' => 4, + 'UNIQUE' => 4, + 'UNIQUE KEY' => 4, + 'COMMENT' => array(5, 'var'), + 'COLUMN_FORMAT' => array(6, 'var'), + ); + + /** + * The name of the new column. + * + * @var string + */ + public $name; + + /** + * The data type of thew new column. + * + * @var DataTypeFragment + */ + public $type; + + /** + * The array of indexes. + * + * @var array + */ + public $indexes = array(); + + /** + * The options of the new field fragment. + * + * @var OptionsFragment + */ + public $options; + + /** + * @param Parser $parser + * @param TokensList $list + * @param array $options + * + * @return FieldDefFragment[] + */ + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + $ret = array(); + + $expr = new FieldDefFragment(); + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 -----------------------[ ( ]------------------------> 1 + * + * 1 -------------------[ CONSTRAINT ]-------------------> 4 + * 1 --------------------[ key type ]--------------------> 5 + * 1 -------------------[ column name ]------------------> 2 + * + * 2 -------------------[ data type ]--------------------> 3 + * + * 3 ---------------------[ size ]---------------------> 3 + * 3 ---------------------[ options ]--------------------> 4 + * + * 4 -----------------[ CONSTRAINT name ]----------------> 4 + * 4 -----------------[ CONSTRAINT type ]----------------> 5 + * + * 5 -------------------[ index names ]------------------> 6 + * + * 6 ------------------------[ , ]-----------------------> 1 + * 6 ------------------------[ ) ]-----------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $state = 1; + } + continue; + } elseif ($state === 1) { + if ($token->type === Token::TYPE_KEYWORD) { + if ($token->value === 'CONSTRAINT') { + $state = 4; + } elseif (isset(Context::$KEY_TYPES[$token->value])) { + $expr->type = $token->value; + $state = 5; + } else { + $parser->error('Unexpected keyword.', $token); + break; // TODO: Skip to the end of the query. + } + } else { + $expr->name = $token->value; + $state = 2; + } + } elseif ($state === 2) { + $expr->type = DataTypeFragment::parse($parser, $list); + $state = 3; + } elseif ($state === 3) { + $expr->options = OptionsFragment::parse($parser, $list, static::$FIELD_OPTIONS); + $state = 6; + } elseif ($state === 4) { + if (!isset(Context::$KEY_TYPES[$token->value])) { + $expr->name = $token->value; + } else { + $expr->type = $token->value; + $state = 5; + } + } elseif ($state === 5) { + $expr->indexes = ArrayFragment::parse($parser, $list); + $state = 6; + } elseif ($state === 6) { + $ret[] = $expr; + $expr = new FieldDefFragment(); + if ($token->value === ',') { + $state = 1; + continue; + } elseif ($token->value === ')') { + ++$list->idx; + break; + } + } + + $expr->tokens[] = $token; + } + + // Last iteration was not saved. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + + } +} diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php new file mode 100644 index 0000000000..71e1066a65 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -0,0 +1,173 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + if (($isExpr) && (!$alias)) { + $ret->expr .= $token->token; + $ret->tokens[] = $token; + } + if (($alias === 0) && (!$isExpr) && (!$period) && (!empty($ret->expr))) { + $alias = 1; + } + continue; + } + + if ($token->type === Token::TYPE_KEYWORD) { + // Keywords may be found only between brackets. + if ($brackets === 0) { + if ($token->value === 'AS') { + $alias = 2; + continue; + } + break; + } + } + + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === '(') { + ++$brackets; + $isExpr = true; + } elseif ($token->value === ')') { + --$brackets; + if ($brackets < 0) { + $parser->error('Unexpected bracket.', $token); + $brackets = 0; + } + } elseif ($token->value === ',') { + if ($brackets === 0) { + break; + } + } + } + + if (($token->type === Token::TYPE_NUMBER) || ($token->type === Token::TYPE_BOOL) || + (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE)) || + (($token->type === Token::TYPE_OPERATOR)) && ($token->value !== '.')) { + // Numbers, booleans and operators are usually part of expressions. + $isExpr = true; + } + + if ($alias) { + $ret->alias = $token->value; + $alias = 0; + } else { + if (!$isExpr) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '.')) { + $ret->database = $ret->table; + $ret->table = $ret->column; + $period = true; + } else { + if (!empty($options['skipColumn'])) { + $ret->table = $token->value; + } else { + $ret->column = $token->value; + } + $period = false; + } + } else { + if ($brackets === 0) { + if (($token->type === Token::TYPE_NONE) || ($token->type === Token::TYPE_STRING) || + (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_BACKTICK))) { + $ret->alias = $token->value; + } + } + } + + $ret->expr .= $token->token; + $ret->tokens[] = $token; + } + } + + if ($alias === 2) { + $parser->error('Alias was expected.', $token); + } + + if (empty($ret->tokens)) { + return null; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/FromKeyword.php b/libraries/sql-parser/src/Fragments/FromKeyword.php new file mode 100644 index 0000000000..fd11eea68e --- /dev/null +++ b/libraries/sql-parser/src/Fragments/FromKeyword.php @@ -0,0 +1,68 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + // No keyword is expected. + if ($token->type === Token::TYPE_KEYWORD) { + break; + } + + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { + $ret[] = $expr; + } else { + $expr = FieldFragment::parse($parser, $list, array('skipColumn' => true)); + if ($expr === null) { + break; + } + } + + } + + // Last iteration was not saved. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php new file mode 100644 index 0000000000..9f6a116eab --- /dev/null +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -0,0 +1,108 @@ + 1 + * + * 1 --------------------[ field name ]-------------------> 2 + * + * 2 ------------------------[ , ]------------------------> 1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + // No keyword is expected. + if ($token->type === Token::TYPE_KEYWORD) { + break; + } + + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === '(') { + if (empty($ret->table)) { + $parser->error('Table name was expected.', $token); + } + $state = 1; + continue; + } elseif ($token->value === ',') { + if ($state !== 2) { + $parser->error('Field name was expected.', $token); + } + $state = 1; + continue; + } + + // No other operator is expected. + break; + } + + $ret->tokens[] = $token; + if ($state === 0) { + $ret->table .= $token->value; + } elseif ($state === 1) { + $ret->fields[] = $token->value; + $state = 2; + } + + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/JoinKeyword.php b/libraries/sql-parser/src/Fragments/JoinKeyword.php new file mode 100644 index 0000000000..62f9ecd0c0 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/JoinKeyword.php @@ -0,0 +1,89 @@ + 1 + * + * 1 ------------------------[ ON ]-----------------------> 2 + * + * 2 --------------------[ conditions ]-------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + $ret->expr = FieldFragment::parse($parser, $list, array('skipColumn' => true)); + $state = 1; + } elseif ($state === 1) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON')) { + $state = 2; + } + } elseif ($state === 2) { + $ret->on = WhereKeyword::parse($parser, $list); + ++$list->idx; + break; + } + + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php new file mode 100644 index 0000000000..08fb3a43ef --- /dev/null +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -0,0 +1,91 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + // NOTE: `OFFSET` is not a keyword. + if (($token->type === Token::TYPE_NONE) && ($token->value === 'OFFSET')) { + if ($offset) { + $parser->error('An offset was expected.'); + } + $offset = true; + continue; + } + + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { + $ret->offset = $ret->row_count; + $ret->row_count = 0; + continue; + } + + if ($offset) { + $ret->offset = $token->value; + $offset = false; + } else { + $ret->row_count = $token->value; + } + + $ret->tokens[] = $token; + + } + + if ($offset) { + $parser->error('An offset was expected.'); + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php new file mode 100644 index 0000000000..22661eb989 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -0,0 +1,136 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if (isset($options[$token->value])) { + $lastOption = $options[$token->value]; + $lastOptionId = is_array($lastOption) ? $lastOption[0] : $lastOption; + + // Checking for option conflicts. + // For example, in `SELECT` statements the keywords `ALL` and `DISTINCT` + // conflict and if used together, they produce an invalid query. + // Usually, tokens can be identified in the array by the option ID, + // but if conflicts occur, a psuedo option ID is used. + // The first pseudo duplicate ID is the maximum value of the real + // options (e.g. if there are 5 options, the first fake ID is 6). + if (isset($ret->options[$lastOptionId])) { + $parser->error('This option conflicts with \'' . $ret->options[$lastOptionId] . '\'.', $token); + $lastOptionId = $lastAssignedId++; + } + } else { + // There is no option to be processed. + if ($lastOption === null) { + break; + } + + // The only keywords that are expected are those which are + // options. + if ($token->type === Token::TYPE_KEYWORD) { + break; + } + + } + + if (is_array($lastOption)) { + if (empty($ret->options[$lastOptionId])) { + $ret->options[$lastOptionId] = array('name' => $token->value, 'value' => ''); + } else { + if ($token->value !== '=') { + if ($token->value === '(') { + ++$brackets; + } elseif ($token->value === ')') { + --$brackets; + } else { + $ret->options[$lastOptionId]['value'] .= $token->value; + } + if ($brackets === 0) { + $lastOption = null; + } + } + } + } else { + $ret->options[$lastOptionId] = $token->value; + $lastOption = null; + } + $ret->tokens[] = $token; + + } + + ksort($ret->options); + + --$list->idx; + return $ret; + } + + /** + * Checks if it has the specified option and returns it value or true. + * + * @param string $key + * + * @return mixed + */ + public function has($key) + { + foreach ($this->options as $option) { + if ((is_array($option)) && ($key === $option['name'])) { + return $option['value']; + } elseif ($key === $option) { + return true; + } + } + return false; + } +} diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Fragments/OrderKeyword.php new file mode 100644 index 0000000000..5ddc8efb75 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/OrderKeyword.php @@ -0,0 +1,90 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($token->type === Token::TYPE_KEYWORD) { + // Type of ordering. By default, it is `ASC`. + if (($token->value === 'ASC') || ($token->value === 'DESC')) { + $expr->type = $token->value; + $expr->tokens[] = $token; + continue; + } + + // No other keyword is expected. + break; + } + + // Saving field. + if (($token->type === Token::TYPE_OPERATOR) && ($token->token === ',')) { + $ret[] = $expr; + $expr = new OrderKeyword(); + continue; + } + + $expr->tokens[] = $token; + $expr->column .= $token->token; + + } + + // Last iteration was not processed. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php new file mode 100644 index 0000000000..05bad6e663 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -0,0 +1,128 @@ + 1 + * + * 1 ----------------[ IN / OUT / INOUT ]----------------> 1 + * 1 ----------------------[ name ]----------------------> 2 + * + * 2 -------------------[ data type ]--------------------> 3 + * + * 3 ------------------------[ , ]-----------------------> 1 + * 3 ------------------------[ ) ]-----------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $state = 1; + } + continue; + } elseif ($state === 1) { + if (($token->value === 'IN') || ($token->value === 'OUT') || ($token->value === 'INOUT')) { + $expr->inOut = $token->value; + ++$list->idx; + } else if ($token->value === ')') { + ++$list->idx; + break; + } else { + $expr->name = $token->value; + $state = 2; + } + } elseif ($state === 2) { + $expr->type = DataTypeFragment::parse($parser, $list); + $state = 3; + } elseif ($state === 3) { + $ret[] = $expr; + $expr = new ParamDefFragment(); + if ($token->value === ',') { + $state = 1; + continue; + } elseif ($token->value === ')') { + ++$list->idx; + break; + } + } + + $expr->tokens[] = $token; + } + + // Last iteration was not saved. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + + } +} diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Fragments/RenameKeyword.php new file mode 100644 index 0000000000..7841b2ac77 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/RenameKeyword.php @@ -0,0 +1,117 @@ + 1 + * + * 1 ------------------------[ TO ]-----------------------> 2 + * + * 2 ---------------------[ old name ]--------------------> 3 + * + * 3 ------------------------[ , ]------------------------> 0 + * 3 -----------------------[ else ]----------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($token->type === Token::TYPE_KEYWORD) { + if (($state === 1) && ($token->value === 'TO')) { + $state = 2; + continue; + } + + // No other keyword is expected. + break; + } + + if ($token->type === Token::TYPE_OPERATOR) { + if (($state === 3) && ($token->value === ',')) { + $ret[] = $expr; + $expr = new RenameKeyword(); + $state = 0; + continue; + } + + // No other operator is expected. + break; + } + + $expr->tokens[] = $token; + if ($state == 0) { + $expr->old = $token->value; + $state = 1; + } elseif ($state == 2) { + $expr->new = $token->value; + $state = 3; + } + + } + + // Last iteration was not saved. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/SelectKeyword.php b/libraries/sql-parser/src/Fragments/SelectKeyword.php new file mode 100644 index 0000000000..dc8db950be --- /dev/null +++ b/libraries/sql-parser/src/Fragments/SelectKeyword.php @@ -0,0 +1,68 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($token->type === Token::TYPE_KEYWORD) { + // No keyword is expected. + break; + } + + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { + $ret[] = $expr; + } else { + $expr = FieldFragment::parse($parser, $list); + if ($expr === null) { + break; + } + } + + } + + // Last iteration was not processed. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Fragments/SetKeyword.php new file mode 100644 index 0000000000..1e70f27e2d --- /dev/null +++ b/libraries/sql-parser/src/Fragments/SetKeyword.php @@ -0,0 +1,105 @@ + 1 + * + * 1 ------------------------[ , ]------------------------> 0 + * 1 ----------------------[ value ]----------------------> 1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + // No keyword is expected. + if ($token->type === Token::TYPE_KEYWORD) { + break; + } + + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === ',') { + $ret[] = $expr; + $expr = new SetKeyword(); + $state = 0; + continue; + } elseif ($token->value === '=') { + $state = 1; + } + } + + $expr->tokens[] = $token; + if ($state === 0) { + $expr->column .= $token->value; + } else { // } else if ($state === 1) { + $expr->value = $token->value; + } + + } + + // Last iteration was not saved. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/ValuesKeyword.php b/libraries/sql-parser/src/Fragments/ValuesKeyword.php new file mode 100644 index 0000000000..c6bd551772 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/ValuesKeyword.php @@ -0,0 +1,115 @@ + 1 + * + * 1 ----------------------[ value ]---------------------> 2 + * + * 2 ------------------------[ , ]-----------------------> 1 + * 2 ------------------------[ ) ]-----------------------> 3 + * + * 3 ---------------------[ options ]--------------------> 4 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + // No keyword is expected. + if ($token->type === Token::TYPE_KEYWORD) { + break; + } + + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === '(') { + $state = 1; + continue; + } elseif ($token->value === ',') { + if ($state !== 3) { + $expr->values[] = $value; + $value = ''; + $state = 1; + } + continue; + } elseif ($token->value === ')') { + $state = 3; + $expr->values[] = $value; + $ret[] = $expr; + $value = ''; + $expr = new ValuesKeyword(); + continue; + } + + // No other operator is expected. + break; + } + + $expr->tokens[] = $token; + if ($state === 1) { + $value .= $token->value; + $state = 2; + } + + } + + // Last iteration was not saved. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php new file mode 100644 index 0000000000..786efbfa9a --- /dev/null +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -0,0 +1,100 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + // Conditions are delimited by logical operators. + if (in_array($token->value, static::$OPERATORS, true)) { + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + $expr = new WhereKeyword(); + $expr->isOperator = true; + $expr->condition = $token->value; + $epxr->tokens[] = $token; + $ret[] = $expr; + + $expr = new WhereKeyword(); + + continue; + } + + // No keyword is expected. + if ($token->type === Token::TYPE_KEYWORD) { + break; + } + + $expr->tokens[] = $token; + $expr->condition .= $token->token; + + } + + // Last iteration was not processed. + if (!empty($expr->tokens)) { + $ret[] = $expr; + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php new file mode 100644 index 0000000000..238d63b1f8 --- /dev/null +++ b/libraries/sql-parser/src/Lexer.php @@ -0,0 +1,578 @@ +str = $str; + $this->len = ($str instanceof UtfString) ? + $str->length() : strlen($str); + $this->strict = $strict; + $this->lex(); + } + + /** + * Parses the string and extracts lexems. + * + * @param string|UtfString $str + */ + public function lex() + { + // TODO: Sometimes, static::parse* functions make unnecessary calls to + // is* functions. For a better performance, some rules can be deduced + // from context. + // For example, in `parseBool` there is no need to compare the token + // every time with `true` and `false`. The first step would be to + // compare with 'true' only and just after that add another letter from + // context and compare again with `false`. + // Another example is `parseComment`. + + $tokens = new TokensList(); + $lastToken = NULL; + + for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) { + /** @var Token The new token. */ + $token = null; + + foreach (static::$PARSER_METHODS as $method) { + if (($token = $this->$method())) { + break; + } + } + + if ($token === null) { + // @assert($this->last === $lastIdx); + $token = new Token($this->str[$this->last]); + if ($this->delimiter !== $this->str[$this->last]) { + $this->error('Unexpected character.', $this->str[$this->last], $this->last); + } + } else if (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) && + ($lastToken !== NULL)) { + // Handles ```... FROM 'user'@'%' ...```. + if ((($lastToken->type === Token::TYPE_SYMBOL) && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)) || + ($lastToken->type === Token::TYPE_STRING)) { + $lastToken->token .= $token->token; + $lastToken->type = Token::TYPE_SYMBOL; + $lastToken->flags = Token::FLAG_SYMBOL_USER; + $lastToken->value .= '@' . $token->value; + continue; + } + } + $token->position = $lastIdx; + + $tokens->tokens[$tokens->count++] = $token; + + // Handling delimiters. + if ($this->delimiter === '') { + // Updating the delimiter. + if ($token->type !== Token::TYPE_WHITESPACE) { + $this->delimiter = $token->value; + } + } elseif ($token->value === 'DELIMITER') { + // `DELIMITER` keyword found, looking for a delimiter. + $this->delimiter = ''; + } + + // Overwriting token if delimiter. + if ($token->value === $this->delimiter) { + $token->type = Token::TYPE_DELIMITER; + $token->flags = 0; + } + + $lastToken = $token; + } + + // Adding a final delimite at the end to mark the ending. + $tokens->tokens[$tokens->count++] = new Token(null, Token::TYPE_DELIMITER); + + // Saving the tokens list. + $this->tokens = $tokens; + } + + /** + * Creates a new error log. + * + * @param string $msg + * @param string $str + * @param int $code + */ + public function error($msg = '', $str = '', $pos = 0, $code = 0) + { + $error = new LexerException($msg, $str, $pos, $code); + if ($this->strict) { + throw $error; + } + $this->errors[] = $error; + } + + /** + * Parses a keyword. + * + * @return Token + */ + public function parseKeyword() + { + $token = ''; + + /** @var Token Value to be returned. */ + $ret = null; + + /** @var int The value of `$this->last` where `$token` ends in `$this->str`. */ + $iEnd = $this->last; + + for ($j = 1; $j < Context::KEYWORD_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) { + $token .= $this->str[$this->last]; + if (($this->last + 1 === $this->len) || (Context::isSeparator($this->str[$this->last + 1]))) { + if (Context::isKeyword($token)) { + $ret = new Token($token, Token::TYPE_KEYWORD); + $iEnd = $this->last; + // We don't break so we find longest keyword. + // For example, `OR` and `ORDER` have a common prefix `OR`. + // If we stopped at `OR`, the parsing would be invalid. + } + } + } + + $this->last = $iEnd; + return $ret; + } + + /** + * Parses an operator. + * + * @return Token + */ + public function parseOperator() + { + $token = ''; + + /** @var Token|bool Value to be returned. */ + $ret = false; + + /** @var int The value of `$this->last` where `$token` ends in `$this->str`. */ + $iEnd = $this->last; + + for ($j = 1; $j < Context::OPERATOR_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) { + $token .= $this->str[$this->last]; + if ($flags = Context::isOperator($token)) { + $ret = new Token($token, Token::TYPE_OPERATOR, $flags); + $iEnd = $this->last; + } + } + + $this->last = $iEnd; + return $ret; + } + + /** + * Parses a whitespace. + * + * @return Token + */ + public function parseWhitespace() + { + $token = $this->str[$this->last]; + + if (!Context::isWhitespace($token)) { + return null; + } + + while ((++$this->last < $this->len) && (Context::isWhitespace($this->str[$this->last]))) { + $token .= $this->str[$this->last]; + } + + --$this->last; + return new Token($token, Token::TYPE_WHITESPACE); + } + + /** + * Parses a comment. + * + * @return Token + */ + public function parseComment() + { + $iBak = $this->last; + $token = $this->str[$this->last]; + + // Bash style comments. (#comment\n) + if (Context::isComment($token)) { + while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) { + $token .= $this->str[$this->last]; + } + $token .= $this->str[$this->last]; + return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_BASH); + } + + // C style comments. (/*comment*\/) + if (++$this->last < $this->len) { + $token .= $this->str[$this->last]; + if (Context::isComment($token)) { + $flags = Token::FLAG_COMMENT_C; + if (($this->last + 1 < $this->len) && ($this->str[$this->last + 1] === '!')) { + // It is a MySQL-specific command. + $flags |= Token::FLAG_COMMENT_MYSQL_CMD; + } + while ((++$this->last < $this->len) && + (($this->str[$this->last - 1] !== '*') || ($this->str[$this->last] !== '/'))) { + $token .= $this->str[$this->last]; + } + $token .= $this->str[$this->last]; + return new Token($token, Token::TYPE_COMMENT, $flags); + } + } + + // SQL style comments. (-- comment\n) + if (++$this->last < $this->len) { + $token .= $this->str[$this->last]; + if (Context::isComment($token)) { + if ($this->str[$this->last] !== "\n") { + // Checking if this comment did not end already (```--\n```). + while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) { + $token .= $this->str[$this->last]; + } + if ($this->last < $this->len) { + $token .= $this->str[$this->last]; + } + } + return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_SQL); + } + } + + $this->last = $iBak; + return null; + } + + /** + * Parses a boolean. + * + * @return Token + */ + public function parseBool() + { + if ($this->last + 3 >= $this->len) { + // At least `min(strlen('TRUE'), strlen('FALSE'))` characters are + // required. + return null; + } + + $iBak = $this->last; + $token = $this->str[$this->last] . $this->str[++$this->last] + . $this->str[++$this->last] . $this->str[++$this->last]; // _TRUE_ or _FALS_e + + if (Context::isBool($token)) { + return new Token($token, Token::TYPE_BOOL); + } elseif (++$this->last < $this->len) { + $token .= $this->str[$this->last]; // fals_E_ + if (Context::isBool($token)) { + return new Token($token, Token::TYPE_BOOL, 1); + } + } + + $this->last = $iBak; + return null; + } + + /** + * Parses a number. + * + * @return Token + */ + public function parseNumber() + { + // A rudimentary state machine is being used to parse numbers due to + // the various forms of their notation. + // + // Below are the states of the machines and the conditions to change + // the state. + // + // 1 ---------------------[ + or - ]---------------------> 1 + // 1 --------------------[ 0x or 0X ]--------------------> 2 + // 1 ---------------------[ 0 to 9 ]---------------------> 3 + // 1 ------------------------[ . ]-----------------------> 4 + // + // 2 ---------------------[ 0 to F ]---------------------> 2 + // + // 3 ---------------------[ 0 to 9 ]---------------------> 3 + // 3 ------------------------[ . ]-----------------------> 4 + // 3 ---------------------[ e or E ]---------------------> 5 + // + // 4 ---------------------[ 0 to 9 ]---------------------> 4 + // 4 ---------------------[ e or E ]---------------------> 5 + // + // 5 ----------------[ + or - or 0 to 9 ]----------------> 6 + // + // State 1 may be reached by negative numbers. + // State 2 is reached only by hex numbers. + // State 4 is reached only by float numbers. + // State 5 is reached only by numbers in approximate form. + // + // Valid final states are: 2, 3, 4 and 6. Any parsing that finished in a + // state other than these is invalid. + $iBak = $this->last; + $token = ''; + $flags = 0; + $state = 1; + for (; $this->last < $this->len; ++$this->last) { + if ($state === 1) { + if ($this->str[$this->last] === '+') { + // Do nothing. + } elseif ($this->str[$this->last] === '-') { + $flags |= Token::FLAG_NUMBER_NEGATIVE; + // Do nothing. + } elseif (($this->str[$this->last] === '0') && ($this->last + 1 < $this->len) && + (($this->str[$this->last + 1] === 'x') || ($this->str[$this->last + 1] === 'X'))) { + $token .= $this->str[$this->last++]; + $state = 2; + } elseif (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { + $state = 3; + } elseif ($this->str[$this->last] === '.') { + $state = 4; + } else { + break; + } + } elseif ($state === 2) { + $flags |= Token::FLAG_NUMBER_HEX; + if ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) || + (($this->str[$this->last] >= 'A') && ($this->str[$this->last] <= 'F')) || + (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f'))) { + // Do nothing. + } else { + break; + } + } elseif ($state === 3) { + if (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { + // Do nothing. + } elseif ($this->str[$this->last] === '.') { + $state = 4; + } elseif (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) { + $state = 5; + } else { + break; + } + } elseif ($state === 4) { + $flags |= Token::FLAG_NUMBER_FLOAT; + if (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { + // Do nothing. + } elseif (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) { + $state = 5; + } else { + break; + } + } elseif ($state === 5) { + $flags |= Token::FLAG_NUMBER_APPROXIMATE; + if (($this->str[$this->last] === '+') || ($this->str[$this->last] === '-') || + ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')))) { + $state = 6; + } else { + break; + } + } elseif ($state === 6) { + if (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { + // Do nothing. + } else { + break; + } + } + $token .= $this->str[$this->last]; + } + if (($state === 2) || ($state === 3) || (($token !== '.') && ($state === 4)) || ($state === 6)) { + --$this->last; + return new Token($token, Token::TYPE_NUMBER, $flags); + } + $this->last = $iBak; + return null; + } + + /** + * Parses a string. + * + * @param string $quote Additional start symbol. + * + * @return Token + */ + public function parseString($quote = '') + { + $token = $this->str[$this->last]; + if ((!($flags = Context::isString($token))) && ($token !== $quote)) { + return null; + } + $quote = $token; + + while (++$this->last < $this->len) { + if (($this->last + 1 < $this->len) && + ((($this->str[$this->last] === $quote) && ($this->str[$this->last + 1] === $quote)) || + (($this->str[$this->last] === '\\') && ($quote !== '`')))) { + $token .= $this->str[$this->last] . $this->str[++$this->last]; + } else { + if ($this->str[$this->last] === $quote) { + break; + } + $token .= $this->str[$this->last]; + } + } + + if (($this->last >= $this->len) || ($this->str[$this->last] !== $quote)) { + $this->error('Ending quote ' . $quote . ' was expected.', '', $this->last); + } else { + $token .= $this->str[$this->last]; + } + return new Token($token, Token::TYPE_STRING, $flags); + } + + /** + * Parses a symbol. + * + * @return Token + */ + public function parseSymbol() + { + $token = $this->str[$this->last]; + if (!($flags = Context::isSymbol($token))) { + return null; + } + + if ($flags & Token::FLAG_SYMBOL_VARIABLE) { + ++$this->last; + } else { + $token = ''; + } + + if (($str = $this->parseString('`')) === null) { + if (($str = static::parseUnknown()) === null) { + $this->error('Variable name was expected.', $this->str[$this->last], $this->last); + } + } + + if ($str !== null) { + $token .= $str->token; + } + + return new Token($token, Token::TYPE_SYMBOL, $flags); + } + + /** + * Parses unknown parts of the query. + * + * @return Token + */ + public function parseUnknown() + { + $token = $this->str[$this->last]; + if (Context::isSeparator($token)) { + return null; + } + while ((++$this->last < $this->len) && (!Context::isSeparator($this->str[$this->last]))) { + $token .= $this->str[$this->last]; + } + --$this->last; + return new Token($token); + } +} diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php new file mode 100644 index 0000000000..95ecf6cf63 --- /dev/null +++ b/libraries/sql-parser/src/Parser.php @@ -0,0 +1,189 @@ + '', + 'CREATE' => 'SqlParser\\Statements\\CreateStatement', + 'DROP' => '', + 'RENAME' => 'SqlParser\\Statements\\RenameStatement', + 'TRUNCATE' => '', + + // 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', + 'DO' => '', + 'HANDLER' => '', + 'INSERT' => 'SqlParser\\Statements\\InsertStatement', + 'LOAD' => '', + 'REPLACE' => 'SqlParser\\Statements\\ReplaceStatement', + 'SELECT' => 'SqlParser\\Statements\\SelectStatement', + 'UPDATE' => 'SqlParser\\Statements\\UpdateStatement', + + // Prepared Statements. + // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-prepared-statements.html + 'PREPARE' => '', + 'EXECUTE' => '', + ); + + /** + * Array of classes that are used in parsing SQL fragments. + * + * @var array + */ + public static $KEYWORD_PARSERS = array( + + // Meta-keywords. + '_ARRAY' => 'SqlParser\\Fragments\\ArrayFragment', + '_CALL' => 'SqlParser\\Fragments\\CallKeyword', + '_CREATE_DEF' => 'SqlParser\\Fragments\\CreateDefFragment', + '_DATA_TYPE' => 'SqlParser\\Fragments\\CreateDefFragment', + '_FIELD' => 'SqlParser\\Fragments\\FieldFragment', + '_FIELD_DEF' => 'SqlParser\\Fragments\\FieldDefFragment', + '_OPTIONS' => 'SqlParser\\Fragments\\OptionsFragment', + '_RENAME' => 'SqlParser\\Fragments\\RenameKeyword', + '_SELECT' => 'SqlParser\\Fragments\\SelectKeyword', + + 'FROM' => 'SqlParser\\Fragments\\FromKeyword', + 'GROUP' => 'SqlParser\\Fragments\\GroupFragment', + 'HAVING' => 'SqlParser\\Fragments\\WhereKeyword', + 'INTO' => 'SqlParser\\Fragments\\IntoKeyword', + 'JOIN' => 'SqlParser\\Fragments\\JoinKeyword', + 'LIMIT' => 'SqlParser\\Fragments\\LimitKeyword', + 'ORDER' => 'SqlParser\\Fragments\\OrderKeyword', + 'PARTITION' => 'SqlParser\\Fragments\\ArrayFragment', + 'SET' => 'SqlParser\\Fragments\\SetKeyword', + 'VALUE' => 'SqlParser\\Fragments\\ValuesKeyword', + 'VALUES' => 'SqlParser\\Fragments\\ValuesKeyword', + 'WHERE' => 'SqlParser\\Fragments\\WhereKeyword', + + ); + + /** + * The list of tokens that are parsed. + * + * @var TokensList + */ + public $list; + + /** + * Whether errors should throw exceptions or just be stored. + * + * @var bool + * + * @see static::$errors + */ + public $strict = false; + + /** + * List of errors that occured during parsing. + * + * Usually, the parsing does not stop once an error occured because that + * error might be misdetected or a partial result (even a bad one) might be + * needed. + * + * @var ParserException[] + * + * @see Parser::error() + */ + public $errors = array(); + + /** + * List of statements parsed. + * + * @var Statement[] + */ + public $statements = array(); + + /** + * Constructor. + * + * @param mixed $list + * @param bool $strict + */ + public function __construct($list, $strict = false) + { + if ((is_string($list)) || ($list instanceof UtfString)) { + $lexer = new Lexer($list, $strict); + $this->list = $lexer->tokens; + } elseif ($list instanceof TokensList) { + $this->list = $list; + } + $this->strict = $strict; + $this->parse(); + } + + /** + * Builds the parse trees. + */ + public function parse() + { + $tokens = &$this->list->tokens; + $count = &$this->list->count; + $last = &$this->list->idx; + + for (; $last < $count; ++$last) { + /** @var Token Token parsed at this moment. */ + $token = $tokens[$last]; + + // Statements can start with keywords only. + // Comments, whitespaces, etc. are ignored. + if ($token->type !== Token::TYPE_KEYWORD) { + continue; + } + + // Checking if it is a known statement that can be parsed. + if (empty(static::$STATEMENT_PARSERS[$token->value])) { + $this->error( + 'Unrecognized statement type "' . $token->value .'".', + $token + ); + // TODO: Skip to first delimiter. + continue; + } + + /** @var string The name of the class that is used for parsing. */ + $class = static::$STATEMENT_PARSERS[$token->value]; + + /** @var Statement Processed statement. */ + $stmt = new $class(); + + $stmt->parse($this, $this->list); + $this->statements[] = $stmt; + } + } + + /** + * Creates a new error log. + * + * @param string $str + * @param Token $token + * @param int $code + */ + public function error($str = '', Token $token = null, $code = 0) + { + $error = new ParserException($str, $token, $code); + if ($this->strict) { + throw $error; + } + $this->errors[] = $error; + } +} diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php new file mode 100644 index 0000000000..b1dc2c1064 --- /dev/null +++ b/libraries/sql-parser/src/Statement.php @@ -0,0 +1,145 @@ +idx < $list->count; ++$list->idx) { + /** @var Token Token parsed at this moment. */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Only keywords are relevant here. Other parts of the query are + // processed in the functions below. + if ($token->type !== Token::TYPE_KEYWORD) { + continue; + } + + /** @var string The name of the class that is used for parsing. */ + $class = null; + + if (!empty(Parser::$KEYWORD_PARSERS[$token->value])) { + $class = Parser::$KEYWORD_PARSERS[$token->value]; + } elseif (!empty(Parser::$STATEMENT_PARSERS[$token->value])) { + // The keyword we are processing right now is the beginning of a + // statement and they are usually handled differently. + } else { + $parser->error( + 'Unrecognized keyword "' . $token->value . '".', + $token + ); + continue; + } + + /** @var string The name of the field where the result is stored. */ + $field = strtolower($token->value); + + // Parsing options. + if (($class == null) && (isset(static::$OPTIONS))) { + ++$list->idx; // Skipping keyword. + $this->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + } + + // Keyword specific code. + if ($token->value === 'CALL') { + ++$list->idx; + $this->call = CallKeyword::parse($parser, $list); + } elseif ($token->value === 'CREATE') { + ++$list->idx; + $this->name = CreateDefFragment::parse($parser, $list); + if ($this->options->has('TABLE')) { + ++$list->idx; + $this->fields = FieldDefFragment::parse($parser, $list); + ++$list->idx; + $this->tableOptions = OptionsFragment::parse($parser, $list, CreateDefFragment::$TABLE_OPTIONS); + } elseif (($this->options->has('PROCEDURE')) || ($this->options->has('FUNCTION'))) { + ++$list->idx; + $this->parameters = ParamDefFragment::parse($parser, $list); + if ($this->options->has('FUNCTION')) { + $token = $list->getNextOfType(Token::TYPE_KEYWORD); + if ($token->value !== 'RETURNS') { + $parser->error('\'RETURNS\' keyword was expected.', $token); + } else { + ++$list->idx; + $this->return = DataTypeFragment::parse($parser, $list); + } + } + ++$list->idx; + $this->funcOptions = OptionsFragment::parse($parser, $list, CreateDefFragment::$FUNC_OPTIONS); + ++$list->idx; + $this->body = array(); + for (; $list->idx < $list->count; ++$list->idx) { + $token = $list->tokens[$list->idx]; + $this->body[] = $token; + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'END')) { + break; + } + } + $class = null; // The statement has been processed here. + } + } elseif (($token->value === 'GROUP') || ($token->value === 'ORDER')) { + $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'BY'); + } elseif ($token->value === 'RENAME') { + $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); + ++$list->idx; + $this->renames = RenameKeyword::parse($parser, $list); + } elseif ($token->value === 'SELECT') { + ++$list->idx; // Skipping last option. + $this->expr = SelectKeyword::parse($parser, $list); + } elseif ($token->value === 'UPDATE') { + ++$list->idx; // Skipping last option. + $this->from = FromKeyword::parse($parser, $list); + } + + // Finally, processing the keyword (if possible). + if ($class !== null) { + ++$list->idx; // Skipping keyword. + $this->$field = $class::parse($parser, $list, array()); + } + } + + $this->last = --$list->idx; // Go back to last used token. + } +} diff --git a/libraries/sql-parser/src/Statements/CallStatement.php b/libraries/sql-parser/src/Statements/CallStatement.php new file mode 100644 index 0000000000..76681b52c8 --- /dev/null +++ b/libraries/sql-parser/src/Statements/CallStatement.php @@ -0,0 +1,19 @@ + 1, + 'EVENT' => 1, + 'FUNCTION' => 1, + 'INDEX' => 1, + 'PROCEDURE' => 1, + 'SERVER' => 1, + 'TABLE' => 1, + 'TABLESPACE' => 1, + 'TRIGGER' => 1, + 'VIEW' => 1, + + 'TEMPORARY' => 2, + 'IF NOT EXISTS' => 3, + 'DEFINER' => array(4, 'var'), + ); + + /** + * The name of the enw table. + * + * @var CreateDefFragment + */ + public $name; + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * The parameters of this routine. + * + * @var ParamDefFragment[] + */ + public $parameters; + + /** + * The options of the table. + * + * @var OptionsFragment + * + * @see CreateDefFragment::$TABLE_OPTIONS + */ + public $tableOptions; + + /** + * Field created by this statement. + * + * @var FieldDefFragment[] + */ + public $fields; + + /** + * The body of this function or procedure. + * + * @var Token[] + */ + public $body; +} diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php new file mode 100644 index 0000000000..01dd8adc2f --- /dev/null +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -0,0 +1,74 @@ + 1, + 'QUICK' => 2, + 'IGNORE' => 3, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Tables used as sources for this statement. + * + * @var FieldFragment[] + */ + public $from; + + /** + * Partitions used as source for this statement. + * + * @var ArrayFragment + */ + public $partition; + + /** + * Conditions used for filtering each row of the result set. + * + * @var WhereKeyword[] + */ + public $where; + + /** + * Specifies the order of the rows in the result set. + * + * @var OrderKeyword[] + */ + public $order; + + /** + * Conditions used for limiting the size of the result set. + * + * @var LimitKeyword + */ + public $limit; +} diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php new file mode 100644 index 0000000000..f24634ac33 --- /dev/null +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -0,0 +1,78 @@ + 1, + 'DELAYED' => 2, + 'HIGH_PRIORITY' => 3, + 'IGNORE' => 4, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Tables used as target for this statement. + * + * @var IntoKeyword + */ + public $into; + + /** + * Values to be inserted. + * + * @var ValuesKeyword + */ + public $values; +} diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php new file mode 100644 index 0000000000..bd3c767d53 --- /dev/null +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -0,0 +1,23 @@ + 1, + 'DELAYED' => 1, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Tables used as target for this statement. + * + * @var IntoKeyword + */ + public $into; + + /** + * Values to be replaced. + * + * @var ValuesKeyword + */ + public $values; + + /** + * The replaced values. + * + * @var SetKeyword[] + */ + public $set; +} diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php new file mode 100644 index 0000000000..d17450eb04 --- /dev/null +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -0,0 +1,130 @@ + 1, + 'DISTINCT' => 1, + 'DISTINCTROW' => 1, + 'HIGH_PRIORITY' => 2, + 'MAX_STATEMENT_TIME' => array(3, 'var'), + 'STRAIGHT_JOIN' => 4, + 'SQL_SMALL_RESULT' => 5, + 'SQL_BIG_RESULT' => 6, + 'SQL_BUFFER_RESULT' => 7, + 'SQL_CACHE' => 8, + 'SQL_NO_CACHE' => 8, + 'SQL_CALC_FOUND_ROWS' => 9, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Expressions that are being selected by this statement. + * + * @var FieldFragment[] + */ + public $expr; + + /** + * Tables used as sources for this statement. + * + * @var FieldFragment[] + */ + public $from; + + /** + * Partitions used as source for this statement. + * + * @var ArrayFragment[] + */ + public $partition; + + /** + * Conditions used for filtering each row of the result set. + * + * @var WhereKeyword + */ + public $where; + + /** + * Conditions used for grouping the result set. + * + * @var GroupKeyword + */ + public $group; + + /** + * Conditions used for filtering the result set. + * + * @var WhereKeyword[] + */ + public $having; + + /** + * Specifies the order of the rows in the result set. + * + * @var OrderKeyword[] + */ + public $order; + + /** + * Conditions used for limiting the size of the result set. + * + * @var LimitKeyword + */ + public $limit; + + /** + * Joins. + * + * @var JoinKeyword + */ + public $join; +} diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php new file mode 100644 index 0000000000..cdeab0367f --- /dev/null +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -0,0 +1,79 @@ + 1, + 'IGNORE' => 2, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Tables used as sources for this statement. + * + * @var FieldFragment[] + */ + public $from; + + /** + * The updated values. + * + * @var SetKeyword[] + */ + public $set; + + /** + * Conditions used for filtering each row of the result set. + * + * @var WhereKeyword[] + */ + public $where; + + /** + * Specifies the order of the rows in the result set. + * + * @var OrderKeyword[] + */ + public $order; + + /** + * Conditions used for limiting the size of the result set. + * + * @var LimitKeyword + */ + public $limit; +} diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php new file mode 100644 index 0000000000..61fb16b57f --- /dev/null +++ b/libraries/sql-parser/src/Token.php @@ -0,0 +1,253 @@ +, !==, etc. + * Bitwise operators: &, |, ^, etc. + * Assignment operators: =, +=, -=, etc. + * SQL specific operators: . (e.g. .. WHERE database.table ..), + * * (e.g. SELECT * FROM ..) + * + * @var int + */ + const TYPE_OPERATOR = 2; + + /** + * Spaces, tabs, new lines, etc. + * + * @var int + */ + const TYPE_WHITESPACE = 3; + + /** + * Any type of legal comment. + * + * Bash (#), C (/* *\/) or SQL (--) comments: + * + * -- SQL-comment + * + * #Bash-like comment + * + * /*C-like comment*\/ + * + * or: + * + * /*C-like + * comment*\/ + * + * Backslashes were added to respect PHP's comments syntax. + * + * @var int + */ + const TYPE_COMMENT = 4; + + /** + * Boolean values: true or false. + * + * @var int + */ + const TYPE_BOOL = 5; + + /** + * Numbers: 4, 0x8, 15.16, 23e42, etc. + * + * @var int + */ + const TYPE_NUMBER = 6; + + /** + * Literal strings: 'string', "test". + * Some of these strings are actually symbols. + * + * @var int + */ + const TYPE_STRING = 7; + + /** + * Database, table names, variables, etc. + * For example: ```SELECT `foo`, `bar` FROM `database`.`table`;``` + * + * @var int + */ + const TYPE_SYMBOL = 8; + + /** + * Delimits an unknown string. + * For example: ```SELECT * FROM test;```, `test` is a delimiter. + * + * @var int + */ + const TYPE_DELIMITER = 9; + + // Flags that describe the tokens in more detail. + + // Numbers related flags. + const FLAG_NUMBER_HEX = 1; + const FLAG_NUMBER_FLOAT = 2; + const FLAG_NUMBER_APPROXIMATE = 4; + const FLAG_NUMBER_NEGATIVE = 8; + + // Strings related flags. + const FLAG_STRING_SINGLE_QUOTES = 1; + const FLAG_STRING_DOUBLE_QUOTES = 2; + + // Comments related flags. + const FLAG_COMMENT_BASH = 1; + const FLAG_COMMENT_C = 2; + const FLAG_COMMENT_SQL = 4; + const FLAG_COMMENT_MYSQL_CMD = 8; + + // Operators related flags. + const FLAG_OPERATOR_ARITHMETIC = 1; + const FLAG_OPERATOR_LOGICAL = 2; + const FLAG_OPERATOR_BITWISE = 4; + const FLAG_OPERATOR_ASSIGNMENT = 8; + const FLAG_OPERATOR_SQL = 16; + + // Symbols related flags. + const FLAG_SYMBOL_VARIABLE = 1; + const FLAG_SYMBOL_BACKTICK = 2; + const FLAG_SYMBOL_USER = 4; + + /** + * The token it its raw string representation. + * + * @var string + */ + public $token; + + /** + * The value this token contains (i.e. token after some evaluation) + * + * @var mixed + */ + public $value; + + /** + * The type of this token. + * + * @var int + */ + public $type; + + /** + * The flags of this token. + * + * @var int + */ + public $flags; + + /** + * The position in the inial string where this token started. + * + * @var int + */ + public $position; + + /** + * Constructor. + * + * @param string $token + * @param int $type + * @param int $flags + * @param int $position + */ + public function __construct($token, $type = 0, $flags = 0) + { + $this->token = $token; + $this->type = $type; + $this->flags = $flags; + $this->value = $this->extract(); + } + + /** + * Does little processing to the token to extract a value. + * + * If no processing can be done it will return the initial string. + * + * @return mixed + */ + public function extract() + { + switch ($this->type) { + case Token::TYPE_KEYWORD: + return strtoupper($this->token); + case Token::TYPE_WHITESPACE: + return ' '; + case Token::TYPE_BOOL: + return strtoupper($this->token) === 'TRUE'; + case Token::TYPE_NUMBER: + $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 + if ($this->flags & Token::FLAG_NUMBER_HEX) { + if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { + $ret = str_replace('-', '', $this->token); + sscanf($ret, "%x", $ret); + $ret = -$ret; + } else { + sscanf($ret, "%x", $ret); + } + } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) || + ($this->flags & Token::FLAG_NUMBER_FLOAT)) { + sscanf($ret, "%f", $ret); + } else { + sscanf($ret, "%d", $ret); + } + return $ret; + case Token::TYPE_STRING: + return mb_substr($this->token, 1, -1); // trims quotes + case Token::TYPE_SYMBOL: + $str = $this->token; + if ((isset($str[0])) && ($str[0] === '@')) { + $str = mb_substr($str, 1); + } + if ((isset($str[0])) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\''))) { + $str = mb_substr($str, 1, -1); + } + return $str; + } + return $this->token; + } + + /** + * Converts the token into an inline token by replacing tabs and new lines. + * + * @return string + */ + public function getInlineToken() + { + return str_replace( + array("\r", "\n", "\t"), + array('\r', '\n', '\t'), + $this->token + ); + } +} diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php new file mode 100644 index 0000000000..405f4a121b --- /dev/null +++ b/libraries/sql-parser/src/TokensList.php @@ -0,0 +1,118 @@ +tokens[$this->count++] = $token; + } + + /** + * Gets next token in list. + * + * @return Token + */ + public function getNext() + { + if ($this->idx < $this->count) { + return $this->tokens[$this->idx++]; + } + return null; + } + + /** + * Gets next token of a specified type. + * + * @param int $type + * + * @return Token + */ + public function getNextOfType($type) + { + for (; $this->idx < $this->count; ++$this->idx) { + if ($this->tokens[$this->idx]->type === $type) { + return $this->tokens[$this->idx++]; + } + } + return null; + } + + /** + * Gets next token of a specified type. + * + * @param int $type + * @param string $value + * + * @return Token + */ + public function getNextOfTypeAndValue($type, $value) + { + for (; $this->idx < $this->count; ++$this->idx) { + if (($this->tokens[$this->idx]->type === $type) && + ($this->tokens[$this->idx]->value === $value)) { + return $this->tokens[$this->idx++]; + } + } + return null; + } + + // ArrayAccess methods. + + public function offsetSet($offset, $value) + { + if ($offset === null) { + $this->tokens[$this->count++] = $value; + } else { + $this->tokens[$offset] = $value; + } + } + + public function offsetGet($offset) + { + return $offset < $this->count ? $this->tokens[$offset] : null; + } + + public function offsetExists($offset) + { + return $offset < $this->count; + } + + public function offsetUnset($offset) + { + unset($this->tokens[$offset]); + --$this->count; + for ($i = $offset; $i < $this->count; ++$i) { + $this->tokens[$i] = $this->tokens[$i + 1]; + } + unset($this->tokens[$this->count]); + } +} diff --git a/libraries/sql-parser/src/UtfString.php b/libraries/sql-parser/src/UtfString.php new file mode 100644 index 0000000000..8815e58367 --- /dev/null +++ b/libraries/sql-parser/src/UtfString.php @@ -0,0 +1,220 @@ +str = $str; + $this->byteIdx = 0; + $this->charIdx = 0; + // TODO: `strlen($str)` might return a wrong length when function + // overloading is enabled. + // https://php.net/manual/ro/mbstring.overload.php + $this->byteLen = strlen($str); + $this->charLen = mb_strlen($str); + } + + /** + * Checks if the given offset exists. + * + * @param int $offset + * + * @return bool + */ + public function offsetExists($offset) + { + return $offset < $charLen; + } + + /** + * Gets the character at given offset. + * + * @param int $offset + * + * @return string + */ + public function offsetGet($offset) + { + if (($offset < 0) || ($offset >= $this->charLen)) { + return null; + } + + $delta = $offset - $this->charIdx; + + if ($delta > 0) { + // Fast forwarding. + while ($delta-- > 0) { + $this->byteIdx += static::getCharLength($this->str[$this->byteIdx]); + ++$this->charIdx; + } + } elseif ($delta < 0) { + // Rewinding. + while ($delta++ < 0) { + do { + $byte = ord($this->str[--$this->byteIdx]); + } while ((128 <= $byte) && ($byte < 192)); + --$this->charIdx; + } + } + + $bytesCount = static::getCharLength($this->str[$this->byteIdx]); + + $ret = ''; + for ($i = 0; $bytesCount-- > 0; ++$i) { + $ret .= $this->str[$this->byteIdx + $i]; + } + + return $ret; + } + + /** + * Sets the value of a character. + * + * @param int $offset + * @param string $value + */ + public function offsetSet($offset, $value) + { + throw new \Exception('Not implemented.'); + } + + /** + * Unsets an index. + * + * @param int $offset + */ + public function offsetUnset($offset) + { + throw new \Exception('Not implemented.'); + } + + /** + * Gets the length of an UTF-8 character. + * + * According to RFC 3629, a UTF-8 character can have at most 4 bytes. + * However, this implemenation supports UTF-8 characters containing up to 6 + * bytes. + * + * @see http://tools.ietf.org/html/rfc3629 + * + * @param string $byte + * + * @return int + */ + private static function getCharLength($byte) + { + $byte = ord($byte); + if ($byte < 128) { + return 1; + } elseif ($byte < 224) { + return 2; + } elseif ($byte < 240) { + return 3; + } elseif ($byte < 248) { + return 4; + } elseif ($byte === 252) { + return 5; // unofficial + } + return 6; // unofficial + } + + /** + * Returns the number of remaining characters. + * + * @return int + */ + public function remaining() + { + if ($this->charIdx < $this->charLen) { + return $this->charLen - $this->charIdx; + } + return 0; + } + + /** + * Returns the length in characters of the string. + * + * @return int + */ + public function length() + { + return $this->charLen; + } + + /** + * Gets the values of the indexes. + * + * @param int &$byte + * @param int &$char + */ + public function getIndexes(&$byte, &$char) + { + $byte = $this->byteIdx; + $char = $this->charIdx; + } + + /** + * Sets the values of the indexes. + * + * @param int $byte + * @param int $char + */ + public function setIndexes($byte = 0, $char = 0) + { + $this->byteIdx = $byte; + $this->charIdx = $char; + } +} diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php new file mode 100644 index 0000000000..aca16fe294 --- /dev/null +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -0,0 +1,91 @@ +join->expr->table)) && (!empty($tree->join->expr->alias))) { + $thisDb = empty($tree->join->expr->database) ? + $db : $tree->join->expr->database; + + $retval = array( + $thisDb => array( + 'alias' => null, + 'tables' => array( + $tree->join->expr->table => array( + 'alias' => $tree->join->expr->alias, + 'columns' => array(), + ), + ), + ), + ); + + $tables[$thisDb][$tree->join->expr->alias] = $tree->join->expr->table; + } + + foreach ($tree->from as $expr) { + if (empty($expr->table)) { + continue; + } + + $thisDb = empty($expr->database) ? $db : $expr->database; + + if (!isset($retval[$thisDb])) { + $retval[$thisDb] = array( + 'alias' => null, + 'tables' => array(), + ); + } + + if (!isset($retval[$thisDb]['tables'][$expr->table])) { + $retval[$thisDb]['tables'][$expr->table] = array( + 'alias' => empty($expr->alias) ? null : $expr->alias, + 'columns' => array(), + ); + } + + if (!isset($tables[$thisDb])) { + $tables[$thisDb] = array(); + } + $tables[$thisDb][$expr->alias] = $expr->table; + } + + foreach ($tree->expr as $expr) { + if ((empty($expr->column)) || (empty($expr->alias)) ){ + continue; + } + + $thisDb = empty($expr->database) ? $db : $expr->database; + + if (empty($expr->table)) { + foreach ($retval[$thisDb]['tables'] as &$table) { + $table['columns'][$expr->column] = $expr->alias; + } + } else { + $thisTable = isset($tables[$thisDb][$expr->table]) ? + $tables[$thisDb][$expr->table] : $expr->table; + $retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias; + } + } + + return $retval; + } + +} diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php new file mode 100644 index 0000000000..1b694e24c5 --- /dev/null +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -0,0 +1,46 @@ + 0, + 'dir' => array(), + 'name' => array(), + 'type' => array(), + 'length' => array(), + 'opts' => array(), + ); + + $idx = 0; + foreach ($tree->parameters as $param) { + $retval['dir'][$idx] = $param->inOut; + $retval['name'][$idx] = $param->name; + $retval['type'][$idx] = $param->type->name; + $retval['length'][$idx] = implode(',', $param->type->size); + $retval['opts'][$idx] = array(); + foreach ($param->type->options->options as $opt) { + $retval['opts'][$idx][] = is_string($opt) ? + $opt : $opt['value']; + } + $retval['opts'][$idx] = implode(' ', $retval['opts'][$idx]); + ++$idx; + } + + $retval['num'] = $idx; + + return $retval; + } + +} From 50a2021faf13400e8a9b9b7efdb04934c69c1f67 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 13 Jun 2015 13:53:35 +0300 Subject: [PATCH 02/57] Replaced PMA_RTN_parseAllParameters(). Signed-off-by: Dan Ungureanu --- libraries/rte/rte_list.lib.php | 17 +++++++---------- libraries/rte/rte_routines.lib.php | 14 ++++++-------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index c50b0bad5d..e233a61348 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -220,16 +220,13 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') // Check if the routine has any input parameters. If it does, // we will show a dialog to get values for these parameters, // otherwise we can execute it directly. - $params = PMA_RTN_parseAllParameters( - PMA_SQP_parse( - $GLOBALS['dbi']->getDefinition( - $db, - $routine['type'], - $routine['name'] - ) - ), - $routine['type'] - ); + + $parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition( + $db, + $routine['type'], + $routine['name'] + )); + $params = SqlParser\Utils\Routine::getParameters($parser->statements[0]); if ($routine !== false) { if (PMA_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 8f2db513ac..fdf8f5c903 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -694,14 +694,12 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) // Get required data $retval['item_name'] = $routine['SPECIFIC_NAME']; $retval['item_type'] = $routine['ROUTINE_TYPE']; - $parsed_query = PMA_SQP_parse( - $GLOBALS['dbi']->getDefinition( - $db, - $routine['ROUTINE_TYPE'], - $routine['SPECIFIC_NAME'] - ) - ); - $params = PMA_RTN_parseAllParameters($parsed_query, $routine['ROUTINE_TYPE']); + $parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition( + $db, + $routine['ROUTINE_TYPE'], + $routine['SPECIFIC_NAME'] + )); + $params = SqlParser\Utils\Routine::getParameters($parser->statements[0]); $retval['item_num_params'] = $params['num']; $retval['item_param_dir'] = $params['dir']; $retval['item_param_name'] = $params['name']; From 096492438a7ca390cd029aae11f8fe21fa1e6abb Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 13 Jun 2015 13:54:06 +0300 Subject: [PATCH 03/57] Replaced PMA_SQPdata_forbidden_word with the method implemented in lexer. Signed-off-by: Dan Ungureanu --- libraries/Util.class.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 20ac88a786..97a5e5322e 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -907,9 +907,7 @@ class PMA_Util } if (! $do_it) { - global $PMA_SQPdata_forbidden_word; - $eltNameUpper = /*overload*/mb_strtoupper($a_name); - if (!in_array($eltNameUpper, $PMA_SQPdata_forbidden_word)) { + if (!SqlParser\Context::isKeyword($a_name)) { return $a_name; } } @@ -954,9 +952,7 @@ class PMA_Util } if (! $do_it) { - global $PMA_SQPdata_forbidden_word; - $eltNameUpper = /*overload*/mb_strtoupper($a_name); - if (!in_array($eltNameUpper, $PMA_SQPdata_forbidden_word)) { + if (!SqlParser\Context::isKeyword($a_name)) { return $a_name; } } From 5d6e139dc1f4056ebef7c85c92b4e5f0459c6bd7 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 13 Jun 2015 13:54:24 +0300 Subject: [PATCH 04/57] Replaced PMA_SQP_getAliasesFromQuery(). Signed-off-by: Dan Ungureanu --- export.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/export.php b/export.php index ace2c90c09..d12976a482 100644 --- a/export.php +++ b/export.php @@ -284,14 +284,15 @@ 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 = SqlParser\Parser($sql_query); if (!empty($_REQUEST['aliases'])) { $aliases = PMA_mergeAliases( - PMA_SQP_getAliasesFromQuery($sql_query, $db), + SqlParser\Misc::getAliases($parser->statements[0], $db), $_REQUEST['aliases'] ); $_SESSION['tmpval']['aliases'] = $_REQUEST['aliases']; } else { - $aliases = PMA_SQP_getAliasesFromQuery($sql_query, $db); + $aliases = SqlParser\Misc::getAliases($parser->statements[0], $db); } /** From 9bb40c0abe4f12352ecbedc17d4e3252f6492c55 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 13 Jun 2015 14:33:48 +0300 Subject: [PATCH 05/57] Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Parser.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 95ecf6cf63..9de7fd08cf 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -52,18 +52,21 @@ class Parser public static $KEYWORD_PARSERS = array( // Meta-keywords. + /* '_ARRAY' => 'SqlParser\\Fragments\\ArrayFragment', '_CALL' => 'SqlParser\\Fragments\\CallKeyword', '_CREATE_DEF' => 'SqlParser\\Fragments\\CreateDefFragment', - '_DATA_TYPE' => 'SqlParser\\Fragments\\CreateDefFragment', + '_DATA_TYPE' => 'SqlParser\\Fragments\\DataTypeFragment', '_FIELD' => 'SqlParser\\Fragments\\FieldFragment', '_FIELD_DEF' => 'SqlParser\\Fragments\\FieldDefFragment', + '_PARAM_DEF' => 'SqlParser\\Fragments\\ParamDefFragment', '_OPTIONS' => 'SqlParser\\Fragments\\OptionsFragment', '_RENAME' => 'SqlParser\\Fragments\\RenameKeyword', '_SELECT' => 'SqlParser\\Fragments\\SelectKeyword', + */ 'FROM' => 'SqlParser\\Fragments\\FromKeyword', - 'GROUP' => 'SqlParser\\Fragments\\GroupFragment', + 'GROUP' => 'SqlParser\\Fragments\\OrderKeyword', 'HAVING' => 'SqlParser\\Fragments\\WhereKeyword', 'INTO' => 'SqlParser\\Fragments\\IntoKeyword', 'JOIN' => 'SqlParser\\Fragments\\JoinKeyword', From e057ca92ce0b1d8634ef9d67dc75eb8b689271e9 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 13 Jun 2015 18:11:25 +0300 Subject: [PATCH 06/57] Replaced PMA_SQP_isKeyWord(). Signed-off-by: Dan Ungureanu --- libraries/Table.class.php | 2 +- tbl_structure.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 35d32d7da3..d1ec487863 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1823,7 +1823,7 @@ class PMA_Table foreach ($columns as $column) { $temp = explode('.', $column); $column_name = $temp[2]; - if (PMA_SQP_isKeyWord($column_name)) { + if (SqlParser\Context::isKeyword($column_name, true)) { $return[] = $column_name; } } diff --git a/tbl_structure.php b/tbl_structure.php index 197495fc13..9d5178c048 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -51,11 +51,11 @@ if (isset($_REQUEST['reserved_word_check'])) { $columns_names = $_REQUEST['field_name']; $reserved_keywords_names = array(); foreach ($columns_names as $column) { - if (PMA_SQP_isKeyWord(trim($column))) { + if (SqlParser\Context::isKeyword(trim($column), true)) { $reserved_keywords_names[] = trim($column); } } - if (PMA_SQP_isKeyWord(trim($table))) { + if (SqlParser\Context::isKeyword(trim($table), true)) { $reserved_keywords_names[] = trim($table); } if (count($reserved_keywords_names) == 0) { From bb1c3805725202d801aabe11b34072db96e1c185 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 14 Jun 2015 02:21:37 +0300 Subject: [PATCH 07/57] Include sql-parser in tests. Signed-off-by: Dan Ungureanu --- test/bootstrap-dist.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 865e6f770b..8ecfd91cd9 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -55,6 +55,7 @@ $CFG = new PMA_Config(); // Initialize PMA_VERSION variable define('PMA_VERSION', $CFG->get('PMA_VERSION')); unset($CFG); +require_once 'libraries/sql-parser/autoload.php'; // Set proxy information from env, if available $http_proxy = getenv('http_proxy'); From 14999636327f1c4aefb7966c01f93c34c32f2c10 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 14 Jun 2015 21:45:35 +0300 Subject: [PATCH 08/57] Removed PMA_RTN_parseAllParameters(). Signed-off-by: Dan Ungureanu --- libraries/rte/rte_routines.lib.php | 79 +----------- .../rte/PMA_RTN_ParameterParser_test.php | 115 ------------------ 2 files changed, 2 insertions(+), 192 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index fdf8f5c903..f326b14974 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -80,9 +80,8 @@ function PMA_RTN_main($type) } // end PMA_RTN_main() /** - * This function parses a string containing one parameter of a routine, - * as returned by PMA_RTN_parseAllParameters() and returns an array containing - * the information about this parameter. + * This function parses a string containing one parameter of a routine + * and returns an array containing the information about this parameter. * * @param string $value A string containing one parameter of a routine * @@ -156,80 +155,6 @@ function PMA_RTN_parseOneParameter($value) return $retval; } // end PMA_RTN_parseOneParameter() -/** - * This function looks through the contents of a parsed - * SHOW CREATE [PROCEDURE | FUNCTION] query and extracts - * information about the routine's parameters. - * - * @param array $parsed_query Parsed query, returned by by PMA_SQP_parse() - * @param string $routine_type Routine type: 'PROCEDURE' or 'FUNCTION' - * - * @return array Information about the parameters of a routine. - */ -function PMA_RTN_parseAllParameters($parsed_query, $routine_type) -{ - $retval = array(); - $retval['num'] = 0; - - if ($parsed_query) { - // First get the list of parameters from the query - $buffer = ''; - $params = array(); - $fetching = false; - $depth = 0; - for ($i = 0; $i < $parsed_query['len']; $i++) { - if ($parsed_query[$i]['type'] == 'alpha_reservedWord' - && $parsed_query[$i]['data'] == $routine_type - ) { - $fetching = true; - } else if ($fetching == true - && $parsed_query[$i]['type'] == 'punct_bracket_open_round' - ) { - $depth++; - if ($depth > 1) { - $buffer .= $parsed_query[$i]['data'] . ' '; - } - } else if ($fetching == true - && $parsed_query[$i]['type'] == 'punct_bracket_close_round' - ) { - $depth--; - if ($depth > 0) { - $buffer .= $parsed_query[$i]['data'] . ' '; - } else { - break; - } - } else if ($parsed_query[$i]['type'] == 'punct_listsep' && $depth == 1) { - $params[] = $buffer; - $retval['num']++; - $buffer = ''; - } else if ($fetching == true && $depth > 0) { - $buffer .= $parsed_query[$i]['data'] . ' '; - } - } - if (! empty($buffer)) { - $params[] = $buffer; - $retval['num']++; - } - // Now parse each parameter individually - foreach ($params as $key => $value) { - list($retval['dir'][], - $retval['name'][], - $retval['type'][], - $retval['length'][], - $retval['opts'][]) = PMA_RTN_parseOneParameter($value); - } - } - // Since some indices of $retval may be still undefined, we fill - // them each with an empty array to avoid E_ALL errors in PHP. - foreach (array('dir', 'name', 'type', 'length', 'opts') as $key => $index) { - if (! isset($retval[$index])) { - $retval[$index] = array(); - } - } - - return $retval; -} // end PMA_RTN_parseAllParameters() - /** * This function looks through the contents of a parsed * SHOW CREATE [PROCEDURE | FUNCTION] query and extracts diff --git a/test/libraries/rte/PMA_RTN_ParameterParser_test.php b/test/libraries/rte/PMA_RTN_ParameterParser_test.php index 2ee03142ac..cfced81a20 100644 --- a/test/libraries/rte/PMA_RTN_ParameterParser_test.php +++ b/test/libraries/rte/PMA_RTN_ParameterParser_test.php @@ -114,120 +114,5 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase ) ); } - - /** - * Test for PMA_RTN_parseAllParameters - * - * @param string $query Query - * @param string $type Type - * @param array $target Expected output - * - * @return void - * - * @depends testParseOneParameter - * @dataProvider queryProvider - */ - public function testParseAllParameters($query, $type, $target) - { - PMA_RTN_setGlobals(); - $this->assertEquals( - $target, - PMA_RTN_parseAllParameters(PMA_SQP_parse($query), $type) - ); - } - - /** - * Data provider for testParseAllParameters - * - * @return array - */ - public function queryProvider() - { - return array( - array( - 'CREATE PROCEDURE `foo`() SET @A=0', - 'PROCEDURE', - array( - 'num' => 0, - 'dir' => array(), - 'name' => array(), - 'type' => array(), - 'length' => array(), - 'opts' => array() - ) - ), - array( - 'CREATE DEFINER=`user\\`@`somehost``(` FUNCTION `foo```(`baz` INT) BEGIN SELECT NULL; END', - 'FUNCTION', - array( - 'num' => 1, - 'dir' => array( - 0 => '' - ), - 'name' => array( - 0 => 'baz' - ), - 'type' => array( - 0 => 'INT' - ), - 'length' => array( - 0 => '' - ), - 'opts' => array( - 0 => '' - ) - ) - ), - array( - 'CREATE PROCEDURE `foo`(IN `baz\\)` INT(25) zerofill unsigned) BEGIN SELECT NULL; END', - 'PROCEDURE', - array( - 'num' => 1, - 'dir' => array( - 0 => 'IN' - ), - 'name' => array( - 0 => 'baz\\)' - ), - 'type' => array( - 0 => 'INT' - ), - 'length' => array( - 0 => '25' - ), - 'opts' => array( - 0 => 'UNSIGNED ZEROFILL' - ) - ) - ), - array( - 'CREATE PROCEDURE `foo`(IN `baz\\` INT(001) zerofill, out bazz varchar(15) charset UTF8) BEGIN SELECT NULL; END', - 'PROCEDURE', - array( - 'num' => 2, - 'dir' => array( - 0 => 'IN', - 1 => 'OUT' - ), - 'name' => array( - 0 => 'baz\\', - 1 => 'bazz' - ), - 'type' => array( - 0 => 'INT', - 1 => 'VARCHAR' - ), - 'length' => array( - 0 => '1', - 1 => '15' - ), - 'opts' => array( - 0 => 'ZEROFILL', - 1 => 'utf8' - ) - ) - ), - ); - } } ?> From 02f6c7f4c06111677baa6e873d82df0d6d16c133 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 15 Jun 2015 20:04:27 +0300 Subject: [PATCH 09/57] Replaced PMA_RTN_parseOneParameter(). Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/rte/rte_routines.lib.php | 2 +- .../src/Fragments/DataTypeFragment.php | 4 +- .../src/Fragments/ParamDefFragment.php | 2 +- libraries/sql-parser/src/Lexer.php | 6 +- libraries/sql-parser/src/Parser.php | 8 +- libraries/sql-parser/src/Token.php | 6 +- libraries/sql-parser/src/Utils/Misc.php | 3 +- libraries/sql-parser/src/Utils/Routine.php | 75 ++++++++++++++++++- 8 files changed, 93 insertions(+), 13 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index f326b14974..c36326f718 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -684,7 +684,7 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) } $routine['DTD_IDENTIFIER'] = $dtd; } - $returnparam = PMA_RTN_parseOneParameter($routine['DTD_IDENTIFIER']); + $returnparam = SqlParser\Utils\Routine::getReturnType($routine['DTD_IDENTIFIER']); $retval['item_returntype'] = $returnparam[2]; $retval['item_returnlength'] = $returnparam[3]; $retval['item_returnopts_num'] = $returnparam[4]; diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index a5c8eca7de..c0a4f61a4c 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -88,7 +88,9 @@ class DataTypeFragment extends Fragment } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { $size = ArrayFragment::parse($parser, $list); - $ret->size = $size->array; + foreach ($size->tokens as $token) { + $ret->size[] = $token->token; + } $ret->tokens = array_merge($ret->tokens, $size->tokens); ++$list->idx; } diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php index 05bad6e663..b7d414d509 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -91,7 +91,7 @@ class ParamDefFragment extends Fragment if (($token->value === 'IN') || ($token->value === 'OUT') || ($token->value === 'INOUT')) { $expr->inOut = $token->value; ++$list->idx; - } else if ($token->value === ')') { + } elseif ($token->value === ')') { ++$list->idx; break; } else { diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index 238d63b1f8..2b980ab692 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -135,7 +135,7 @@ class Lexer // Another example is `parseComment`. $tokens = new TokensList(); - $lastToken = NULL; + $lastToken = null; for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) { /** @var Token The new token. */ @@ -153,8 +153,8 @@ class Lexer if ($this->delimiter !== $this->str[$this->last]) { $this->error('Unexpected character.', $this->str[$this->last], $this->last); } - } else if (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) && - ($lastToken !== NULL)) { + } elseif (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) && + ($lastToken !== null)) { // Handles ```... FROM 'user'@'%' ...```. if ((($lastToken->type === Token::TYPE_SYMBOL) && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)) || ($lastToken->type === Token::TYPE_STRING)) { diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 9de7fd08cf..167e9125fa 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -122,7 +122,7 @@ class Parser * @param mixed $list * @param bool $strict */ - public function __construct($list, $strict = false) + public function __construct($list = null, $strict = false) { if ((is_string($list)) || ($list instanceof UtfString)) { $lexer = new Lexer($list, $strict); @@ -130,8 +130,12 @@ class Parser } elseif ($list instanceof TokensList) { $this->list = $list; } + $this->strict = $strict; - $this->parse(); + + if ($list !== null) { + $this->parse(); + } } /** diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index 61fb16b57f..9b75c02f3e 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -223,13 +223,17 @@ class Token } return $ret; case Token::TYPE_STRING: - return mb_substr($this->token, 1, -1); // trims quotes + $quote = $this->token[0]; + $str = str_replace($quote . $quote, $quote, $this->token); + return mb_substr($str, 1, -1); // trims quotes case Token::TYPE_SYMBOL: $str = $this->token; if ((isset($str[0])) && ($str[0] === '@')) { $str = mb_substr($str, 1); } if ((isset($str[0])) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\''))) { + $quote = $str[0]; + $str = str_replace($quote . $quote, $quote, $str); $str = mb_substr($str, 1, -1); } return $str; diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index aca16fe294..dc8b4386c6 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -68,7 +68,7 @@ class Misc } foreach ($tree->expr as $expr) { - if ((empty($expr->column)) || (empty($expr->alias)) ){ + if ((empty($expr->column)) || (empty($expr->alias))) { continue; } @@ -87,5 +87,4 @@ class Misc return $retval; } - } diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 1b694e24c5..126ed539f0 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -2,9 +2,81 @@ namespace SqlParser\Utils; +use SqlParser\Lexer; +use SqlParser\Parser; +use SqlParser\Statement; +use SqlParser\Fragments\DataTypeFragment; +use SqlParser\Fragments\ParamDefFragment; + class Routine { + /** + * Parses a parameter of a routine. + * + * @param string $param Parameter's definition. + * + * @return array + */ + public function getReturnType($param) + { + $lexer = new Lexer($param); + + // A dummy parser is used for error reporting. + $param = DataTypeFragment::parse(new Parser(), $lexer->tokens); + + if ($param === null) { + return array('', '', '', '', ''); + } + + $options = array(); + foreach ($param->options->options as $opt) { + $options[] = is_string($opt) ? $opt : $opt['value']; + } + + return array( + '', + '', + $param->name, + implode(',', $param->size), + implode(' ', $options) + ); + } + + /** + * Parses a parameter of a routine. + * + * @param string $param Parameter's definition. + * + * @return array + */ + public function getParameter($param) + { + $lexer = new Lexer('(' . $param . ')'); + + // A dummy parser is used for error reporting. + $param = ParamDefFragment::parse(new Parser(), $lexer->tokens); + + if (empty($param[0])) { + return array('', '', '', '', ''); + } + + $param = $param[0]; + + $options = array(); + foreach ($param->type->options->options as $opt) { + $options[] = is_string($opt) ? $opt : $opt['value']; + } + + return array( + empty($param->inOut) ? '' : $param->inOut, + $param->name, + $param->type->name, + implode(',', $param->type->size), + implode(' ', $options) + ); + } + /** * Gets the parameters of a routine from the parse tree. * @@ -12,7 +84,7 @@ class Routine * * @return array */ - public static function getParameters($tree) + public static function getParameters(Statement $tree) { $retval = array( 'num' => 0, @@ -42,5 +114,4 @@ class Routine return $retval; } - } From bf6e14393d32cd5fc4937a210d8c82597f612947 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 15 Jun 2015 20:05:20 +0300 Subject: [PATCH 10/57] Removed PMA_RTN_parseOneParameter(). Signed-off-by: Dan Ungureanu --- libraries/rte/rte_routines.lib.php | 76 ------------------- .../rte/PMA_RTN_ParameterParser_test.php | 52 ------------- 2 files changed, 128 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index c36326f718..b16926001f 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -79,82 +79,6 @@ function PMA_RTN_main($type) } } // end PMA_RTN_main() -/** - * This function parses a string containing one parameter of a routine - * and returns an array containing the information about this parameter. - * - * @param string $value A string containing one parameter of a routine - * - * @return array Parsed information about the input parameter - */ -function PMA_RTN_parseOneParameter($value) -{ - global $param_directions; - - $retval = array(0 => '', - 1 => '', - 2 => '', - 3 => '', - 4 => ''); - $parsed_param = PMA_SQP_parse($value); - $pos = 0; - if (in_array( - /*overload*/mb_strtoupper($parsed_param[$pos]['data']), - $param_directions - )) { - $retval[0] = /*overload*/mb_strtoupper($parsed_param[0]['data']); - $pos++; - } - if ($parsed_param[$pos]['type'] == 'alpha_identifier' - || $parsed_param[$pos]['type'] == 'quote_backtick' - ) { - $retval[1] = PMA_Util::unQuote( - $parsed_param[$pos]['data'] - ); - $pos++; - } - $depth = 0; - $param_length = ''; - $param_opts = array(); - for ($i = $pos; $i < $parsed_param['len']; $i++) { - if (($parsed_param[$i]['type'] == 'alpha_columnType' - || $parsed_param[$i]['type'] == 'alpha_functionName') && $depth == 0 - ) { - $retval[2] = /*overload*/mb_strtoupper($parsed_param[$i]['data']); - } else if ($parsed_param[$i]['type'] == 'punct_bracket_open_round' - && $depth == 0 - ) { - $depth = 1; - } else if ($parsed_param[$i]['type'] == 'punct_bracket_close_round' - && $depth == 1 - ) { - $depth = 0; - } else if ($depth == 1) { - $param_length .= $parsed_param[$i]['data']; - } else if ($parsed_param[$i]['type'] == 'alpha_reservedWord' - && /*overload*/mb_strtoupper($parsed_param[$i]['data']) == 'CHARSET' - && $depth == 0 - ) { - if ($parsed_param[$i+1]['type'] == 'alpha_charset' - || $parsed_param[$i+1]['type'] == 'alpha_identifier' - ) { - $param_opts[] = /*overload*/mb_strtolower( - $parsed_param[$i+1]['data'] - ); - } - } else if ($parsed_param[$i]['type'] == 'alpha_columnAttrib' - && $depth == 0 - ) { - $param_opts[] = /*overload*/mb_strtoupper($parsed_param[$i]['data']); - } - } - $retval[3] = $param_length; - sort($param_opts); - $retval[4] = implode(' ', $param_opts); - - return $retval; -} // end PMA_RTN_parseOneParameter() - /** * This function looks through the contents of a parsed * SHOW CREATE [PROCEDURE | FUNCTION] query and extracts diff --git a/test/libraries/rte/PMA_RTN_ParameterParser_test.php b/test/libraries/rte/PMA_RTN_ParameterParser_test.php index cfced81a20..d94e6c0b96 100644 --- a/test/libraries/rte/PMA_RTN_ParameterParser_test.php +++ b/test/libraries/rte/PMA_RTN_ParameterParser_test.php @@ -62,57 +62,5 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase ), ); } - - /** - * Test for PMA_RTN_parseOneParameter - * - * @param string $source Source - * @param array $target Expected output - * - * @return void - * - * @dataProvider paramProvider - */ - public function testParseOneParameter($source, $target) - { - PMA_RTN_setGlobals(); - $this->assertEquals($target, PMA_RTN_parseOneParameter($source)); - } - - /** - * Data provider for testParseOneParameter - * - * @return array - */ - public function paramProvider() - { - return array( - array('`foo` TEXT', array('', 'foo', 'TEXT', '', '')), - array('`foo` INT(20)', array('', 'foo', 'INT', '20', '')), - array('DECIMAL(5,5)', array('', '', 'DECIMAL', '5,5', '')), - array( - 'IN `fo``fo` INT UNSIGNED', - array('IN', 'fo`fo', 'INT', '', 'UNSIGNED') - ), - array( - 'OUT bar VARCHAR(1) CHARSET utf8', - array('OUT', 'bar', 'VARCHAR', '1', 'utf8') - ), - array( - '`"baz\'\'` ENUM(\'a\', \'b\') CHARSET latin1', - array('', '"baz\'\'', 'ENUM', '\'a\',\'b\'', 'latin1') - ), - array( - 'INOUT `foo` DECIMAL(5,2) UNSIGNED ZEROFILL', - array('INOUT', 'foo', 'DECIMAL', '5,2', 'UNSIGNED ZEROFILL') - ), - array( - '`foo``s func` SET(\'test\'\'esc"\', \'more\\\'esc\')', - array( - '', 'foo`s func', 'SET', '\'test\'\'esc"\',\'more\\\'esc\'', '' - ) - ) - ); - } } ?> From 30e372375dbfa50158b32cb80d076d8680767518 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 21 Jun 2015 20:04:04 +0300 Subject: [PATCH 11/57] Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Context.php | 308 +++++++++++++----- .../src/Contexts/Context_MySQL50000.php | 163 +++++++++ .../src/Contexts/Context_MySQL50100.php | 177 ++++++++++ .../src/Contexts/Context_MySQL50500.php | 181 ++++++++++ .../src/Contexts/Context_MySQL50600.php | 190 +++++++++++ .../src/Contexts/Context_MySQL50700.php | 199 +++++++++++ .../src/Exceptions/LexerException.php | 12 +- .../src/Exceptions/ParserException.php | 10 +- libraries/sql-parser/src/Fragment.php | 14 +- .../src/Fragments/ArrayFragment.php | 17 +- .../sql-parser/src/Fragments/CallKeyword.php | 8 +- .../src/Fragments/CreateDefFragment.php | 7 +- .../src/Fragments/DataTypeFragment.php | 21 +- .../src/Fragments/FieldDefFragment.php | 15 +- .../src/Fragments/FieldFragment.php | 23 +- .../sql-parser/src/Fragments/FromKeyword.php | 10 +- .../sql-parser/src/Fragments/IntoKeyword.php | 9 +- .../sql-parser/src/Fragments/JoinKeyword.php | 6 +- .../sql-parser/src/Fragments/LimitKeyword.php | 12 +- .../src/Fragments/OptionsFragment.php | 15 +- .../sql-parser/src/Fragments/OrderKeyword.php | 12 +- .../src/Fragments/ParamDefFragment.php | 10 +- .../src/Fragments/RenameKeyword.php | 11 +- .../src/Fragments/SelectKeyword.php | 10 +- .../sql-parser/src/Fragments/SetKeyword.php | 12 +- .../src/Fragments/ValuesKeyword.php | 11 +- .../sql-parser/src/Fragments/WhereKeyword.php | 14 +- libraries/sql-parser/src/Lexer.php | 140 +++++--- libraries/sql-parser/src/Parser.php | 10 +- libraries/sql-parser/src/Token.php | 8 +- libraries/sql-parser/src/UtfString.php | 2 +- libraries/sql-parser/src/Utils/Misc.php | 6 +- libraries/sql-parser/src/Utils/Routine.php | 6 +- 33 files changed, 1372 insertions(+), 277 deletions(-) create mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50000.php create mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50100.php create mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50500.php create mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50600.php create mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50700.php diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index 2b43e568a1..9102bb2bcb 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -26,46 +26,70 @@ abstract class Context */ const OPERATOR_MAX_LENGTH = 4; + /** + * The name of the default content. + * + * @var string + */ + public static $defaultContext = '\\SqlParser\\Contexts\\Context_MySQL50700'; + + /** + * The name of the loaded context. + * + * @var string + */ + public static $loadedContext = '\\SqlParser\\Contexts\\Context_MySQL50700'; // ------------------------------------------------------------------------- // Keywords. /** - * List of official keywords. + * List of keywords. * * Because, PHP's associative arrays are basically hash tables, it is more * efficient to store keywords as keys instead of values. * + * There are multiple types of keyword, depending on the value associated: + * 1 - reserved keywords + * 2 - keyword + * 3 - composite keyword (unofficial); used to make the job of the lexer + * much easier by grouping keywords that may appear together + * + * Keywords below are sorted by type, length and keyword. + * * @var array */ public static $KEYWORDS = array( - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, 'ON' => 1, - 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, 'DIV' => 1, - 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, 'NOT' => 1, - 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, 'CHAR' => 1, - 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, 'EACH' => 1, 'ELSE' => 1, - 'EXIT' => 1, 'FROM' => 1, 'GOTO' => 1, 'INT1' => 1, 'INT2' => 1, - 'INT3' => 1, 'INT4' => 1, 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, - 'KEYS' => 1, 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, 'READ' => 1, - 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, 'TRUE' => 1, 'UNDO' => 1, - 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, 'FETCH' => 1, - 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, 'GROUP' => 1, 'INDEX' => 1, - 'INNER' => 1, 'INOUT' => 1, 'LABEL' => 1, 'LEAVE' => 1, 'LIMIT' => 1, - 'LINES' => 1, 'MATCH' => 1, 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, - 'RANGE' => 1, 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, - 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, 'WHILE' => 1, - 'WRITE' => 1, + 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, + 'ON' => 1, 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, + 'DIV' => 1, 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, + 'MOD' => 1, 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, + 'SSL' => 1, 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, + 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, + 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, + 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, + 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, + 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, + 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, + 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, + 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, + 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, + 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, + 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, + 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, + 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, + 'WHILE' => 1, 'WRITE' => 1, 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, - 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'SONAME' => 1, + 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'STORED' => 1, 'UNIQUE' => 1, 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, @@ -73,23 +97,27 @@ abstract class Context 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'UPGRADE' => 1, 'VARCHAR' => 1, - 'VARYING' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, 'DESCRIBE' => 1, - 'DISTINCT' => 1, 'ENCLOSED' => 1, 'FULLTEXT' => 1, 'INTERVAL' => 1, - 'LONGBLOB' => 1, 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, - 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, 'SMALLINT' => 1, - 'SPECIFIC' => 1, 'SQLSTATE' => 1, 'STARTING' => 1, 'TINYBLOB' => 1, - 'TINYTEXT' => 1, 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, + 'VIRTUAL' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, + 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, + 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, + 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, + 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, + 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, + 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, + 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, 'LOCALTIME' => 1, - 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, 'PARTITION' => 1, 'PRECISION' => 1, - 'PROCEDURE' => 1, 'SENSITIVE' => 1, 'SEPARATOR' => 1, 'VARBINARY' => 1, - 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONNECTION' => 1, - 'CONSTRAINT' => 1, 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, - 'MEDIUMBLOB' => 1, 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, - 'READ_WRITE' => 1, 'REFERENCES' => 1, 'SQLWARNING' => 1, - 'TERMINATED' => 1, 'YEAR_MONTH' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, + 'GENERATED' => 1, 'LOCALTIME' => 1, 'MEDIUMINT' => 1, + 'MIDDLEINT' => 1, 'PARTITION' => 1, 'PRECISION' => 1, + 'PROCEDURE' => 1, 'SENSITIVE' => 1, 'SEPARATOR' => 1, + 'VARBINARY' => 1, + 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, + 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, + 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, + 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, + 'YEAR_MONTH' => 1, 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, @@ -105,33 +133,118 @@ abstract class Context 'SQL_CALC_FOUND_ROWS' => 1, 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, - /* - * Secondary group of keywords. - * - * Keywords below are either words that are used as keywords, but not - * defined as proper keywords or are group of keywords which are parsed - * easier when found grouped. - */ + 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, + 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, + 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XID' => 2, + 'XML' => 2, + 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, + 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, + 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, + 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, + 'ONLY' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, + 'SLOW' => 2, 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, + 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, + 'X509' => 2, 'YEAR' => 2, + 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, + 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, + 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, + 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, + 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'NEVER' => 2, + 'OWNER' => 2, 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, + 'QUICK' => 2, 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, + 'SLAVE' => 2, 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, + 'UNTIL' => 2, 'VALUE' => 2, + 'ACTION' => 2, 'ALWAYS' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, + 'CLIENT' => 2, 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, + 'ESCAPE' => 2, 'EVENTS' => 2, 'EXPIRE' => 2, 'EXPORT' => 2, 'FAULTS' => 2, + 'FIELDS' => 2, 'FILTER' => 2, 'FORMAT' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, + 'IMPORT' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, 'MEDIUM' => 2, + 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'NUMBER' => 2, 'OFFSET' => 2, + 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, + 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, + 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, + 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, + 'ACCOUNT' => 2, 'AGAINST' => 2, 'ANALYSE' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, + 'CHANNEL' => 2, 'CHARSET' => 2, 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, + 'CONTEXT' => 2, 'CURRENT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, 'DISCARD' => 2, + 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, 'FOLLOWS' => 2, 'GENERAL' => 2, + 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, + 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, + 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, + 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'REVERSE' => 2, 'ROUTINE' => 2, + 'SESSION' => 2, 'STACKED' => 2, 'STORAGE' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, + 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WITHOUT' => 2, + 'WRAPPER' => 2, + 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, + 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXCHANGE' => 2, + 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, 'LANGUAGE' => 2, + 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, + 'NVARCHAR' => 2, 'PASSWORD' => 2, 'PRECEDES' => 2, 'PRESERVE' => 2, + 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, + 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, + 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, + 'WARNINGS' => 2, + 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, + 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, + 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'READ_ONLY' => 2, + 'REDUNDANT' => 2, 'ROW_COUNT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, + 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, + 'UNINSTALL' => 2, 'VARIABLES' => 2, + 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, + 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, + 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, + 'PARTITIONS' => 2, 'PLUGIN_DIR' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, + 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, + 'TABLE_NAME' => 2, 'VALIDATION' => 2, + 'COLUMN_NAME' => 2, 'COMPRESSION' => 2, 'CURSOR_NAME' => 2, 'DIAGNOSTICS' => 2, + 'EXTENT_SIZE' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, + 'MICROSECOND' => 2, 'MYSQL_ERRNO' => 2, 'NONBLOCKING' => 2, 'PROCESSLIST' => 2, + 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, + 'UNCOMMITTED' => 2, + 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'DEFAULT_AUTH' => 2, + 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, 'MASTER_DELAY' => 2, + 'MESSAGE_TEXT' => 2, 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, + 'PARTITIONING' => 2, 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, + 'SQL_NO_CACHE' => 2, 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, + 'SQL_TSI_YEAR' => 2, 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, + 'COLUMN_FORMAT' => 2, 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, + 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, + 'TIMESTAMPDIFF' => 2, 'WEIGHT_STRING' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, + 'MASTER_LOG_POS' => 2, 'MASTER_SSL_CRL' => 2, 'MASTER_SSL_KEY' => 2, + 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, + 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, + 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, + 'FILE_BLOCK_SIZE' => 2, 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, + 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, 'PARSE_GCOL_EXPR' => 2, + 'REPLICATE_DO_DB' => 2, 'SQL_AFTER_GTIDS' => 2, 'SQL_TSI_QUARTER' => 2, + 'SUBCLASS_ORIGIN' => 2, + 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'SQL_BEFORE_GTIDS' => 2, + 'STATS_PERSISTENT' => 2, 'UNDO_BUFFER_SIZE' => 2, + 'CONSTRAINT_SCHEMA' => 2, 'GROUP_REPLICATION' => 2, 'IGNORE_SERVER_IDS' => 2, + 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'RETURNED_SQLSTATE' => 2, + 'SQL_BUFFER_RESULT' => 2, 'STATS_AUTO_RECALC' => 2, + 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, 'MASTER_RETRY_COUNT' => 2, + 'MASTER_SSL_CRLPATH' => 2, 'MAX_STATEMENT_TIME' => 2, 'REPLICATE_DO_TABLE' => 2, + 'SQL_AFTER_MTS_GAPS' => 2, 'STATS_SAMPLE_PAGES' => 2, + 'REPLICATE_IGNORE_DB' => 2, + 'MASTER_AUTO_POSITION' => 2, 'MASTER_CONNECT_RETRY' => 2, + 'MAX_QUERIES_PER_HOUR' => 2, 'MAX_UPDATES_PER_HOUR' => 2, + 'MAX_USER_CONNECTIONS' => 2, 'REPLICATE_REWRITE_DB' => 2, + 'REPLICATE_IGNORE_TABLE' => 2, + 'MASTER_HEARTBEAT_PERIOD' => 2, 'REPLICATE_WILD_DO_TABLE' => 2, + 'MAX_CONNECTIONS_PER_HOUR' => 2, + 'REPLICATE_WILD_IGNORE_TABLE' => 2, - 'END' => 2, - 'INDEX' => 2, 'VALUE' => 2, - 'ENGINE' => 2, - 'CHARSET' => 2, 'COMMENT' => 2, 'RETURNS' => 2, 'STORAGE' => 2, - 'CHECKSUM' => 2, 'MAX_ROWS' => 2, 'MIN_ROWS' => 2, 'NOT NULL' => 2, - 'PASSWORD' => 2, - 'INDEX KEY' => 2, 'PACK_KEYS' => 2, - 'ROW_FORMAT' => 2, 'TABLESPACE' => 2, - 'UNIQUE KEY' => 2, - 'FOREIGN KEY' => 2, 'PRIMARY KEY' => 2, 'PRIMARY KEY' => 2, - 'SPATIAL KEY' => 2, - 'FULLTEXT KEY' => 2, 'UNIQUE INDEX' => 2, - 'CHARACTER SET' => 2, 'IF NOT EXISTS' => 2, 'INSERT_METHOD' => 2, - 'SPATIAL INDEX' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'DATA DIRECTORY' => 2, - 'FULLTEXT INDEX' => 2, 'KEY_BLOCK_SIZE' => 2, - 'DEFAULT COLLATE' => 2, - 'DELAY_KEY_WRITE' => 2, 'INDEX DIRECTORY' => 2, - 'DEFAULT CHARACTER SET' => 2, + 'NOT NULL' => 4, + 'INDEX KEY' => 4, + 'UNIQUE KEY' => 4, + 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, + 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, + 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, + 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, + 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, + 'DEFAULT CHARACTER SET' => 4, ); // ------------------------------------------------------------------------- @@ -155,12 +268,15 @@ abstract class Context * @var array */ public static $DATA_TYPES = array( - 'ARRAY' => 1, 'BIGINT' => 1, 'BINARY VARYING' => 1, 'BINARY' => 1, - 'BOOLEAN' => 1, 'CHARACTER' => 1, 'CHARACTER' => 1, 'DATE' => 1, - 'DECIMAL' => 1, 'DOUBLE' => 1, 'FLOAT' => 1, 'FLOAT' => 1, 'INT' => 1, - 'INTEGER' => 1, 'INTERVAL' => 1, 'MULTISET' => 1, 'NUMERIC' => 1, - 'REAL' => 1, 'SMALLINT' => 1, 'TIME' => 1, 'TIMESTAMP' => 1, - 'VARBINARY' => 1, 'VARCHAR' => 1, 'XML' => 1, + 'ARRAY' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'BINARY VARYING' => 1, + 'BLOB' => 1, 'BOOLEAN' => 1, 'CHAR' => 1, 'CHARACTER' => 1, 'DATE' => 1, + 'DATETIME' => 1, 'DECIMAL' => 1, 'DOUBLE' => 1, 'ENUM' => 1, + 'FLOAT' => 1, 'INT' => 1, 'INTEGER' => 1, 'INTERVAL' => 1, + 'LONGBLOB' => 1, 'LONGTEXT' => 1, 'MEDIUMBLOB' => 1, 'MEDIUMINT' => 1, + 'MEDIUMTEXT' => 1, 'MULTISET' => 1, 'NUMERIC' => 1, 'REAL' => 1, + 'SET' => 1, 'SMALLINT' => 1, 'TEXT' => 1, 'TIME' => 1, 'TIMESTAMP' => 1, + 'TINYBLOB' => 1, 'TINYINT' => 1, 'TINYTEXT' => 1, 'VARBINARY' => 1, + 'VARCHAR' => 1, 'XML' => 1, 'YEAR' => 1 ); // ------------------------------------------------------------------------- @@ -309,19 +425,24 @@ abstract class Context * Checks if the given string is a keyword. * * @param string $str - * @param bool $strict + * @param bool $isReserved * * @return bool */ - public static function isKeyword($str, $strict = false) + public static function isKeyword($str, $isReserved = false) { $str = strtoupper($str); if (isset(static::$KEYWORDS[$str])) { - return $strict ? static::$KEYWORDS[$str] === 1 : true; + if ($isReserved) { + if (!(static::$KEYWORDS[$str] & Token::FLAG_KEYWORD_RESERVED)) { + return null; + } + } + return static::$KEYWORDS[$str]; } - return false; + return null; } // ------------------------------------------------------------------------- @@ -372,12 +493,14 @@ abstract class Context $len = strlen($str); if ($str[0] === '#') { return Token::FLAG_COMMENT_BASH; - } elseif (($len > 1) && ((($str[0] === '/') && ($str[1] === '*')) || - (($str[0] === '*') && ($str[1] === '/')))) { + } elseif (($len > 1) && ((($str[0] === '/') && ($str[1] === '*')) + || (($str[0] === '*') && ($str[1] === '/'))) + ) { return Token::FLAG_COMMENT_C; - } elseif (($len > 2) && ($str[0] === '-') && - ($str[1] === '-') && ($str[2] !== "\n") && - (static::isWhitespace($str[2]))) { + } elseif (($len > 2) && ($str[0] === '-') + && ($str[1] === '-') && ($str[2] !== "\n") + && (static::isWhitespace($str[2])) + ) { return Token::FLAG_COMMENT_SQL; } return null; @@ -413,8 +536,8 @@ abstract class Context */ public static function isNumber($ch) { - return (($ch >= '0') && ($ch <= '9')) || ($ch === '.') || - ($ch === '-') || ($ch === '+') || ($ch === 'e') || ($ch === 'E'); + return (($ch >= '0') && ($ch <= '9')) || ($ch === '.') + || ($ch === '-') || ($ch === '+') || ($ch === 'e') || ($ch === 'E'); } // ------------------------------------------------------------------------- @@ -472,4 +595,27 @@ abstract class Context { return !ctype_alnum($ch) && $ch !== '_'; } + + /** + * Loads the specified context. + * + * Contexts may be used by accessing the context directly. + * + * @param string $context + */ + public static function load($context = '') + { + if (empty($context)) { + $context = self::$defaultContext; + } + if ($context[0] !== '\\') { + // Short context name (must be formatted into class name). + $context = '\\SqlParser\\Contexts\\Context_' . $context; + } + if (!class_exists($context)) { + throw new \Exception('Specified context ("' . $context . '") doesn\'t exist.'); + } + static::$loadedContext = $context; + static::$KEYWORDS = $context::$KEYWORDS; + } } diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50000.php b/libraries/sql-parser/src/Contexts/Context_MySQL50000.php new file mode 100644 index 0000000000..e1d036ef0c --- /dev/null +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50000.php @@ -0,0 +1,163 @@ + 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, + 'ON' => 1, 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, + 'DIV' => 1, 'FOR' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, + 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, + 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, + 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, + 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, + 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, + 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, + 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, + 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, + 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, + 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, + 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, + 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, + 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'READS' => 1, + 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, 'UNION' => 1, + 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, 'WHILE' => 1, + 'WRITE' => 1, + 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, + 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, + 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, + 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, + 'INSERT' => 1, 'OPTION' => 1, 'REGEXP' => 1, 'RENAME' => 1, + 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, 'SCHEMA' => 1, + 'SELECT' => 1, 'SONAME' => 1, 'UNIQUE' => 1, 'UNLOCK' => 1, + 'UPDATE' => 1, 'VALUES' => 1, + 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, + 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, + 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, + 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, + 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, + 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, + 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, + 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, + 'LONGTEXT' => 1, 'MODIFIES' => 1, 'OPTIMIZE' => 1, + 'RESTRICT' => 1, 'SMALLINT' => 1, 'SPECIFIC' => 1, + 'SQLSTATE' => 1, 'STARTING' => 1, 'TINYBLOB' => 1, + 'TINYTEXT' => 1, 'TRAILING' => 1, 'UNSIGNED' => 1, + 'UTC_DATE' => 1, 'UTC_TIME' => 1, 'ZEROFILL' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, + 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, + 'PRECISION' => 1, 'PROCEDURE' => 1, 'SENSITIVE' => 1, + 'SEPARATOR' => 1, 'VARBINARY' => 1, + 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, 'DAY_MINUTE' => 1, + 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, 'MEDIUMTEXT' => 1, + 'OPTIONALLY' => 1, 'REFERENCES' => 1, 'SQLWARNING' => 1, + 'TERMINATED' => 1, 'YEAR_MONTH' => 1, + 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, + 'INSENSITIVE' => 1, + 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, + 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, + 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, + 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, + 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, + 'DAY_MICROSECOND' => 1, + 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, + 'CURRENT_TIMESTAMP' => 1, + 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, + 'SECOND_MICROSECOND' => 1, + 'SQL_CALC_FOUND_ROWS' => 1, + + 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, + 'ANY' => 2, 'AVG' => 2, 'BDB' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, + 'END' => 2, 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, + 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, + 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, 'HASH' => 2, 'HELP' => 2, + 'HOUR' => 2, 'LAST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, + 'NONE' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PREV' => 2, 'ROWS' => 2, 'SOME' => 2, + 'STOP' => 2, 'TEXT' => 2, 'TIME' => 2, 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, + 'WEEK' => 2, 'WORK' => 2, 'X509' => 2, 'YEAR' => 2, + 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, + 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'FIRST' => 2, 'FIXED' => 2, + 'FLUSH' => 2, 'FOUND' => 2, 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, + 'LOCKS' => 2, 'MERGE' => 2, 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, + 'NCHAR' => 2, 'PHASE' => 2, 'POINT' => 2, 'QUERY' => 2, 'QUICK' => 2, + 'RAID0' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, + 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, + 'VALUE' => 2, + 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, + 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, + 'EVENTS' => 2, 'FAULTS' => 2, 'FIELDS' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, + 'IMPORT' => 2, 'INNODB' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, + 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'OFFSET' => 2, + 'RELOAD' => 2, 'REPAIR' => 2, 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, + 'SERIAL' => 2, 'SIGNED' => 2, 'SIMPLE' => 2, 'SOUNDS' => 2, 'SOURCE' => 2, + 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, + 'AGAINST' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, 'CHARSET' => 2, 'COLUMNS' => 2, + 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, + 'DISCARD' => 2, 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, 'HANDLER' => 2, + 'INDEXES' => 2, 'INVOKER' => 2, 'MIGRATE' => 2, 'PARTIAL' => 2, 'POLYGON' => 2, + 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'RECOVER' => 2, 'RESTORE' => 2, + 'RETURNS' => 2, 'ROUTINE' => 2, 'SESSION' => 2, 'STORAGE' => 2, 'STRIPED' => 2, + 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, + 'USE_FRM' => 2, + 'CASCADED' => 2, 'CHECKSUM' => 2, 'CONTAINS' => 2, 'DATETIME' => 2, + 'DUMPFILE' => 2, 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, + 'INNOBASE' => 2, 'LANGUAGE' => 2, 'MAX_ROWS' => 2, 'MIN_ROWS' => 2, + 'NATIONAL' => 2, 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, + 'PROFILES' => 2, 'ROLLBACK' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, + 'SNAPSHOT' => 2, 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, + 'WARNINGS' => 2, + 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, + 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, + 'ISOLATION' => 2, 'PACK_KEYS' => 2, 'RAID_TYPE' => 2, 'REDUNDANT' => 2, + 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, 'TEMPORARY' => 2, 'TEMPTABLE' => 2, + 'TIMESTAMP' => 2, 'UNDEFINED' => 2, 'VARIABLES' => 2, + 'BERKELEYDB' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, + 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, + 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, + 'PRIVILEGES' => 2, 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, + 'TABLESPACE' => 2, + 'FRAC_SECOND' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, + 'MICROSECOND' => 2, 'PROCESSLIST' => 2, 'RAID_CHUNKS' => 2, 'REPLICATION' => 2, + 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, + 'DES_KEY_FILE' => 2, 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, + 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, + 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, + 'TIMESTAMPADD' => 2, + 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, 'RELAY_LOG_POS' => 2, + 'SQL_TSI_MONTH' => 2, 'TIMESTAMPDIFF' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'MASTER_LOG_POS' => 2, + 'MASTER_SSL_KEY' => 2, 'RAID_CHUNKSIZE' => 2, 'RELAY_LOG_FILE' => 2, + 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, 'USER_RESOURCES' => 2, + 'DELAY_KEY_WRITE' => 2, 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, + 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, 'SQL_TSI_QUARTER' => 2, + 'MASTER_SERVER_ID' => 2, + 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'SQL_BUFFER_RESULT' => 2, + 'GEOMETRYCOLLECTION' => 2, + 'SQL_TSI_FRAC_SECOND' => 2, + 'MASTER_CONNECT_RETRY' => 2, 'MAX_QUERIES_PER_HOUR' => 2, + 'MAX_UPDATES_PER_HOUR' => 2, 'MAX_USER_CONNECTIONS' => 2, + 'MAX_CONNECTIONS_PER_HOUR' => 2, + + 'NOT NULL' => 4, + 'INDEX KEY' => 4, + 'UNIQUE KEY' => 4, + 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, + 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, + 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, + 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, + 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, + 'DEFAULT CHARACTER SET' => 4, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50100.php b/libraries/sql-parser/src/Contexts/Context_MySQL50100.php new file mode 100644 index 0000000000..ce83a5f854 --- /dev/null +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50100.php @@ -0,0 +1,177 @@ + 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, + 'ON' => 1, 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, + 'DIV' => 1, 'FOR' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, + 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, + 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, + 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, + 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, + 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, + 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, + 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, + 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, + 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, + 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, + 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, + 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, + 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, + 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, + 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, + 'WHILE' => 1, 'WRITE' => 1, + 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, + 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, + 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, + 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, + 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, + 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, + 'SCHEMA' => 1, 'SELECT' => 1, 'UNIQUE' => 1, 'UNLOCK' => 1, + 'UPDATE' => 1, 'VALUES' => 1, + 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, + 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, + 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, + 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, + 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, + 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, + 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, + 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, + 'LONGTEXT' => 1, 'MODIFIES' => 1, 'OPTIMIZE' => 1, + 'RESTRICT' => 1, 'SMALLINT' => 1, 'SPECIFIC' => 1, + 'SQLSTATE' => 1, 'STARTING' => 1, 'TINYBLOB' => 1, + 'TINYTEXT' => 1, 'TRAILING' => 1, 'UNSIGNED' => 1, + 'UTC_DATE' => 1, 'UTC_TIME' => 1, 'ZEROFILL' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, + 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, + 'PRECISION' => 1, 'PROCEDURE' => 1, 'SENSITIVE' => 1, + 'SEPARATOR' => 1, 'VARBINARY' => 1, + 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, + 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, + 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, + 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, + 'YEAR_MONTH' => 1, + 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, + 'INSENSITIVE' => 1, + 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, + 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, + 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, + 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, + 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, + 'DAY_MICROSECOND' => 1, + 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, + 'CURRENT_TIMESTAMP' => 1, + 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, + 'SECOND_MICROSECOND' => 1, + 'SQL_CALC_FOUND_ROWS' => 1, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, + + 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, + 'ANY' => 2, 'AVG' => 2, 'BDB' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, + 'END' => 2, 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, + 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, + 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, + 'GOTO' => 2, 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, + 'LESS' => 2, 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, + 'NONE' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, + 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, 'TYPE' => 2, + 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, 'X509' => 2, + 'YEAR' => 2, + 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, + 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'EVENT' => 2, 'EVERY' => 2, + 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, 'HOSTS' => 2, + 'LABEL' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, + 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'OWNER' => 2, + 'PHASE' => 2, 'POINT' => 2, 'QUERY' => 2, 'QUICK' => 2, 'RAID0' => 2, + 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, 'START' => 2, + 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, 'VALUE' => 2, + 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, + 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, + 'EVENTS' => 2, 'FAULTS' => 2, 'FIELDS' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, + 'IMPORT' => 2, 'INNODB' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, + 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'OFFSET' => 2, + 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, + 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, + 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, + 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, + 'AGAINST' => 2, 'AUTHORS' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, 'CHARSET' => 2, + 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, 'DEFINER' => 2, + 'DISABLE' => 2, 'DISCARD' => 2, 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, + 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, + 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, + 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, + 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'ROUTINE' => 2, 'SESSION' => 2, + 'STORAGE' => 2, 'STRIPED' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, + 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WRAPPER' => 2, + 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, + 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXTENDED' => 2, + 'FUNCTION' => 2, 'GEOMETRY' => 2, 'INNOBASE' => 2, 'LANGUAGE' => 2, + 'MAXVALUE' => 2, 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, + 'NATIONAL' => 2, 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, + 'PRESERVE' => 2, 'PROFILES' => 2, 'REDOFILE' => 2, 'ROLLBACK' => 2, + 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, + 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, + 'WARNINGS' => 2, + 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, + 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, + 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'PARTITION' => 2, + 'RAID_TYPE' => 2, 'READ_ONLY' => 2, 'REDUNDANT' => 2, 'SAVEPOINT' => 2, + 'SCHEDULER' => 2, 'SQL_CACHE' => 2, 'TEMPORARY' => 2, 'TEMPTABLE' => 2, + 'TIMESTAMP' => 2, 'UNDEFINED' => 2, 'UNINSTALL' => 2, 'VARIABLES' => 2, + 'BERKELEYDB' => 2, 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, + 'CONNECTION' => 2, 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, + 'IDENTIFIED' => 2, 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, + 'NDBCLUSTER' => 2, 'PARTITIONS' => 2, 'PRIVILEGES' => 2, 'REORGANISE' => 2, + 'REORGANIZE' => 2, 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, + 'TABLESPACE' => 2, + 'EXTENT_SIZE' => 2, 'FRAC_SECOND' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, + 'MASTER_USER' => 2, 'MICROSECOND' => 2, 'PROCESSLIST' => 2, 'RAID_CHUNKS' => 2, + 'REPLICATION' => 2, 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, + 'CONTRIBUTORS' => 2, 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, + 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, 'PARTITIONING' => 2, + 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, + 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, + 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, + 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, 'PAGE_CHECKSUM' => 2, + 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, + 'TIMESTAMPDIFF' => 2, 'TRANSACTIONAL' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, + 'MASTER_LOG_POS' => 2, 'MASTER_SSL_KEY' => 2, 'RAID_CHUNKSIZE' => 2, + 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, + 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, + 'AUTOEXTEND_SIZE' => 2, 'DELAY_KEY_WRITE' => 2, 'MASTER_LOG_FILE' => 2, + 'MASTER_PASSWORD' => 2, 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, + 'SQL_TSI_QUARTER' => 2, + 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'UNDO_BUFFER_SIZE' => 2, + 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'SQL_BUFFER_RESULT' => 2, + 'GEOMETRYCOLLECTION' => 2, + 'SQL_TSI_FRAC_SECOND' => 2, + 'MASTER_CONNECT_RETRY' => 2, 'MAX_QUERIES_PER_HOUR' => 2, + 'MAX_UPDATES_PER_HOUR' => 2, 'MAX_USER_CONNECTIONS' => 2, + 'MAX_CONNECTIONS_PER_HOUR' => 2, + + 'NOT NULL' => 4, + 'INDEX KEY' => 4, + 'UNIQUE KEY' => 4, + 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, + 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, + 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, + 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, + 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, + 'DEFAULT CHARACTER SET' => 4, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50500.php b/libraries/sql-parser/src/Contexts/Context_MySQL50500.php new file mode 100644 index 0000000000..8c3d570440 --- /dev/null +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50500.php @@ -0,0 +1,181 @@ + 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, + 'ON' => 1, 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, + 'DIV' => 1, 'FOR' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, + 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, + 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, + 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, + 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, + 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, + 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, + 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, + 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, + 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, + 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, + 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, + 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, + 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, + 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, + 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, + 'WHILE' => 1, 'WRITE' => 1, + 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, + 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, + 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, + 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, + 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, + 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, + 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'UNIQUE' => 1, + 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, + 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, + 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, + 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, + 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, + 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, + 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, + 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, + 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, + 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, + 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, + 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, + 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, + 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, + 'UTC_TIME' => 1, 'ZEROFILL' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, + 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, + 'PRECISION' => 1, 'PROCEDURE' => 1, 'SENSITIVE' => 1, + 'SEPARATOR' => 1, 'VARBINARY' => 1, + 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, + 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, + 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, + 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, + 'YEAR_MONTH' => 1, + 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, + 'INSENSITIVE' => 1, + 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, + 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, + 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, + 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, + 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, + 'DAY_MICROSECOND' => 1, + 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, + 'CURRENT_TIMESTAMP' => 1, + 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, + 'SECOND_MICROSECOND' => 1, + 'SQL_CALC_FOUND_ROWS' => 1, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, + + 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, + 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, + 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XML' => 2, + 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, + 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, + 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, + 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, + 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, 'SLOW' => 2, + 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, 'TYPE' => 2, + 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, 'X509' => 2, + 'YEAR' => 2, + 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, + 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, + 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, + 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, + 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'OWNER' => 2, + 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, 'QUICK' => 2, + 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, + 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, + 'VALUE' => 2, + 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, + 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, + 'EVENTS' => 2, 'FAULTS' => 2, 'FIELDS' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, + 'IMPORT' => 2, 'INNODB' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, + 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'OFFSET' => 2, + 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, + 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, + 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, + 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, + 'AGAINST' => 2, 'AUTHORS' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, 'CHARSET' => 2, + 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, 'DEFINER' => 2, + 'DISABLE' => 2, 'DISCARD' => 2, 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, + 'GENERAL' => 2, 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, + 'LOGFILE' => 2, 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, + 'PLUGINS' => 2, 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, + 'REBUILD' => 2, 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'ROUTINE' => 2, + 'SESSION' => 2, 'STORAGE' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, + 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WRAPPER' => 2, + 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, + 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXTENDED' => 2, + 'FUNCTION' => 2, 'GEOMETRY' => 2, 'INNOBASE' => 2, 'LANGUAGE' => 2, + 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, + 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, 'PRESERVE' => 2, + 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, + 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, + 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, + 'WARNINGS' => 2, + 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, + 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, + 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'PARTITION' => 2, + 'READ_ONLY' => 2, 'REDUNDANT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, + 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, + 'UNINSTALL' => 2, 'VARIABLES' => 2, + 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, + 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, + 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, + 'PARTITIONS' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, 'REPEATABLE' => 2, + 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, 'TABLE_NAME' => 2, + 'COLUMN_NAME' => 2, 'CURSOR_NAME' => 2, 'EXTENT_SIZE' => 2, 'FRAC_SECOND' => 2, + 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, 'MICROSECOND' => 2, + 'MYSQL_ERRNO' => 2, 'PROCESSLIST' => 2, 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, + 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, + 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'CONTRIBUTORS' => 2, + 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, 'MESSAGE_TEXT' => 2, + 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, 'PARTITIONING' => 2, + 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, + 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, + 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, + 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, 'RELAY_LOG_POS' => 2, + 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, 'TIMESTAMPDIFF' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, + 'MASTER_LOG_POS' => 2, 'MASTER_SSL_KEY' => 2, 'RELAY_LOG_FILE' => 2, + 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, 'TABLE_CHECKSUM' => 2, + 'USER_RESOURCES' => 2, + 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, + 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, 'MASTER_SSL_CERT' => 2, + 'MULTILINESTRING' => 2, 'SQL_TSI_QUARTER' => 2, 'SUBCLASS_ORIGIN' => 2, + 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'UNDO_BUFFER_SIZE' => 2, + 'CONSTRAINT_SCHEMA' => 2, 'IGNORE_SERVER_IDS' => 2, 'MASTER_SSL_CAPATH' => 2, + 'MASTER_SSL_CIPHER' => 2, 'SQL_BUFFER_RESULT' => 2, + 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, + 'SQL_TSI_FRAC_SECOND' => 2, + 'MASTER_CONNECT_RETRY' => 2, 'MAX_QUERIES_PER_HOUR' => 2, + 'MAX_UPDATES_PER_HOUR' => 2, 'MAX_USER_CONNECTIONS' => 2, + 'MASTER_HEARTBEAT_PERIOD' => 2, + 'MAX_CONNECTIONS_PER_HOUR' => 2, + + 'NOT NULL' => 4, + 'INDEX KEY' => 4, + 'UNIQUE KEY' => 4, + 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, + 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, + 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, + 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, + 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, + 'DEFAULT CHARACTER SET' => 4, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50600.php b/libraries/sql-parser/src/Contexts/Context_MySQL50600.php new file mode 100644 index 0000000000..4f0b0d6c91 --- /dev/null +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50600.php @@ -0,0 +1,190 @@ + 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, + 'ON' => 1, 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, + 'DIV' => 1, 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, + 'MOD' => 1, 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, + 'SSL' => 1, 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, + 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, + 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, + 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, + 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, + 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, + 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, + 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, + 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, + 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, + 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, + 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, + 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, + 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, + 'WHILE' => 1, 'WRITE' => 1, + 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, + 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, + 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, + 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, + 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, + 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, + 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'UNIQUE' => 1, + 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, + 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, + 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, + 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, + 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, + 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, + 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, + 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, + 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, + 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, + 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, + 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, + 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, + 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, + 'UTC_TIME' => 1, 'ZEROFILL' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, + 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, + 'PARTITION' => 1, 'PRECISION' => 1, 'PROCEDURE' => 1, + 'SENSITIVE' => 1, 'SEPARATOR' => 1, 'VARBINARY' => 1, + 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, + 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, + 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, + 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, + 'YEAR_MONTH' => 1, + 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, + 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, + 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, + 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, + 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, + 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, + 'IO_AFTER_GTIDS' => 1, 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, + 'DAY_MICROSECOND' => 1, 'IO_BEFORE_GTIDS' => 1, + 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, + 'CURRENT_TIMESTAMP' => 1, + 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, + 'SECOND_MICROSECOND' => 1, + 'SQL_CALC_FOUND_ROWS' => 1, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, + + 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, + 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, + 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XML' => 2, + 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, + 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, + 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, + 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, + 'ONLY' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, + 'SLOW' => 2, 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, + 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, + 'X509' => 2, 'YEAR' => 2, + 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, + 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, + 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, + 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, + 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'OWNER' => 2, + 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, 'QUICK' => 2, + 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, + 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, + 'VALUE' => 2, + 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, + 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, + 'EVENTS' => 2, 'EXPIRE' => 2, 'EXPORT' => 2, 'FAULTS' => 2, 'FIELDS' => 2, + 'FORMAT' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, 'IMPORT' => 2, 'ISSUER' => 2, + 'LEAVES' => 2, 'MASTER' => 2, 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, + 'MODIFY' => 2, 'NUMBER' => 2, 'OFFSET' => 2, 'PARSER' => 2, 'PLUGIN' => 2, + 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, 'RESUME' => 2, 'ROLLUP' => 2, + 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, 'SIGNED' => 2, 'SIMPLE' => 2, + 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, 'SOURCE' => 2, 'STARTS' => 2, + 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, + 'AGAINST' => 2, 'ANALYSE' => 2, 'AUTHORS' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, + 'CHARSET' => 2, 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, + 'CURRENT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, 'DISCARD' => 2, 'DYNAMIC' => 2, + 'ENGINES' => 2, 'EXECUTE' => 2, 'GENERAL' => 2, 'HANDLER' => 2, 'INDEXES' => 2, + 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, 'MIGRATE' => 2, 'NO_WAIT' => 2, + 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, 'POLYGON' => 2, 'PREPARE' => 2, + 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, 'RECOVER' => 2, 'RESTORE' => 2, + 'RETURNS' => 2, 'REVERSE' => 2, 'ROUTINE' => 2, 'SESSION' => 2, 'STORAGE' => 2, + 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, + 'USE_FRM' => 2, 'WRAPPER' => 2, + 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, + 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXCHANGE' => 2, + 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, 'LANGUAGE' => 2, + 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, + 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, 'PRESERVE' => 2, + 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, + 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, + 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, + 'WARNINGS' => 2, + 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, + 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, + 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'READ_ONLY' => 2, + 'REDUNDANT' => 2, 'ROW_COUNT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, + 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, + 'UNINSTALL' => 2, 'VARIABLES' => 2, + 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, + 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, + 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, + 'PARTITIONS' => 2, 'PLUGIN_DIR' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, + 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, + 'TABLE_NAME' => 2, + 'COLUMN_NAME' => 2, 'CURSOR_NAME' => 2, 'DIAGNOSTICS' => 2, 'EXTENT_SIZE' => 2, + 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, 'MICROSECOND' => 2, + 'MYSQL_ERRNO' => 2, 'PROCESSLIST' => 2, 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, + 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, + 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'CONTRIBUTORS' => 2, + 'DEFAULT_AUTH' => 2, 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, + 'MASTER_DELAY' => 2, 'MESSAGE_TEXT' => 2, 'MULTIPOLYGON' => 2, + 'OLD_PASSWORD' => 2, 'PARTITIONING' => 2, 'RELAY_THREAD' => 2, + 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, 'SQL_TSI_HOUR' => 2, + 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, 'SUBPARTITION' => 2, + 'TIMESTAMPADD' => 2, + 'COLUMN_FORMAT' => 2, 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, + 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, + 'TIMESTAMPDIFF' => 2, 'WEIGHT_STRING' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, + 'MASTER_LOG_POS' => 2, 'MASTER_SSL_CRL' => 2, 'MASTER_SSL_KEY' => 2, + 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, + 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, + 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, + 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, 'MASTER_SSL_CERT' => 2, + 'MULTILINESTRING' => 2, 'SQL_AFTER_GTIDS' => 2, 'SQL_TSI_QUARTER' => 2, + 'SUBCLASS_ORIGIN' => 2, + 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'SQL_BEFORE_GTIDS' => 2, + 'STATS_PERSISTENT' => 2, 'UNDO_BUFFER_SIZE' => 2, + 'CONSTRAINT_SCHEMA' => 2, 'IGNORE_SERVER_IDS' => 2, 'MASTER_SSL_CAPATH' => 2, + 'MASTER_SSL_CIPHER' => 2, 'RETURNED_SQLSTATE' => 2, 'SQL_BUFFER_RESULT' => 2, + 'STATS_AUTO_RECALC' => 2, + 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, 'MASTER_RETRY_COUNT' => 2, + 'MASTER_SSL_CRLPATH' => 2, 'SQL_AFTER_MTS_GAPS' => 2, 'STATS_SAMPLE_PAGES' => 2, + 'MASTER_AUTO_POSITION' => 2, 'MASTER_CONNECT_RETRY' => 2, + 'MAX_QUERIES_PER_HOUR' => 2, 'MAX_UPDATES_PER_HOUR' => 2, + 'MAX_USER_CONNECTIONS' => 2, + 'MASTER_HEARTBEAT_PERIOD' => 2, + 'MAX_CONNECTIONS_PER_HOUR' => 2, + + 'NOT NULL' => 4, + 'INDEX KEY' => 4, + 'UNIQUE KEY' => 4, + 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, + 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, + 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, + 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, + 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, + 'DEFAULT CHARACTER SET' => 4, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50700.php b/libraries/sql-parser/src/Contexts/Context_MySQL50700.php new file mode 100644 index 0000000000..578da8982b --- /dev/null +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50700.php @@ -0,0 +1,199 @@ + 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, + 'ON' => 1, 'OR' => 1, 'TO' => 1, + 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, + 'DIV' => 1, 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, + 'MOD' => 1, 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, + 'SSL' => 1, 'USE' => 1, 'XOR' => 1, + 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, + 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, + 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, + 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, + 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, + 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, + 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, + 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, + 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, + 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, + 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, + 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, + 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, + 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, + 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, + 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, + 'WHILE' => 1, 'WRITE' => 1, + 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, + 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, + 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, + 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, + 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, + 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, + 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'STORED' => 1, + 'UNIQUE' => 1, 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, + 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, + 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, + 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, + 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, + 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, + 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, + 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, + 'VIRTUAL' => 1, + 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, + 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, + 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, + 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, + 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, + 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, + 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, + 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, + 'UTC_TIME' => 1, 'ZEROFILL' => 1, + 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, + 'GENERATED' => 1, 'LOCALTIME' => 1, 'MEDIUMINT' => 1, + 'MIDDLEINT' => 1, 'PARTITION' => 1, 'PRECISION' => 1, + 'PROCEDURE' => 1, 'SENSITIVE' => 1, 'SEPARATOR' => 1, + 'VARBINARY' => 1, + 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, + 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, + 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, + 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, + 'YEAR_MONTH' => 1, + 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, + 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, + 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, + 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, + 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, + 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, + 'IO_AFTER_GTIDS' => 1, 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, + 'DAY_MICROSECOND' => 1, 'IO_BEFORE_GTIDS' => 1, 'OPTIMIZER_COSTS' => 1, + 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, + 'CURRENT_TIMESTAMP' => 1, + 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, + 'SECOND_MICROSECOND' => 1, + 'SQL_CALC_FOUND_ROWS' => 1, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, + + 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, + 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, + 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XID' => 2, + 'XML' => 2, + 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, + 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, + 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, + 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, + 'ONLY' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, + 'SLOW' => 2, 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, + 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, + 'X509' => 2, 'YEAR' => 2, + 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, + 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, + 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, + 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, + 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'NEVER' => 2, + 'OWNER' => 2, 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, + 'QUICK' => 2, 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, + 'SLAVE' => 2, 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, + 'UNTIL' => 2, 'VALUE' => 2, + 'ACTION' => 2, 'ALWAYS' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, + 'CLIENT' => 2, 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, + 'ESCAPE' => 2, 'EVENTS' => 2, 'EXPIRE' => 2, 'EXPORT' => 2, 'FAULTS' => 2, + 'FIELDS' => 2, 'FILTER' => 2, 'FORMAT' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, + 'IMPORT' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, 'MEDIUM' => 2, + 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'NUMBER' => 2, 'OFFSET' => 2, + 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, + 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, + 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, + 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, + 'ACCOUNT' => 2, 'AGAINST' => 2, 'ANALYSE' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, + 'CHANNEL' => 2, 'CHARSET' => 2, 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, + 'CONTEXT' => 2, 'CURRENT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, 'DISCARD' => 2, + 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, 'FOLLOWS' => 2, 'GENERAL' => 2, + 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, + 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, + 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, + 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'REVERSE' => 2, 'ROUTINE' => 2, + 'SESSION' => 2, 'STACKED' => 2, 'STORAGE' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, + 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WITHOUT' => 2, + 'WRAPPER' => 2, + 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, + 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXCHANGE' => 2, + 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, 'LANGUAGE' => 2, + 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, + 'NVARCHAR' => 2, 'PASSWORD' => 2, 'PRECEDES' => 2, 'PRESERVE' => 2, + 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, + 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, + 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, + 'WARNINGS' => 2, + 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, + 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, + 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'READ_ONLY' => 2, + 'REDUNDANT' => 2, 'ROW_COUNT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, + 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, + 'UNINSTALL' => 2, 'VARIABLES' => 2, + 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, + 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, + 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, + 'PARTITIONS' => 2, 'PLUGIN_DIR' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, + 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, + 'TABLE_NAME' => 2, 'VALIDATION' => 2, + 'COLUMN_NAME' => 2, 'COMPRESSION' => 2, 'CURSOR_NAME' => 2, 'DIAGNOSTICS' => 2, + 'EXTENT_SIZE' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, + 'MICROSECOND' => 2, 'MYSQL_ERRNO' => 2, 'NONBLOCKING' => 2, 'PROCESSLIST' => 2, + 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, + 'UNCOMMITTED' => 2, + 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'DEFAULT_AUTH' => 2, + 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, 'MASTER_DELAY' => 2, + 'MESSAGE_TEXT' => 2, 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, + 'PARTITIONING' => 2, 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, + 'SQL_NO_CACHE' => 2, 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, + 'SQL_TSI_YEAR' => 2, 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, + 'COLUMN_FORMAT' => 2, 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, + 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, + 'TIMESTAMPDIFF' => 2, 'WEIGHT_STRING' => 2, + 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, + 'MASTER_LOG_POS' => 2, 'MASTER_SSL_CRL' => 2, 'MASTER_SSL_KEY' => 2, + 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, + 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, + 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, + 'FILE_BLOCK_SIZE' => 2, 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, + 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, 'PARSE_GCOL_EXPR' => 2, + 'REPLICATE_DO_DB' => 2, 'SQL_AFTER_GTIDS' => 2, 'SQL_TSI_QUARTER' => 2, + 'SUBCLASS_ORIGIN' => 2, + 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'SQL_BEFORE_GTIDS' => 2, + 'STATS_PERSISTENT' => 2, 'UNDO_BUFFER_SIZE' => 2, + 'CONSTRAINT_SCHEMA' => 2, 'GROUP_REPLICATION' => 2, 'IGNORE_SERVER_IDS' => 2, + 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'RETURNED_SQLSTATE' => 2, + 'SQL_BUFFER_RESULT' => 2, 'STATS_AUTO_RECALC' => 2, + 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, 'MASTER_RETRY_COUNT' => 2, + 'MASTER_SSL_CRLPATH' => 2, 'MAX_STATEMENT_TIME' => 2, 'REPLICATE_DO_TABLE' => 2, + 'SQL_AFTER_MTS_GAPS' => 2, 'STATS_SAMPLE_PAGES' => 2, + 'REPLICATE_IGNORE_DB' => 2, + 'MASTER_AUTO_POSITION' => 2, 'MASTER_CONNECT_RETRY' => 2, + 'MAX_QUERIES_PER_HOUR' => 2, 'MAX_UPDATES_PER_HOUR' => 2, + 'MAX_USER_CONNECTIONS' => 2, 'REPLICATE_REWRITE_DB' => 2, + 'REPLICATE_IGNORE_TABLE' => 2, + 'MASTER_HEARTBEAT_PERIOD' => 2, 'REPLICATE_WILD_DO_TABLE' => 2, + 'MAX_CONNECTIONS_PER_HOUR' => 2, + 'REPLICATE_WILD_IGNORE_TABLE' => 2, + + 'NOT NULL' => 4, + 'INDEX KEY' => 4, + 'UNIQUE KEY' => 4, + 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, + 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, + 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, + 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, + 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, + 'DEFAULT CHARACTER SET' => 4, + + ); +} diff --git a/libraries/sql-parser/src/Exceptions/LexerException.php b/libraries/sql-parser/src/Exceptions/LexerException.php index f346d83dca..306c8b924d 100644 --- a/libraries/sql-parser/src/Exceptions/LexerException.php +++ b/libraries/sql-parser/src/Exceptions/LexerException.php @@ -27,14 +27,14 @@ class LexerException extends \Exception /** * Constructor. * - * @param string $message - * @param string $ch - * @param int $positiion - * @param int $code + * @param string $msg The message of this exception. + * @param string $ch The character that produced this exception. + * @param int $pos The position of the character. + * @param int $code The code of this error. */ - public function __construct($message = '', $ch = '', $pos = 0, $code = 0) + public function __construct($msg = '', $ch = '', $pos = 0, $code = 0) { - parent::__construct($message, $code); + parent::__construct($msg, $code); $this->ch = $ch; $this->pos = $pos; } diff --git a/libraries/sql-parser/src/Exceptions/ParserException.php b/libraries/sql-parser/src/Exceptions/ParserException.php index e23d03daf7..7332674452 100644 --- a/libraries/sql-parser/src/Exceptions/ParserException.php +++ b/libraries/sql-parser/src/Exceptions/ParserException.php @@ -20,13 +20,13 @@ class ParserException extends \Exception /** * Constructor. * - * @param string $message - * @param Token $token - * @param int $code + * @param string $msg The message of this exception. + * @param Token $token The token that produced this exception. + * @param int $code The code of this error. */ - public function __construct($message = '', Token $token = null, $code = 0) + public function __construct($msg = '', Token $token = null, $code = 0) { - parent::__construct($message, $code); + parent::__construct($msg, $code); $this->token = $token; } } diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php index e9a4620527..63af280f26 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Fragment.php @@ -9,20 +9,12 @@ namespace SqlParser; abstract class Fragment { - /** - * Array which contains all tokens used to popoluate data inside this - * fragment. - * - * @var array - */ - public $tokens = array(); - /** * Parses the tokens given by the lexer in the context of the given parser. * - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return array */ diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Fragments/ArrayFragment.php index 9ff8649e34..6436823be0 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Fragments/ArrayFragment.php @@ -15,16 +15,23 @@ class ArrayFragment extends Fragment { /** - * The array. + * The array that contains the processed value of each token. * * @var array */ public $array = array(); /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * The array that contains the unprocessed value of each token. + * + * @var array + */ + public $raw = array(); + + /** + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return ArrayFragment */ @@ -74,7 +81,7 @@ class ArrayFragment extends Fragment break; } $ret->array[] = $token->value; - $ret->tokens[] = $token; + $ret->raw[] = $token->token; $state = 2; } elseif ($state === 2) { if (($token->type !== Token::TYPE_OPERATOR) || (($token->value !== ',') && ($token->value !== ')'))) { diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php index 00b7838e71..6147cf4ab2 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -29,9 +29,9 @@ class CallKeyword extends Fragment public $parameters = array(); /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return CallKeyword */ @@ -68,13 +68,11 @@ class CallKeyword extends Fragment if ($state === 0) { $ret->name = $token->value; - $ret->tokens[] = $token; $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { $parameters = ArrayFragment::parse($parser, $list); $ret->parameters = $parameters->array; - $ret->tokens = array_merge($ret->tokens, $parameters->tokens); } break; } diff --git a/libraries/sql-parser/src/Fragments/CreateDefFragment.php b/libraries/sql-parser/src/Fragments/CreateDefFragment.php index 708ce11b85..675ad81094 100644 --- a/libraries/sql-parser/src/Fragments/CreateDefFragment.php +++ b/libraries/sql-parser/src/Fragments/CreateDefFragment.php @@ -70,9 +70,9 @@ class CreateDefFragment extends Fragment public $name; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return CreateDefFragment */ @@ -98,7 +98,6 @@ class CreateDefFragment extends Fragment break; } - $ret->tokens[] = $token; $ret->name .= $token->value; } diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index c0a4f61a4c..ca7cfafc3b 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -18,10 +18,10 @@ class DataTypeFragment extends Fragment public static $OPTIONS = array( 'BINARY' => 1, 'CHARACTER SET' => array(2, 'var'), - 'CHARSET' => array(3, 'var'), - 'COLLATE' => 4, - 'UNSIGNED' => 5, - 'ZEROFILL' => 6, + 'CHARSET' => array(2, 'var'), + 'COLLATE' => 3, + 'UNSIGNED' => 4, + 'ZEROFILL' => 5, ); /** @@ -46,9 +46,9 @@ class DataTypeFragment extends Fragment public $options = array(); /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return DataTypeFragment[] */ @@ -80,7 +80,6 @@ class DataTypeFragment extends Fragment if ($state === 0) { $ret->name = $token->value; - $ret->tokens[] = $token; if (!isset(Context::$DATA_TYPES[$token->value])) { $parser->error('Unrecognized data type.', $token); } @@ -88,11 +87,9 @@ class DataTypeFragment extends Fragment } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { $size = ArrayFragment::parse($parser, $list); - foreach ($size->tokens as $token) { - $ret->size[] = $token->token; - } - $ret->tokens = array_merge($ret->tokens, $size->tokens); ++$list->idx; + $ret->size = (($ret->name === 'ENUM') || ($ret->name === 'SET')) ? + $size->raw : $size->array; } $ret->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); ++$list->idx; diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index fe941849a5..307968133f 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -52,9 +52,9 @@ class FieldDefFragment extends Fragment /** * The array of indexes. * - * @var array + * @var ArrayFragment */ - public $indexes = array(); + public $indexes; /** * The options of the new field fragment. @@ -64,9 +64,9 @@ class FieldDefFragment extends Fragment public $options; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldDefFragment[] */ @@ -124,7 +124,7 @@ class FieldDefFragment extends Fragment } continue; } elseif ($state === 1) { - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { if ($token->value === 'CONSTRAINT') { $state = 4; } elseif (isset(Context::$KEY_TYPES[$token->value])) { @@ -166,11 +166,10 @@ class FieldDefFragment extends Fragment } } - $expr->tokens[] = $token; } // Last iteration was not saved. - if (!empty($expr->tokens)) { + if (!empty($expr->name)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index 71e1066a65..9a69a2e9d6 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -50,9 +50,9 @@ class FieldFragment extends Fragment public $alias; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldFragment */ @@ -85,7 +85,6 @@ class FieldFragment extends Fragment if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { if (($isExpr) && (!$alias)) { $ret->expr .= $token->token; - $ret->tokens[] = $token; } if (($alias === 0) && (!$isExpr) && (!$period) && (!empty($ret->expr))) { $alias = 1; @@ -93,7 +92,7 @@ class FieldFragment extends Fragment continue; } - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { // Keywords may be found only between brackets. if ($brackets === 0) { if ($token->value === 'AS') { @@ -121,9 +120,9 @@ class FieldFragment extends Fragment } } - if (($token->type === Token::TYPE_NUMBER) || ($token->type === Token::TYPE_BOOL) || - (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE)) || - (($token->type === Token::TYPE_OPERATOR)) && ($token->value !== '.')) { + if (($token->type === Token::TYPE_NUMBER) || ($token->type === Token::TYPE_BOOL) + || (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE)) + || (($token->type === Token::TYPE_OPERATOR)) && ($token->value !== '.')) { // Numbers, booleans and operators are usually part of expressions. $isExpr = true; } @@ -147,15 +146,15 @@ class FieldFragment extends Fragment } } else { if ($brackets === 0) { - if (($token->type === Token::TYPE_NONE) || ($token->type === Token::TYPE_STRING) || - (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_BACKTICK))) { + if (($token->type === Token::TYPE_NONE) || ($token->type === Token::TYPE_STRING) + || (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_BACKTICK)) + ) { $ret->alias = $token->value; } } } $ret->expr .= $token->token; - $ret->tokens[] = $token; } } @@ -163,7 +162,7 @@ class FieldFragment extends Fragment $parser->error('Alias was expected.', $token); } - if (empty($ret->tokens)) { + if (empty($ret->expr)) { return null; } diff --git a/libraries/sql-parser/src/Fragments/FromKeyword.php b/libraries/sql-parser/src/Fragments/FromKeyword.php index fd11eea68e..c7dc624111 100644 --- a/libraries/sql-parser/src/Fragments/FromKeyword.php +++ b/libraries/sql-parser/src/Fragments/FromKeyword.php @@ -15,9 +15,9 @@ class FromKeyword extends Fragment { /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldFragment[] */ @@ -42,7 +42,7 @@ class FromKeyword extends Fragment } // No keyword is expected. - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { break; } @@ -58,7 +58,7 @@ class FromKeyword extends Fragment } // Last iteration was not saved. - if (!empty($expr->tokens)) { + if ($expr !== null) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index 9f6a116eab..d56293aa9f 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -29,9 +29,9 @@ class IntoKeyword extends Fragment public $fields; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return IntoKeyword */ @@ -69,7 +69,7 @@ class IntoKeyword extends Fragment } // No keyword is expected. - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { break; } @@ -92,7 +92,6 @@ class IntoKeyword extends Fragment break; } - $ret->tokens[] = $token; if ($state === 0) { $ret->table .= $token->value; } elseif ($state === 1) { diff --git a/libraries/sql-parser/src/Fragments/JoinKeyword.php b/libraries/sql-parser/src/Fragments/JoinKeyword.php index 62f9ecd0c0..411d227372 100644 --- a/libraries/sql-parser/src/Fragments/JoinKeyword.php +++ b/libraries/sql-parser/src/Fragments/JoinKeyword.php @@ -29,9 +29,9 @@ class JoinKeyword extends Fragment public $on; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return JoinKeyword */ diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index 08fb3a43ef..3e6f592c9c 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -29,9 +29,9 @@ class LimitKeyword extends Fragment public $row_count; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return LimitKeyword */ @@ -55,8 +55,7 @@ class LimitKeyword extends Fragment continue; } - // NOTE: `OFFSET` is not a keyword. - if (($token->type === Token::TYPE_NONE) && ($token->value === 'OFFSET')) { + if ($token->value === 'OFFSET') { if ($offset) { $parser->error('An offset was expected.'); } @@ -76,9 +75,6 @@ class LimitKeyword extends Fragment } else { $ret->row_count = $token->value; } - - $ret->tokens[] = $token; - } if ($offset) { diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index 22661eb989..3317f10bd5 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -22,9 +22,9 @@ class OptionsFragment extends Fragment public $options = array(); /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return OptionsFragment */ @@ -55,8 +55,8 @@ class OptionsFragment extends Fragment continue; } - if (isset($options[$token->value])) { - $lastOption = $options[$token->value]; + if (isset($options[strtoupper($token->value)])) { + $lastOption = $options[strtoupper($token->value)]; $lastOptionId = is_array($lastOption) ? $lastOption[0] : $lastOption; // Checking for option conflicts. @@ -78,10 +78,9 @@ class OptionsFragment extends Fragment // The only keywords that are expected are those which are // options. - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { break; } - } if (is_array($lastOption)) { @@ -105,8 +104,6 @@ class OptionsFragment extends Fragment $ret->options[$lastOptionId] = $token->value; $lastOption = null; } - $ret->tokens[] = $token; - } ksort($ret->options); diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Fragments/OrderKeyword.php index 5ddc8efb75..4cebc1c2bc 100644 --- a/libraries/sql-parser/src/Fragments/OrderKeyword.php +++ b/libraries/sql-parser/src/Fragments/OrderKeyword.php @@ -29,9 +29,9 @@ class OrderKeyword extends Fragment public $type = 'ASC'; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return OrderKeyword[] */ @@ -55,11 +55,10 @@ class OrderKeyword extends Fragment continue; } - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { // Type of ordering. By default, it is `ASC`. if (($token->value === 'ASC') || ($token->value === 'DESC')) { $expr->type = $token->value; - $expr->tokens[] = $token; continue; } @@ -74,13 +73,12 @@ class OrderKeyword extends Fragment continue; } - $expr->tokens[] = $token; $expr->column .= $token->token; } // Last iteration was not processed. - if (!empty($expr->tokens)) { + if (!empty($expr->column)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php index b7d414d509..132898fd91 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -37,9 +37,9 @@ class ParamDefFragment extends Fragment public $type; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return ParamDefFragment[] */ @@ -112,12 +112,10 @@ class ParamDefFragment extends Fragment break; } } - - $expr->tokens[] = $token; } // Last iteration was not saved. - if (!empty($expr->tokens)) { + if (!empty($expr->name)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Fragments/RenameKeyword.php index 7841b2ac77..c38dae625d 100644 --- a/libraries/sql-parser/src/Fragments/RenameKeyword.php +++ b/libraries/sql-parser/src/Fragments/RenameKeyword.php @@ -29,9 +29,9 @@ class RenameKeyword extends Fragment public $new; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return RenameKeyword */ @@ -73,7 +73,7 @@ class RenameKeyword extends Fragment continue; } - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { if (($state === 1) && ($token->value === 'TO')) { $state = 2; continue; @@ -95,7 +95,6 @@ class RenameKeyword extends Fragment break; } - $expr->tokens[] = $token; if ($state == 0) { $expr->old = $token->value; $state = 1; @@ -107,7 +106,7 @@ class RenameKeyword extends Fragment } // Last iteration was not saved. - if (!empty($expr->tokens)) { + if (!empty($expr->old)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/SelectKeyword.php b/libraries/sql-parser/src/Fragments/SelectKeyword.php index dc8db950be..8848815bd5 100644 --- a/libraries/sql-parser/src/Fragments/SelectKeyword.php +++ b/libraries/sql-parser/src/Fragments/SelectKeyword.php @@ -15,9 +15,9 @@ class SelectKeyword extends Fragment { /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldFragment[] */ @@ -41,7 +41,7 @@ class SelectKeyword extends Fragment continue; } - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { // No keyword is expected. break; } @@ -58,7 +58,7 @@ class SelectKeyword extends Fragment } // Last iteration was not processed. - if (!empty($expr->tokens)) { + if ($expr !== null) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Fragments/SetKeyword.php index 1e70f27e2d..284173eab9 100644 --- a/libraries/sql-parser/src/Fragments/SetKeyword.php +++ b/libraries/sql-parser/src/Fragments/SetKeyword.php @@ -29,9 +29,9 @@ class SetKeyword extends Fragment public $value; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return SetKeyword[] */ @@ -70,7 +70,7 @@ class SetKeyword extends Fragment } // No keyword is expected. - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { break; } @@ -85,17 +85,15 @@ class SetKeyword extends Fragment } } - $expr->tokens[] = $token; if ($state === 0) { $expr->column .= $token->value; } else { // } else if ($state === 1) { $expr->value = $token->value; } - } // Last iteration was not saved. - if (!empty($expr->tokens)) { + if (!empty($expr->column)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/ValuesKeyword.php b/libraries/sql-parser/src/Fragments/ValuesKeyword.php index c6bd551772..db8c5fd2f7 100644 --- a/libraries/sql-parser/src/Fragments/ValuesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ValuesKeyword.php @@ -22,9 +22,9 @@ class ValuesKeyword extends Fragment public $values; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return ValuesKeyword */ @@ -68,7 +68,7 @@ class ValuesKeyword extends Fragment } // No keyword is expected. - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { break; } @@ -96,7 +96,6 @@ class ValuesKeyword extends Fragment break; } - $expr->tokens[] = $token; if ($state === 1) { $value .= $token->value; $state = 2; @@ -105,7 +104,7 @@ class ValuesKeyword extends Fragment } // Last iteration was not saved. - if (!empty($expr->tokens)) { + if (!empty($expr->values)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index 786efbfa9a..c9ce460175 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -36,9 +36,9 @@ class WhereKeyword extends Fragment public $condition; /** - * @param Parser $parser - * @param TokensList $list - * @param array $options + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return WhereKeyword[] */ @@ -64,14 +64,13 @@ class WhereKeyword extends Fragment // Conditions are delimited by logical operators. if (in_array($token->value, static::$OPERATORS, true)) { - if (!empty($expr->tokens)) { + if (!empty($expr->condition)) { $ret[] = $expr; } $expr = new WhereKeyword(); $expr->isOperator = true; $expr->condition = $token->value; - $epxr->tokens[] = $token; $ret[] = $expr; $expr = new WhereKeyword(); @@ -80,17 +79,16 @@ class WhereKeyword extends Fragment } // No keyword is expected. - if ($token->type === Token::TYPE_KEYWORD) { + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { break; } - $expr->tokens[] = $token; $expr->condition .= $token->token; } // Last iteration was not processed. - if (!empty($expr->tokens)) { + if (!empty($expr->condition)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index 2b980ab692..efd926881b 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -26,6 +26,12 @@ class Lexer // (ascending) and their occurance rate (descending). // // Conflicts: + // + // 1. `parseDelimiter` and `parseUnknown`, `parseKeyword`, `parseNumber` + // They fight over delimiter. The delimiter may be a keyword, a number + // or almost any character which makes the delimiter one of the first + // tokens that must be parsed. + // // 1. `parseNumber` and `parseOperator` // They fight over `+` and `-`. // @@ -38,9 +44,9 @@ class Lexer // 4. `parseKeyword` and `parseUnknown` // They fight over words. `parseUnknown` does not know about keywords. - 'parseWhitespace', 'parseNumber', 'parseComment', 'parseOperator', - 'parseBool', 'parseString', 'parseSymbol', 'parseKeyword', - 'parseUnknown' + 'parseDelimiter', 'parseWhitespace', 'parseNumber', 'parseComment', + 'parseOperator', 'parseBool', 'parseString', 'parseSymbol', + 'parseKeyword', 'parseUnknown' ); /** @@ -90,6 +96,17 @@ class Lexer */ public $delimiter = ';'; + /** + * The length of the delimiter. + * + * Because `parseDelimter` can be called a lot, it would perform a lot of + * calls to `strlen`, which might affect performance when the delimiter is + * big. + * + * @var int + */ + public $delimiterLen = 1; + /** * List of errors that occured during lexing. * @@ -106,8 +123,8 @@ class Lexer /** * Constructor. * - * @param string|UtfString $str - * @param bool $strict + * @param string|UtfString $str The query to be lexed. + * @param bool $strict Whether strict mode should be enabled or not. */ public function __construct($str, $strict = false) { @@ -120,8 +137,6 @@ class Lexer /** * Parses the string and extracts lexems. - * - * @param string|UtfString $str */ public function lex() { @@ -150,14 +165,16 @@ class Lexer if ($token === null) { // @assert($this->last === $lastIdx); $token = new Token($this->str[$this->last]); - if ($this->delimiter !== $this->str[$this->last]) { - $this->error('Unexpected character.', $this->str[$this->last], $this->last); - } - } elseif (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) && - ($lastToken !== null)) { + $this->error('Unexpected character.', $this->str[$this->last], $this->last); + } elseif (($token->type === Token::TYPE_SYMBOL) + && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) + && ($lastToken !== null) + ) { // Handles ```... FROM 'user'@'%' ...```. - if ((($lastToken->type === Token::TYPE_SYMBOL) && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)) || - ($lastToken->type === Token::TYPE_STRING)) { + if ((($lastToken->type === Token::TYPE_SYMBOL) + && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)) + || ($lastToken->type === Token::TYPE_STRING) + ) { $lastToken->token .= $token->token; $lastToken->type = Token::TYPE_SYMBOL; $lastToken->flags = Token::FLAG_SYMBOL_USER; @@ -170,20 +187,39 @@ class Lexer $tokens->tokens[$tokens->count++] = $token; // Handling delimiters. - if ($this->delimiter === '') { - // Updating the delimiter. - if ($token->type !== Token::TYPE_WHITESPACE) { - $this->delimiter = $token->value; + if (($token->type === Token::TYPE_NONE) && ($token->value === 'DELIMITER')) { + if ($this->last + 1 >= $this->len) { + $this->error('Expected whitespace(s) before delimiter.', '', $this->last + 1); + continue; } - } elseif ($token->value === 'DELIMITER') { - // `DELIMITER` keyword found, looking for a delimiter. - $this->delimiter = ''; - } - // Overwriting token if delimiter. - if ($token->value === $this->delimiter) { - $token->type = Token::TYPE_DELIMITER; - $token->flags = 0; + // Skipping last R (from `delimiteR`) and whitespaces between + // the keyword `DELIMITER` and the actual delimiter. + $pos = ++$this->last; + if (($token = $this->parseWhitespace()) !== null) { + $token->position = $pos; + $tokens->tokens[$tokens->count++] = $token; + } + + // Preparing the token that holds the new delimiter. + if ($this->last + 1 >= $this->len) { + $this->error('Expected delimiter.', '', $this->last + 1); + continue; + } + $pos = $this->last + 1; + + // Parsing the delimiter. + $this->delimiter = ''; + while ((++$this->last < $this->len) && (!Context::isWhitespace($this->str[$this->last]))) { + $this->delimiter .= $this->str[$this->last]; + } + --$this->last; + + // Saving the delimiter and its token. + $this->delimiterLen = strlen($this->delimiter); + $token = new Token($this->delimiter, Token::TYPE_DELIMITER); + $token->position = $pos; + $tokens->tokens[$tokens->count++] = $token; } $lastToken = $token; @@ -199,9 +235,10 @@ class Lexer /** * Creates a new error log. * - * @param string $msg - * @param string $str - * @param int $code + * @param string $msg The error message. + * @param string $ch The character that produced the error. + * @param int $pos The position of the character. + * @param int $code The code of the error. */ public function error($msg = '', $str = '', $pos = 0, $code = 0) { @@ -230,8 +267,8 @@ class Lexer for ($j = 1; $j < Context::KEYWORD_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) { $token .= $this->str[$this->last]; if (($this->last + 1 === $this->len) || (Context::isSeparator($this->str[$this->last + 1]))) { - if (Context::isKeyword($token)) { - $ret = new Token($token, Token::TYPE_KEYWORD); + if (($flags = Context::isKeyword($token))) { + $ret = new Token($token, Token::TYPE_KEYWORD, $flags); $iEnd = $this->last; // We don't break so we find longest keyword. // For example, `OR` and `ORDER` have a common prefix `OR`. @@ -427,8 +464,9 @@ class Lexer } elseif ($this->str[$this->last] === '-') { $flags |= Token::FLAG_NUMBER_NEGATIVE; // Do nothing. - } elseif (($this->str[$this->last] === '0') && ($this->last + 1 < $this->len) && - (($this->str[$this->last + 1] === 'x') || ($this->str[$this->last + 1] === 'X'))) { + } elseif (($this->str[$this->last] === '0') && ($this->last + 1 < $this->len) + && (($this->str[$this->last + 1] === 'x') || ($this->str[$this->last + 1] === 'X')) + ) { $token .= $this->str[$this->last++]; $state = 2; } elseif (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { @@ -440,9 +478,10 @@ class Lexer } } elseif ($state === 2) { $flags |= Token::FLAG_NUMBER_HEX; - if ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) || - (($this->str[$this->last] >= 'A') && ($this->str[$this->last] <= 'F')) || - (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f'))) { + if ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) + || (($this->str[$this->last] >= 'A') && ($this->str[$this->last] <= 'F')) + || (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f')) + ) { // Do nothing. } else { break; @@ -494,7 +533,7 @@ class Lexer /** * Parses a string. * - * @param string $quote Additional start symbol. + * @param string $quote Additional starting symbol. * * @return Token */ @@ -507,9 +546,10 @@ class Lexer $quote = $token; while (++$this->last < $this->len) { - if (($this->last + 1 < $this->len) && - ((($this->str[$this->last] === $quote) && ($this->str[$this->last + 1] === $quote)) || - (($this->str[$this->last] === '\\') && ($quote !== '`')))) { + if (($this->last + 1 < $this->len) + && ((($this->str[$this->last] === $quote) && ($this->str[$this->last + 1] === $quote)) + || (($this->str[$this->last] === '\\') && ($quote !== '`'))) + ) { $token .= $this->str[$this->last] . $this->str[++$this->last]; } else { if ($this->str[$this->last] === $quote) { @@ -575,4 +615,24 @@ class Lexer --$this->last; return new Token($token); } + + /** + * Parses the delimiter of the query. + * + * @return Token + */ + public function parseDelimiter() + { + $idx = 0; + + while ($idx < $this->delimiterLen) { + if ($this->delimiter[$idx] !== $this->str[$this->last + $idx]) { + return null; + } + ++$idx; + } + + $this->last += $this->delimiterLen - 1; + return new Token($this->delimiter, Token::TYPE_DELIMITER); + } } diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 167e9125fa..059faa52af 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -119,8 +119,8 @@ class Parser /** * Constructor. * - * @param mixed $list - * @param bool $strict + * @param mixed $list The list of tokens to be parsed. + * @param bool $strict Whether strict mode should be enabled or not. */ public function __construct($list = null, $strict = false) { @@ -181,9 +181,9 @@ class Parser /** * Creates a new error log. * - * @param string $str - * @param Token $token - * @param int $code + * @param string $msg The error message. + * @param Token $token The token that produced the error. + * @param int $code The code of the error. */ public function error($str = '', Token $token = null, $code = 0) { diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index 9b75c02f3e..7563d77d02 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -109,6 +109,9 @@ class Token const TYPE_DELIMITER = 9; // Flags that describe the tokens in more detail. + const FLAG_KEYWORD_RESERVED = 1; + const FLAG_KEYWORD_UNRESERVED = 2; + const FLAG_KEYWORD_COMPOSED = 4; // Numbers related flags. const FLAG_NUMBER_HEX = 1; @@ -200,7 +203,10 @@ class Token { switch ($this->type) { case Token::TYPE_KEYWORD: - return strtoupper($this->token); + if ($this->flags & Token::FLAG_KEYWORD_RESERVED) { + return strtoupper($this->token); + } + return $this->token; case Token::TYPE_WHITESPACE: return ' '; case Token::TYPE_BOOL: diff --git a/libraries/sql-parser/src/UtfString.php b/libraries/sql-parser/src/UtfString.php index 8815e58367..0f68cfe0cc 100644 --- a/libraries/sql-parser/src/UtfString.php +++ b/libraries/sql-parser/src/UtfString.php @@ -154,7 +154,7 @@ class UtfString implements \ArrayAccess * * @return int */ - private static function getCharLength($byte) + public static function getCharLength($byte) { $byte = ord($byte); if ($byte < 128) { diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index dc8b4386c6..473bf9bf99 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -2,7 +2,7 @@ namespace SqlParser\Utils; -use SqlParser\Statement; +use SqlParser\Statements\SelectStatement; class Misc { @@ -10,12 +10,12 @@ class Misc /** * Gets a list of all aliases and their original names. * - * @param Statement $tree + * @param SelectStatement $tree The tree that was generated after parsing. * @param string $db * * @return array */ - public static function getAliases($tree, $db) + public static function getAliases(SelectStatement $tree, $db) { $retval = array(); diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 126ed539f0..36511ca529 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -4,9 +4,9 @@ namespace SqlParser\Utils; use SqlParser\Lexer; use SqlParser\Parser; -use SqlParser\Statement; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; +use SqlParser\Statements\CreateStatement; class Routine { @@ -80,11 +80,11 @@ class Routine /** * Gets the parameters of a routine from the parse tree. * - * @param Statement $tree + * @param CreateStatement $tree The tree that was generated after parsing. * * @return array */ - public static function getParameters(Statement $tree) + public static function getParameters(CreateStatement $tree) { $retval = array( 'num' => 0, From 2c341191e6f96a444e65115b43347280cd4ff80a Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 21 Jun 2015 20:04:33 +0300 Subject: [PATCH 12/57] Make use of multiple contexts. Signed-off-by: Dan Ungureanu --- libraries/common.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 282423fe59..c6dea7f02d 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1058,6 +1058,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ include_once './libraries/sqlparser.lib.php'; include_once './libraries/sql-parser/autoload.php'; + try { + SqlParser\Context::load((PMA_DRIZZLE ? 'Drizzle' : 'MySQL') . PMA_MYSQL_INT_VERSION); + } catch (\Exception $e) {} /** * the PMA_List_Database class From 105a1275e50091486a826ac40aaa1d7b9f4a2569 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 21 Jun 2015 22:25:04 +0300 Subject: [PATCH 13/57] Fixed failing test. Signed-off-by: Dan Ungureanu --- libraries/Util.class.php | 2 +- .../common/PMA_quoting_slashing_test.php | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 97a5e5322e..3bbdee123f 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -907,7 +907,7 @@ class PMA_Util } if (! $do_it) { - if (!SqlParser\Context::isKeyword($a_name)) { + if (!(SqlParser\Context::isKeyword($a_name) & SqlParser\Token::FLAG_KEYWORD_RESERVED)) { return $a_name; } } diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 2710946b89..b5d837a9e0 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -214,13 +214,18 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase */ public function testBackquoteForbidenWords() { - global $PMA_SQPdata_forbidden_word; - - foreach ($PMA_SQPdata_forbidden_word as $forbidden) { - $this->assertEquals( - "`" . $forbidden . "`", - PMA_Util::backquote($forbidden, false) - ); + foreach (SqlParser\Context::$KEYWORDS as $keyword => $type) { + if ($type & SqlParser\Token::FLAG_KEYWORD_RESERVED) { + $this->assertEquals( + "`" . $keyword . "`", + PMA_Util::backquote($keyword, false) + ); + } else { + $this->assertEquals( + $keyword, + PMA_Util::backquote($keyword, false) + ); + } } } } From 47280915943c18e4ec0ceb6d79c5c1731606f352 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 21 Jun 2015 22:26:01 +0300 Subject: [PATCH 14/57] Refactored PMA_RTN_getDataFromName(). Signed-off-by: Dan Ungureanu --- libraries/rte/rte_routines.lib.php | 94 ++++--------------- .../rte/PMA_RTN_ParameterParser_test.php | 66 ------------- 2 files changed, 16 insertions(+), 144 deletions(-) delete mode 100644 test/libraries/rte/PMA_RTN_ParameterParser_test.php diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index b16926001f..342bfe29a6 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -9,6 +9,8 @@ if (! defined('PHPMYADMIN')) { exit; } +require_once 'libraries/Template.class.php'; + /** * Sets required globals * @@ -79,42 +81,6 @@ function PMA_RTN_main($type) } } // end PMA_RTN_main() -/** - * This function looks through the contents of a parsed - * SHOW CREATE [PROCEDURE | FUNCTION] query and extracts - * information about the routine's definer. - * - * @param array $parsed_query Parsed query, returned by PMA_SQP_parse() - * - * @return string The definer of a routine. - */ -function PMA_RTN_parseRoutineDefiner($parsed_query) -{ - $retval = ''; - $fetching = false; - for ($i = 0; $i < $parsed_query['len']; $i++) { - if ($parsed_query[$i]['type'] == 'alpha_reservedWord' - && $parsed_query[$i]['data'] == 'DEFINER' - ) { - $fetching = true; - } else if ($fetching == true - && $parsed_query[$i]['type'] != 'quote_backtick' - && /*overload*/mb_substr($parsed_query[$i]['type'], 0, 5) != 'punct' - ) { - break; - } else if ($fetching == true - && $parsed_query[$i]['type'] == 'quote_backtick' - ) { - $retval .= PMA_Util::unQuote( - $parsed_query[$i]['data'] - ); - } else if ($fetching == true && $parsed_query[$i]['type'] == 'punct_user') { - $retval .= $parsed_query[$i]['data']; - } - } - return $retval; -} // end PMA_RTN_parseRoutineDefiner() - /** * Handles editor requests for adding or editing an item * @@ -543,12 +509,15 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) // Get required data $retval['item_name'] = $routine['SPECIFIC_NAME']; $retval['item_type'] = $routine['ROUTINE_TYPE']; + $parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition( $db, $routine['ROUTINE_TYPE'], $routine['SPECIFIC_NAME'] )); - $params = SqlParser\Utils\Routine::getParameters($parser->statements[0]); + $routineStatement = $parser->statements[0]; + + $params = SqlParser\Utils\Routine::getParameters($routineStatement); $retval['item_num_params'] = $params['num']; $retval['item_param_dir'] = $params['dir']; $retval['item_param_name'] = $params['name']; @@ -571,51 +540,20 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) $retval['item_returnlength'] = ''; $retval['item_returnopts_num'] = ''; $retval['item_returnopts_text'] = ''; + if (! empty($routine['DTD_IDENTIFIER'])) { - if (/*overload*/mb_strlen($routine['DTD_IDENTIFIER']) > 63) { - // If the DTD_IDENTIFIER string from INFORMATION_SCHEMA is - // at least 64 characters, then it may actually have been - // chopped because that column is a varchar(64), so we will - // parse the output of SHOW CREATE query to get accurate - // information about the return variable. - $dtd = ''; - $fetching = false; - for ($i = 0; $i < $parsed_query['len']; $i++) { - if ($parsed_query[$i]['type'] == 'alpha_reservedWord' - && /*overload*/mb_strtoupper($parsed_query[$i]['data']) == 'RETURNS' - ) { - $fetching = true; - } else if ($fetching == true - && $parsed_query[$i]['type'] == 'alpha_reservedWord' - ) { - // We will not be looking for options such as UNSIGNED - // or ZEROFILL because there is no way that a numeric - // field's DTD_IDENTIFIER can be longer than 64 - // characters. We can safely assume that the return - // datatype is either ENUM or SET, so we only look - // for CHARSET. - $word = /*overload*/mb_strtoupper($parsed_query[$i]['data']); - if ($word == 'CHARSET' - && ($parsed_query[$i+1]['type'] == 'alpha_charset' - || $parsed_query[$i+1]['type'] == 'alpha_identifier') - ) { - $dtd .= $word . ' ' . $parsed_query[$i + 1]['data']; - } - break; - } else if ($fetching == true) { - $dtd .= $parsed_query[$i]['data'] . ' '; - } - } - $routine['DTD_IDENTIFIER'] = $dtd; + $options = array(); + foreach ($routineStatement->return->options->options as $opt) { + $options[] = is_string($opt) ? $opt : $opt['value']; } - $returnparam = SqlParser\Utils\Routine::getReturnType($routine['DTD_IDENTIFIER']); - $retval['item_returntype'] = $returnparam[2]; - $retval['item_returnlength'] = $returnparam[3]; - $retval['item_returnopts_num'] = $returnparam[4]; - $retval['item_returnopts_text'] = $returnparam[4]; + + $retval['item_returntype'] = $routineStatement->return->name; + $retval['item_returnlength'] = implode(',', $routineStatement->return->size); + $retval['item_returnopts_num'] = implode(' ', $options); + $retval['item_returnopts_text'] = implode(' ', $options); } - $retval['item_definer'] = PMA_RTN_parseRoutineDefiner($parsed_query); + $retval['item_definer'] = $routineStatement->options->has('DEFINER'); $retval['item_definition'] = $routine['ROUTINE_DEFINITION']; $retval['item_isdeterministic'] = ''; if ($routine['IS_DETERMINISTIC'] == 'YES') { diff --git a/test/libraries/rte/PMA_RTN_ParameterParser_test.php b/test/libraries/rte/PMA_RTN_ParameterParser_test.php deleted file mode 100644 index d94e6c0b96..0000000000 --- a/test/libraries/rte/PMA_RTN_ParameterParser_test.php +++ /dev/null @@ -1,66 +0,0 @@ -assertEquals( - $target, - PMA_RTN_parseRoutineDefiner(PMA_SQP_parse($source)) - ); - } - - /** - * Data provider for testParseDefiner - * - * @return array - */ - public function definerProvider() - { - return array( - array('CREATE PROCEDURE FOO() SELECT NULL', ''), - array( - 'CREATE DEFINER=`root`@`localhost` PROCEDURE FOO() SELECT NULL', - 'root@localhost' - ), - array( - 'CREATE DEFINER=`root\\`@`localhost` PROCEDURE FOO() SELECT NULL', - 'root\\@localhost' - ), - ); - } -} -?> From 8c62557b2ed6732e08372eb99d75c272b8d1b3dc Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Jun 2015 03:41:38 +0300 Subject: [PATCH 15/57] Added sql-parser to PHPUnit's exclude filter for code coverage. Signed-off-by: Dan Ungureanu --- phpunit.xml.dist | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 76a94195f9..d3e2fab635 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -43,12 +43,13 @@ . - libraries/tcpdf - libraries/phpseclib + libraries/php-gettext libraries/bfShapeFiles libraries/php-gettext - libraries/php-gettext + libraries/phpseclib libraries/plugins/auth/swekey/ + libraries/sql-parser + libraries/tcpdf PMAStandard From e73c7a496737ef2d0e3dbef4d9b1bf2c91ff95d0 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Jun 2015 03:42:18 +0300 Subject: [PATCH 16/57] Fixed coding style. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/common.inc.php | 4 +- libraries/rte/rte_list.lib.php | 12 ++- libraries/rte/rte_routines.lib.php | 12 ++- libraries/sql-parser/autoload.php | 2 - libraries/sql-parser/composer/ClassLoader.php | 2 +- .../sql-parser/composer/autoload_psr4.php | 2 - .../sql-parser/composer/autoload_real.php | 2 - libraries/sql-parser/src/Context.php | 32 ++++--- .../src/Contexts/Context_MySQL50000.php | 9 ++ .../src/Contexts/Context_MySQL50100.php | 9 ++ .../src/Contexts/Context_MySQL50500.php | 9 ++ .../src/Contexts/Context_MySQL50600.php | 9 ++ .../src/Contexts/Context_MySQL50700.php | 9 ++ .../src/Exceptions/LexerException.php | 14 ++- .../src/Exceptions/ParserException.php | 12 ++- libraries/sql-parser/src/Fragment.php | 20 ++-- .../src/Fragments/ArrayFragment.php | 19 +++- .../sql-parser/src/Fragments/CallKeyword.php | 19 +++- .../src/Fragments/CreateDefFragment.php | 27 ++++-- .../src/Fragments/DataTypeFragment.php | 19 +++- .../src/Fragments/FieldDefFragment.php | 19 +++- .../src/Fragments/FieldFragment.php | 44 ++++++--- .../sql-parser/src/Fragments/FromKeyword.php | 19 +++- .../sql-parser/src/Fragments/IntoKeyword.php | 19 +++- .../sql-parser/src/Fragments/JoinKeyword.php | 21 +++-- .../sql-parser/src/Fragments/LimitKeyword.php | 19 +++- .../src/Fragments/OptionsFragment.php | 29 ++++-- .../sql-parser/src/Fragments/OrderKeyword.php | 19 +++- .../src/Fragments/ParamDefFragment.php | 19 +++- .../src/Fragments/RenameKeyword.php | 19 +++- .../src/Fragments/SelectKeyword.php | 19 +++- .../sql-parser/src/Fragments/SetKeyword.php | 19 +++- .../src/Fragments/ValuesKeyword.php | 19 +++- .../sql-parser/src/Fragments/WhereKeyword.php | 21 +++-- libraries/sql-parser/src/Lexer.php | 55 ++++++++--- libraries/sql-parser/src/Parser.php | 39 +++++--- libraries/sql-parser/src/Statement.php | 71 +++++++++++--- .../src/Statements/CallStatement.php | 12 +++ .../src/Statements/CreateStatement.php | 6 ++ .../src/Statements/DeleteStatement.php | 5 + .../src/Statements/InsertStatement.php | 5 + .../src/Statements/RenameStatement.php | 5 + .../src/Statements/ReplaceStatement.php | 5 + .../src/Statements/SelectStatement.php | 5 + .../src/Statements/UpdateStatement.php | 5 + libraries/sql-parser/src/Token.php | 93 ++++++++++--------- libraries/sql-parser/src/TokensList.php | 60 +++++++++--- libraries/sql-parser/src/UtfString.php | 49 ++++++---- libraries/sql-parser/src/Utils/Misc.php | 18 +++- libraries/sql-parser/src/Utils/Routine.php | 9 ++ 50 files changed, 729 insertions(+), 261 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index c6dea7f02d..9632a0709b 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1060,7 +1060,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { include_once './libraries/sql-parser/autoload.php'; try { SqlParser\Context::load((PMA_DRIZZLE ? 'Drizzle' : 'MySQL') . PMA_MYSQL_INT_VERSION); - } catch (\Exception $e) {} + } catch (\Exception $e) { + // If this fails, it will continue using the default context. + } /** * the PMA_List_Database class diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index e233a61348..be509c7eb7 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -221,11 +221,13 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') // we will show a dialog to get values for these parameters, // otherwise we can execute it directly. - $parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition( - $db, - $routine['type'], - $routine['name'] - )); + $parser = new SqlParser\Parser( + $GLOBALS['dbi']->getDefinition( + $db, + $routine['type'], + $routine['name'] + ) + ); $params = SqlParser\Utils\Routine::getParameters($parser->statements[0]); if ($routine !== false) { if (PMA_Util::currentUserHasPrivilege('EXECUTE', $db)) { diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 342bfe29a6..73980f41c4 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -510,11 +510,13 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) $retval['item_name'] = $routine['SPECIFIC_NAME']; $retval['item_type'] = $routine['ROUTINE_TYPE']; - $parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition( - $db, - $routine['ROUTINE_TYPE'], - $routine['SPECIFIC_NAME'] - )); + $parser = new SqlParser\Parser( + $GLOBALS['dbi']->getDefinition( + $db, + $routine['ROUTINE_TYPE'], + $routine['SPECIFIC_NAME'] + ) + ); $routineStatement = $parser->statements[0]; $params = SqlParser\Utils\Routine::getParameters($routineStatement); diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php index a88e87984f..0e42d154fd 100644 --- a/libraries/sql-parser/autoload.php +++ b/libraries/sql-parser/autoload.php @@ -1,7 +1,5 @@ classMap) { + if (!empty($this->classMap)) { $this->classMap = array_merge($this->classMap, $classMap); } else { $this->classMap = $classMap; diff --git a/libraries/sql-parser/composer/autoload_psr4.php b/libraries/sql-parser/composer/autoload_psr4.php index 31419d5807..756ce5f0a8 100644 --- a/libraries/sql-parser/composer/autoload_psr4.php +++ b/libraries/sql-parser/composer/autoload_psr4.php @@ -1,7 +1,5 @@ + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ abstract class Context { @@ -424,10 +429,10 @@ abstract class Context /** * Checks if the given string is a keyword. * - * @param string $str - * @param bool $isReserved + * @param string $str String to be checked. + * @param bool $isReserved Checks if the keyword is reserved. * - * @return bool + * @return int */ public static function isKeyword($str, $isReserved = false) { @@ -451,7 +456,7 @@ abstract class Context /** * Checks if the given string is an operator. * - * @param string $str + * @param string $str String to be checked. * * @return int The appropriate flag for the operator. */ @@ -469,7 +474,7 @@ abstract class Context /** * Checks if the given character is a whitespace. * - * @param string $ch + * @param string $ch String to be checked. * * @return bool */ @@ -484,7 +489,7 @@ abstract class Context /** * Checks if the given string is the beginning of a whitespace. * - * @param string $str + * @param string $str String to be checked. * * @return int The appropriate flag for the comment type. */ @@ -514,7 +519,7 @@ abstract class Context * This actually check only for `TRUE` and `FALSE` because `1` or `0` are * actually numbers and are parsed by specific methods. * - * @param string $ch + * @param string $ch String to be checked. * * @return bool */ @@ -530,7 +535,7 @@ abstract class Context /** * Checks if the given character can be a part of a number. * - * @param string $ch + * @param string $ch String to be checked. * * @return bool */ @@ -547,7 +552,7 @@ abstract class Context * Checks if the given character is the beginning of a symbol. A symbol * can be either a variable or a field name. * - * @param string $ch + * @param string $ch String to be checked. * * @return int The appropriate flag for the symbol type. */ @@ -567,7 +572,7 @@ abstract class Context /** * Checks if the given character is the beginning of a string. * - * @param string $str + * @param string $str String to be checked. * * @return int The appropriate flag for the string type. */ @@ -587,7 +592,7 @@ abstract class Context /** * Checks if the given character can be a separator for two lexems. * - * @param string $ch + * @param string $ch String to be checked. * * @return bool */ @@ -601,7 +606,10 @@ abstract class Context * * Contexts may be used by accessing the context directly. * - * @param string $context + * @param string $context Name of the context or full class name that + * defines the context. + * + * @return void */ public static function load($context = '') { diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50000.php b/libraries/sql-parser/src/Contexts/Context_MySQL50000.php index e1d036ef0c..830399e719 100644 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50000.php +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50000.php @@ -4,6 +4,15 @@ namespace SqlParser\Contexts; use SqlParser\Context; +/** + * Context for MySQL 5.0. + * + * @category Contexts + * @package SqlParser + * @subpackage Contexts + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Context_MySQL50000 extends Context { diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50100.php b/libraries/sql-parser/src/Contexts/Context_MySQL50100.php index ce83a5f854..f70ecef978 100644 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50100.php +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50100.php @@ -4,6 +4,15 @@ namespace SqlParser\Contexts; use SqlParser\Context; +/** + * Context for MySQL 5.1. + * + * @category Contexts + * @package SqlParser + * @subpackage Contexts + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Context_MySQL50100 extends Context { diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50500.php b/libraries/sql-parser/src/Contexts/Context_MySQL50500.php index 8c3d570440..6febe72e3c 100644 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50500.php +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50500.php @@ -4,6 +4,15 @@ namespace SqlParser\Contexts; use SqlParser\Context; +/** + * Context for MySQL 5.5. + * + * @category Contexts + * @package SqlParser + * @subpackage Contexts + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Context_MySQL50500 extends Context { diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50600.php b/libraries/sql-parser/src/Contexts/Context_MySQL50600.php index 4f0b0d6c91..dfd114ace1 100644 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50600.php +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50600.php @@ -4,6 +4,15 @@ namespace SqlParser\Contexts; use SqlParser\Context; +/** + * Context for MySQL 5.6. + * + * @category Contexts + * @package SqlParser + * @subpackage Contexts + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Context_MySQL50600 extends Context { diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50700.php b/libraries/sql-parser/src/Contexts/Context_MySQL50700.php index 578da8982b..b795b2d6e7 100644 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50700.php +++ b/libraries/sql-parser/src/Contexts/Context_MySQL50700.php @@ -4,6 +4,15 @@ namespace SqlParser\Contexts; use SqlParser\Context; +/** + * Context for MySQL 5.7. + * + * @category Contexts + * @package SqlParser + * @subpackage Contexts + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Context_MySQL50700 extends Context { diff --git a/libraries/sql-parser/src/Exceptions/LexerException.php b/libraries/sql-parser/src/Exceptions/LexerException.php index 306c8b924d..53327ed86f 100644 --- a/libraries/sql-parser/src/Exceptions/LexerException.php +++ b/libraries/sql-parser/src/Exceptions/LexerException.php @@ -6,6 +6,12 @@ use SqlParser\Token; /** * Exception thrown by the lexer. + * + * @category Exceptions + * @package SqlParser + * @subpackage Exceptions + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class LexerException extends \Exception { @@ -27,10 +33,10 @@ class LexerException extends \Exception /** * Constructor. * - * @param string $msg The message of this exception. - * @param string $ch The character that produced this exception. - * @param int $pos The position of the character. - * @param int $code The code of this error. + * @param string $msg The message of this exception. + * @param string $ch The character that produced this exception. + * @param int $pos The position of the character. + * @param int $code The code of this error. */ public function __construct($msg = '', $ch = '', $pos = 0, $code = 0) { diff --git a/libraries/sql-parser/src/Exceptions/ParserException.php b/libraries/sql-parser/src/Exceptions/ParserException.php index 7332674452..06a6033da2 100644 --- a/libraries/sql-parser/src/Exceptions/ParserException.php +++ b/libraries/sql-parser/src/Exceptions/ParserException.php @@ -6,6 +6,12 @@ use SqlParser\Token; /** * Exception thrown by the parser. + * + * @category Exceptions + * @package SqlParser + * @subpackage Exceptions + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class ParserException extends \Exception { @@ -20,9 +26,9 @@ class ParserException extends \Exception /** * Constructor. * - * @param string $msg The message of this exception. - * @param Token $token The token that produced this exception. - * @param int $code The code of this error. + * @param string $msg The message of this exception. + * @param Token $token The token that produced this exception. + * @param int $code The code of this error. */ public function __construct($msg = '', Token $token = null, $code = 0) { diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php index 63af280f26..51cec95922 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Fragment.php @@ -5,18 +5,26 @@ namespace SqlParser; /** * A fragment (of a statement) is a part of a statement that is common to * multiple query types. + * + * @category Fragments + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ abstract class Fragment { /** - * Parses the tokens given by the lexer in the context of the given parser. + * Parses the tokens contained in the given list in the context of the given + * parser. * - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * - * @return array + * @return mixed */ - abstract public static function parse(Parser $parser, TokensList $list, array $options = array()); + abstract public static function parse(Parser $parser, TokensList $list, + array $options = array() + ); } diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Fragments/ArrayFragment.php index 6436823be0..eb5a80b8ee 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Fragments/ArrayFragment.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * Parses an array. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class ArrayFragment extends Fragment { @@ -29,9 +34,9 @@ class ArrayFragment extends Fragment public $raw = array(); /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return ArrayFragment */ @@ -56,7 +61,11 @@ class ArrayFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php index 6147cf4ab2..db11120c49 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * Parses a function call. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class CallKeyword extends Fragment { @@ -29,9 +34,9 @@ class CallKeyword extends Fragment public $parameters = array(); /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return CallKeyword */ @@ -53,7 +58,11 @@ class CallKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/CreateDefFragment.php b/libraries/sql-parser/src/Fragments/CreateDefFragment.php index 675ad81094..58eabaaeba 100644 --- a/libraries/sql-parser/src/Fragments/CreateDefFragment.php +++ b/libraries/sql-parser/src/Fragments/CreateDefFragment.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * Parses the definition that follows the `CREATE` keyword. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class CreateDefFragment extends Fragment { @@ -70,9 +75,9 @@ class CreateDefFragment extends Fragment public $name; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return CreateDefFragment */ @@ -81,7 +86,11 @@ class CreateDefFragment extends Fragment $ret = new CreateDefFragment(); for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. @@ -90,11 +99,15 @@ class CreateDefFragment extends Fragment } // Skipping whitespaces and comments. - if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + if (($token->type === Token::TYPE_WHITESPACE) + || ($token->type === Token::TYPE_COMMENT) + ) { continue; } - if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + if (($token->type === Token::TYPE_OPERATOR) + && ($token->value === '(') + ) { break; } diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index ca7cfafc3b..7baefddb48 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -4,13 +4,18 @@ namespace SqlParser\Fragments; use SqlParser\Context; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * Parses a data type. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class DataTypeFragment extends Fragment { @@ -46,9 +51,9 @@ class DataTypeFragment extends Fragment public $options = array(); /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return DataTypeFragment[] */ @@ -70,7 +75,11 @@ class DataTypeFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // Skipping whitespaces and comments. diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index 307968133f..ba4b6dcd16 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -4,7 +4,6 @@ namespace SqlParser\Fragments; use SqlParser\Context; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -13,6 +12,12 @@ use SqlParser\TokensList; * Parses the definition of a field. * * Used for parsing `CREATE TABLE` statement. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class FieldDefFragment extends Fragment { @@ -64,9 +69,9 @@ class FieldDefFragment extends Fragment public $options; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldDefFragment[] */ @@ -105,7 +110,11 @@ class FieldDefFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index 9a69a2e9d6..4adbba5a73 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * Parses a reference to a field. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class FieldFragment extends Fragment { @@ -50,9 +55,9 @@ class FieldFragment extends Fragment public $alias; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldFragment */ @@ -60,20 +65,36 @@ class FieldFragment extends Fragment { $ret = new FieldFragment(); - /** @var bool Whether current tokens make an expression or a table reference. */ + /** + * Whether current tokens make an expression or a table reference. + * @var bool + */ $isExpr = false; - /** @var bool Whether a period was previously found. */ + /** + * Whether a period was previously found. + * @var bool + */ $period = false; - /** @var int Whether an alias is expected. Is 2 if `AS` keyword was found. */ + /** + * Whether an alias is expected. Is 2 if `AS` keyword was found. + * @var int + */ $alias = 0; - /** @var int Counts brackets. */ + /** + * Counts brackets. + * @var int + */ $brackets = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. @@ -122,7 +143,8 @@ class FieldFragment extends Fragment if (($token->type === Token::TYPE_NUMBER) || ($token->type === Token::TYPE_BOOL) || (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE)) - || (($token->type === Token::TYPE_OPERATOR)) && ($token->value !== '.')) { + || (($token->type === Token::TYPE_OPERATOR)) && ($token->value !== '.') + ) { // Numbers, booleans and operators are usually part of expressions. $isExpr = true; } @@ -159,7 +181,7 @@ class FieldFragment extends Fragment } if ($alias === 2) { - $parser->error('Alias was expected.', $token); + $parser->error('Alias was expected.'); } if (empty($ret->expr)) { diff --git a/libraries/sql-parser/src/Fragments/FromKeyword.php b/libraries/sql-parser/src/Fragments/FromKeyword.php index c7dc624111..aea9c3edc1 100644 --- a/libraries/sql-parser/src/Fragments/FromKeyword.php +++ b/libraries/sql-parser/src/Fragments/FromKeyword.php @@ -3,21 +3,26 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `FROM` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class FromKeyword extends Fragment { /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldFragment[] */ @@ -28,7 +33,11 @@ class FromKeyword extends Fragment $expr = new FieldFragment(); for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index d56293aa9f..c4211fd47d 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `INTO` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class IntoKeyword extends Fragment { @@ -29,9 +34,9 @@ class IntoKeyword extends Fragment public $fields; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return IntoKeyword */ @@ -55,7 +60,11 @@ class IntoKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/JoinKeyword.php b/libraries/sql-parser/src/Fragments/JoinKeyword.php index 411d227372..b6b2c224e5 100644 --- a/libraries/sql-parser/src/Fragments/JoinKeyword.php +++ b/libraries/sql-parser/src/Fragments/JoinKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `JOIN` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class JoinKeyword extends Fragment { @@ -24,14 +29,14 @@ class JoinKeyword extends Fragment /** * Join conditions. * - * @var WhereKeyword + * @var WhereKeyword[] */ public $on; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return JoinKeyword */ @@ -55,7 +60,11 @@ class JoinKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index 3e6f592c9c..2e5b8193e5 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `lIMIT` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class LimitKeyword extends Fragment { @@ -29,9 +34,9 @@ class LimitKeyword extends Fragment public $row_count; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return LimitKeyword */ @@ -42,7 +47,11 @@ class LimitKeyword extends Fragment $offset = false; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index 3317f10bd5..f002f5bd32 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * Parses a list of options. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class OptionsFragment extends Fragment { @@ -22,9 +27,9 @@ class OptionsFragment extends Fragment public $options = array(); /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return OptionsFragment */ @@ -32,17 +37,27 @@ class OptionsFragment extends Fragment { $ret = new OptionsFragment(); - /** @var int The ID that will be assigned to duplicate options. */ + /** + * The ID that will be assigned to duplicate options. + * @var int + */ $lastAssignedId = count($options) + 1; - /** @var array The option that was processed last time. */ + /** + * The option that was processed last time. + * @var array + */ $lastOption = null; $lastOptionId = 0; $brackets = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Fragments/OrderKeyword.php index 4cebc1c2bc..224a573263 100644 --- a/libraries/sql-parser/src/Fragments/OrderKeyword.php +++ b/libraries/sql-parser/src/Fragments/OrderKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `ORDER BY` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class OrderKeyword extends Fragment { @@ -29,9 +34,9 @@ class OrderKeyword extends Fragment public $type = 'ASC'; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return OrderKeyword[] */ @@ -42,7 +47,11 @@ class OrderKeyword extends Fragment $expr = new OrderKeyword(); for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php index 132898fd91..4756120651 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -4,13 +4,18 @@ namespace SqlParser\Fragments; use SqlParser\Context; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * The definition of a parameter of a function or procedure. + * + * @category Fragments + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class ParamDefFragment extends Fragment { @@ -37,9 +42,9 @@ class ParamDefFragment extends Fragment public $type; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return ParamDefFragment[] */ @@ -69,7 +74,11 @@ class ParamDefFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Fragments/RenameKeyword.php index c38dae625d..9e9969c5f1 100644 --- a/libraries/sql-parser/src/Fragments/RenameKeyword.php +++ b/libraries/sql-parser/src/Fragments/RenameKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `RENAME TABLE` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class RenameKeyword extends Fragment { @@ -29,9 +34,9 @@ class RenameKeyword extends Fragment public $new; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return RenameKeyword */ @@ -60,7 +65,11 @@ class RenameKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/SelectKeyword.php b/libraries/sql-parser/src/Fragments/SelectKeyword.php index 8848815bd5..fc59aa0261 100644 --- a/libraries/sql-parser/src/Fragments/SelectKeyword.php +++ b/libraries/sql-parser/src/Fragments/SelectKeyword.php @@ -3,21 +3,26 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `SELECT` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class SelectKeyword extends Fragment { /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return FieldFragment[] */ @@ -28,7 +33,11 @@ class SelectKeyword extends Fragment $expr = null; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Fragments/SetKeyword.php index 284173eab9..82f9965ba1 100644 --- a/libraries/sql-parser/src/Fragments/SetKeyword.php +++ b/libraries/sql-parser/src/Fragments/SetKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `SET` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class SetKeyword extends Fragment { @@ -29,9 +34,9 @@ class SetKeyword extends Fragment public $value; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return SetKeyword[] */ @@ -56,7 +61,11 @@ class SetKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/ValuesKeyword.php b/libraries/sql-parser/src/Fragments/ValuesKeyword.php index db8c5fd2f7..cb470dd6d9 100644 --- a/libraries/sql-parser/src/Fragments/ValuesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ValuesKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `VALUES` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class ValuesKeyword extends Fragment { @@ -22,9 +27,9 @@ class ValuesKeyword extends Fragment public $values; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return ValuesKeyword */ @@ -54,7 +59,11 @@ class ValuesKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index c9ce460175..0bc60a7dd9 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -3,13 +3,18 @@ namespace SqlParser\Fragments; use SqlParser\Fragment; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; /** * `WHERE` keyword parser. + * + * @category Keywords + * @package SqlParser + * @subpackage Fragments + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class WhereKeyword extends Fragment { @@ -19,7 +24,7 @@ class WhereKeyword extends Fragment * * @var array */ - private static $OPERATORS = array('&&', '(', ')', 'AND', 'OR', 'XOR', '||'); + public static $OPERATORS = array('&&', '(', ')', 'AND', 'OR', 'XOR', '||'); /** * Whether this fragment is an operator. @@ -36,9 +41,9 @@ class WhereKeyword extends Fragment public $condition; /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. * * @return WhereKeyword[] */ @@ -49,7 +54,11 @@ class WhereKeyword extends Fragment $expr = new WhereKeyword(); for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index efd926881b..33e7337937 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -10,7 +10,11 @@ use SqlParser\Exceptions\LexerException; * * The output of the lexer is affected by the context of the SQL statement. * - * @see Context + * @category Lexer + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + * @see Context */ class Lexer { @@ -123,8 +127,8 @@ class Lexer /** * Constructor. * - * @param string|UtfString $str The query to be lexed. - * @param bool $strict Whether strict mode should be enabled or not. + * @param string|UtfString $str The query to be lexed. + * @param bool $strict Whether strict mode should be enabled or not. */ public function __construct($str, $strict = false) { @@ -137,6 +141,8 @@ class Lexer /** * Parses the string and extracts lexems. + * + * @return void */ public function lex() { @@ -153,7 +159,11 @@ class Lexer $lastToken = null; for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) { - /** @var Token The new token. */ + + /** + * The new token. + * @var Token + */ $token = null; foreach (static::$PARSER_METHODS as $method) { @@ -235,10 +245,12 @@ class Lexer /** * Creates a new error log. * - * @param string $msg The error message. - * @param string $ch The character that produced the error. - * @param int $pos The position of the character. - * @param int $code The code of the error. + * @param string $msg The error message. + * @param string $str The character that produced the error. + * @param int $pos The position of the character. + * @param int $code The code of the error. + * + * @return void */ public function error($msg = '', $str = '', $pos = 0, $code = 0) { @@ -258,10 +270,16 @@ class Lexer { $token = ''; - /** @var Token Value to be returned. */ + /** + * Value to be returned. + * @var Token + */ $ret = null; - /** @var int The value of `$this->last` where `$token` ends in `$this->str`. */ + /** + * The value of `$this->last` where `$token` ends in `$this->str`. + * @var int + */ $iEnd = $this->last; for ($j = 1; $j < Context::KEYWORD_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) { @@ -290,10 +308,16 @@ class Lexer { $token = ''; - /** @var Token|bool Value to be returned. */ - $ret = false; + /** + * Value to be returned. + * @var Token|bool + */ + $ret = null; - /** @var int The value of `$this->last` where `$token` ends in `$this->str`. */ + /** + * The value of `$this->last` where `$token` ends in `$this->str`. + * @var int + */ $iEnd = $this->last; for ($j = 1; $j < Context::OPERATOR_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) { @@ -507,8 +531,9 @@ class Lexer } } elseif ($state === 5) { $flags |= Token::FLAG_NUMBER_APPROXIMATE; - if (($this->str[$this->last] === '+') || ($this->str[$this->last] === '-') || - ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')))) { + if (($this->str[$this->last] === '+') || ($this->str[$this->last] === '-') + || ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9'))) + ) { $state = 6; } else { break; diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 059faa52af..2973a03686 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -7,6 +7,11 @@ use SqlParser\Exceptions\ParserException; /** * Takes multiple tokens (contained in a Lexer instance) as input and builds a * parse tree. + * + * @category Parser + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class Parser { @@ -119,8 +124,8 @@ class Parser /** * Constructor. * - * @param mixed $list The list of tokens to be parsed. - * @param bool $strict Whether strict mode should be enabled or not. + * @param mixed $list The list of tokens to be parsed. + * @param bool $strict Whether strict mode should be enabled or not. */ public function __construct($list = null, $strict = false) { @@ -140,6 +145,8 @@ class Parser /** * Builds the parse trees. + * + * @return void */ public function parse() { @@ -148,7 +155,11 @@ class Parser $last = &$this->list->idx; for (; $last < $count; ++$last) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $tokens[$last]; // Statements can start with keywords only. @@ -160,17 +171,23 @@ class Parser // Checking if it is a known statement that can be parsed. if (empty(static::$STATEMENT_PARSERS[$token->value])) { $this->error( - 'Unrecognized statement type "' . $token->value .'".', + 'Unrecognized statement type "' . $token->value . '".', $token ); // TODO: Skip to first delimiter. continue; } - /** @var string The name of the class that is used for parsing. */ + /** + * The name of the class that is used for parsing. + * @var string + */ $class = static::$STATEMENT_PARSERS[$token->value]; - /** @var Statement Processed statement. */ + /** + * Processed statement. + * @var Statement + */ $stmt = new $class(); $stmt->parse($this, $this->list); @@ -181,13 +198,13 @@ class Parser /** * Creates a new error log. * - * @param string $msg The error message. - * @param Token $token The token that produced the error. - * @param int $code The code of the error. + * @param string $msg The error message. + * @param Token $token The token that produced the error. + * @param int $code The code of the error. */ - public function error($str = '', Token $token = null, $code = 0) + public function error($msg = '', Token $token = null, $code = 0) { - $error = new ParserException($str, $token, $code); + $error = new ParserException($msg, $token, $code); if ($this->strict) { throw $error; } diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index b1dc2c1064..13002f4d72 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -2,11 +2,9 @@ namespace SqlParser; -use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; - use SqlParser\Fragments\CallKeyword; use SqlParser\Fragments\CreateDefFragment; use SqlParser\Fragments\DataTypeFragment; @@ -17,6 +15,14 @@ use SqlParser\Fragments\ParamDefFragment; use SqlParser\Fragments\RenameKeyword; use SqlParser\Fragments\SelectKeyword; +/** + * Abstract statement definition. + * + * @category Statements + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ abstract class Statement { @@ -37,13 +43,19 @@ abstract class Statement /** * Parses the statements defined by the tokens list. * - * @param Parser $parser - * @param TokensList $list + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * + * @return void */ public function parse(Parser $parser, TokensList $list) { for (; $list->idx < $list->count; ++$list->idx) { - /** @var Token Token parsed at this moment. */ + + /** + * Token parsed at this moment. + * @var Token + */ $token = $list->tokens[$list->idx]; // End of statement. @@ -57,7 +69,10 @@ abstract class Statement continue; } - /** @var string The name of the class that is used for parsing. */ + /** + * The name of the class that is used for parsing. + * @var string + */ $class = null; if (!empty(Parser::$KEYWORD_PARSERS[$token->value])) { @@ -73,13 +88,19 @@ abstract class Statement continue; } - /** @var string The name of the field where the result is stored. */ + /** + * The name of the field where the result is stored. + * @var string + */ $field = strtolower($token->value); // Parsing options. if (($class == null) && (isset(static::$OPTIONS))) { ++$list->idx; // Skipping keyword. - $this->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + $this->options = OptionsFragment::parse( + $parser, $list, + static::$OPTIONS + ); } // Keyword specific code. @@ -93,33 +114,53 @@ abstract class Statement ++$list->idx; $this->fields = FieldDefFragment::parse($parser, $list); ++$list->idx; - $this->tableOptions = OptionsFragment::parse($parser, $list, CreateDefFragment::$TABLE_OPTIONS); - } elseif (($this->options->has('PROCEDURE')) || ($this->options->has('FUNCTION'))) { + $this->tableOptions = OptionsFragment::parse( + $parser, + $list, + CreateDefFragment::$TABLE_OPTIONS + ); + } elseif (($this->options->has('PROCEDURE')) + || ($this->options->has('FUNCTION')) + ) { ++$list->idx; $this->parameters = ParamDefFragment::parse($parser, $list); if ($this->options->has('FUNCTION')) { $token = $list->getNextOfType(Token::TYPE_KEYWORD); if ($token->value !== 'RETURNS') { - $parser->error('\'RETURNS\' keyword was expected.', $token); + $parser->error( + '\'RETURNS\' keyword was expected.', + $token + ); } else { ++$list->idx; - $this->return = DataTypeFragment::parse($parser, $list); + $this->return = DataTypeFragment::parse( + $parser, + $list + ); } } ++$list->idx; - $this->funcOptions = OptionsFragment::parse($parser, $list, CreateDefFragment::$FUNC_OPTIONS); + $this->funcOptions = OptionsFragment::parse( + $parser, + $list, + CreateDefFragment::$FUNC_OPTIONS + ); ++$list->idx; $this->body = array(); for (; $list->idx < $list->count; ++$list->idx) { $token = $list->tokens[$list->idx]; $this->body[] = $token; - if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'END')) { + if (($token->type === Token::TYPE_KEYWORD) + && ($token->value === 'END') + ) { break; } } $class = null; // The statement has been processed here. } - } elseif (($token->value === 'GROUP') || ($token->value === 'ORDER')) { + } elseif (($token->value === 'GROUP') + || ($token->value === 'ORDER') + ) { $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'BY'); } elseif ($token->value === 'RENAME') { $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); diff --git a/libraries/sql-parser/src/Statements/CallStatement.php b/libraries/sql-parser/src/Statements/CallStatement.php index 76681b52c8..162f50eafa 100644 --- a/libraries/sql-parser/src/Statements/CallStatement.php +++ b/libraries/sql-parser/src/Statements/CallStatement.php @@ -6,6 +6,18 @@ use SqlParser\Statement; /** * `CALL` statement. + * + * CALL sp_name([parameter[,...]]) + * + * or + * + * CALL sp_name[()] + * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class CallStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 00561f54c0..7a248e9032 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -6,6 +6,12 @@ use SqlParser\Statement; /** * `CREATE` statement. + * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class CreateStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php index 01dd8adc2f..0e88fedefb 100644 --- a/libraries/sql-parser/src/Statements/DeleteStatement.php +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -13,6 +13,11 @@ use SqlParser\Statement; * [ORDER BY ...] * [LIMIT row_count] * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class DeleteStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php index f24634ac33..db88b42beb 100644 --- a/libraries/sql-parser/src/Statements/InsertStatement.php +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -37,6 +37,11 @@ use SqlParser\Statement; * col_name=expr * [, col_name=expr] ... ] * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class InsertStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php index bd3c767d53..88607ea713 100644 --- a/libraries/sql-parser/src/Statements/RenameStatement.php +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -10,6 +10,11 @@ use SqlParser\Statement; * RENAME TABLE tbl_name TO new_tbl_name * [, tbl_name2 TO new_tbl_name2] ... * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class RenameStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index 8e69207bdf..577f72c4fd 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -17,6 +17,11 @@ use SqlParser\Statement; * [INTO] tbl_name * SET col_name={expr | DEFAULT}, ... * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class ReplaceStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index d17450eb04..50ce28148d 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -32,6 +32,11 @@ use SqlParser\Statement; * | INTO var_name [, var_name]] * [FOR UPDATE | LOCK IN SHARE MODE]] * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class SelectStatement extends Statement { diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php index cdeab0367f..8dcc6f090c 100644 --- a/libraries/sql-parser/src/Statements/UpdateStatement.php +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -19,6 +19,11 @@ use SqlParser\Statement; * SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ... * [WHERE where_condition] * + * @category Statements + * @package SqlParser + * @subpackage Statements + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class UpdateStatement extends Statement { diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index 7563d77d02..5a378ca0e4 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -5,6 +5,11 @@ namespace SqlParser; /** * A structure representing a lexeme that explicitly indicates its * categorization for the purpose of parsing. + * + * @category Tokens + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class Token { @@ -179,10 +184,9 @@ class Token /** * Constructor. * - * @param string $token - * @param int $type - * @param int $flags - * @param int $position + * @param string $token The value of the token. + * @param int $type The type of the token. + * @param int $flags The flags of the token. */ public function __construct($token, $type = 0, $flags = 0) { @@ -202,47 +206,50 @@ class Token public function extract() { switch ($this->type) { - case Token::TYPE_KEYWORD: - if ($this->flags & Token::FLAG_KEYWORD_RESERVED) { - return strtoupper($this->token); - } - return $this->token; - case Token::TYPE_WHITESPACE: - return ' '; - case Token::TYPE_BOOL: - return strtoupper($this->token) === 'TRUE'; - case Token::TYPE_NUMBER: - $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 - if ($this->flags & Token::FLAG_NUMBER_HEX) { - if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { - $ret = str_replace('-', '', $this->token); - sscanf($ret, "%x", $ret); - $ret = -$ret; - } else { - sscanf($ret, "%x", $ret); - } - } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) || - ($this->flags & Token::FLAG_NUMBER_FLOAT)) { - sscanf($ret, "%f", $ret); + case Token::TYPE_KEYWORD: + if ($this->flags & Token::FLAG_KEYWORD_RESERVED) { + return strtoupper($this->token); + } + return $this->token; + case Token::TYPE_WHITESPACE: + return ' '; + case Token::TYPE_BOOL: + return strtoupper($this->token) === 'TRUE'; + case Token::TYPE_NUMBER: + $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 + if ($this->flags & Token::FLAG_NUMBER_HEX) { + if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { + $ret = str_replace('-', '', $this->token); + sscanf($ret, "%x", $ret); + $ret = -$ret; } else { - sscanf($ret, "%d", $ret); + sscanf($ret, "%x", $ret); } - return $ret; - case Token::TYPE_STRING: - $quote = $this->token[0]; - $str = str_replace($quote . $quote, $quote, $this->token); - return mb_substr($str, 1, -1); // trims quotes - case Token::TYPE_SYMBOL: - $str = $this->token; - if ((isset($str[0])) && ($str[0] === '@')) { - $str = mb_substr($str, 1); - } - if ((isset($str[0])) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\''))) { - $quote = $str[0]; - $str = str_replace($quote . $quote, $quote, $str); - $str = mb_substr($str, 1, -1); - } - return $str; + } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) + || ($this->flags & Token::FLAG_NUMBER_FLOAT) + ) { + sscanf($ret, "%f", $ret); + } else { + sscanf($ret, "%d", $ret); + } + return $ret; + case Token::TYPE_STRING: + $quote = $this->token[0]; + $str = str_replace($quote . $quote, $quote, $this->token); + return mb_substr($str, 1, -1); // trims quotes + case Token::TYPE_SYMBOL: + $str = $this->token; + if ((isset($str[0])) && ($str[0] === '@')) { + $str = mb_substr($str, 1); + } + if ((isset($str[0])) && (($str[0] === '`') + || ($str[0] === '"') || ($str[0] === '\'')) + ) { + $quote = $str[0]; + $str = str_replace($quote . $quote, $quote, $str); + $str = mb_substr($str, 1, -1); + } + return $str; } return $this->token; } diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index 405f4a121b..533fb0b3ab 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -2,6 +2,14 @@ namespace SqlParser; +/** + * A structure representing a list of tokens. + * + * @category Tokens + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class TokensList implements \ArrayAccess { @@ -29,7 +37,9 @@ class TokensList implements \ArrayAccess /** * Adds a new token. * - * @param Token $token + * @param Token $token Token to be added in list. + * + * @return void */ public function add(Token $token) { @@ -37,7 +47,7 @@ class TokensList implements \ArrayAccess } /** - * Gets next token in list. + * Gets the next token. * * @return Token */ @@ -50,9 +60,9 @@ class TokensList implements \ArrayAccess } /** - * Gets next token of a specified type. + * Gets the next token. * - * @param int $type + * @param int $type The type. * * @return Token */ @@ -67,26 +77,33 @@ class TokensList implements \ArrayAccess } /** - * Gets next token of a specified type. + * Gets the next token. * - * @param int $type - * @param string $value + * @param int $type The type of the token. + * @param string $value The value of the token. * * @return Token */ public function getNextOfTypeAndValue($type, $value) { for (; $this->idx < $this->count; ++$this->idx) { - if (($this->tokens[$this->idx]->type === $type) && - ($this->tokens[$this->idx]->value === $value)) { + if (($this->tokens[$this->idx]->type === $type) + && ($this->tokens[$this->idx]->value === $value) + ) { return $this->tokens[$this->idx++]; } } return null; } - // ArrayAccess methods. - + /** + * Sets an value inside the container. + * + * @param int $offset The offset to be set. + * @param Token $value The token to be saved. + * + * @return void + */ public function offsetSet($offset, $value) { if ($offset === null) { @@ -96,16 +113,37 @@ class TokensList implements \ArrayAccess } } + /** + * Gets a value from the container. + * + * @param int $offset The offset to be returned. + * + * @return Token + */ public function offsetGet($offset) { return $offset < $this->count ? $this->tokens[$offset] : null; } + /** + * Checks if an offset was previously set. + * + * @param int $offset The offset to be checked. + * + * @return bool + */ public function offsetExists($offset) { return $offset < $this->count; } + /** + * Unsets the value of an offset. + * + * @param int $offset The offset to be unset. + * + * @return void + */ public function offsetUnset($offset) { unset($this->tokens[$offset]); diff --git a/libraries/sql-parser/src/UtfString.php b/libraries/sql-parser/src/UtfString.php index 0f68cfe0cc..e98ee3f05f 100644 --- a/libraries/sql-parser/src/UtfString.php +++ b/libraries/sql-parser/src/UtfString.php @@ -6,6 +6,11 @@ namespace SqlParser; * Implements array-like access for UTF-8 strings. * * In this library, this class should be used to parse UTF-8 queries. + * + * @category Misc + * @package SqlParser + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ class UtfString implements \ArrayAccess { @@ -15,7 +20,7 @@ class UtfString implements \ArrayAccess * * @var string */ - private $str = ''; + public $str = ''; /** * The index of current byte. @@ -24,7 +29,7 @@ class UtfString implements \ArrayAccess * * @var int */ - private $byteIdx = 0; + public $byteIdx = 0; /** * The index of current character. @@ -34,26 +39,26 @@ class UtfString implements \ArrayAccess * * @var int */ - private $charIdx = 0; + public $charIdx = 0; /** * The length of the string (in bytes). * * @var int */ - private $buffLen = 0; + public $byteLen = 0; /** * The length of the string (in characters). * * @var int */ - private $charLen = 0; + public $charLen = 0; /** * Constructor. * - * @param string $str + * @param string $str The string. */ public function __construct($str) { @@ -70,19 +75,19 @@ class UtfString implements \ArrayAccess /** * Checks if the given offset exists. * - * @param int $offset + * @param int $offset The offset to be checked. * * @return bool */ public function offsetExists($offset) { - return $offset < $charLen; + return $offset < $this->charLen; } /** * Gets the character at given offset. * - * @param int $offset + * @param int $offset The offset to be returned. * * @return string */ @@ -123,8 +128,10 @@ class UtfString implements \ArrayAccess /** * Sets the value of a character. * - * @param int $offset - * @param string $value + * @param int $offset The offset to be set. + * @param string $value The value to be set. + * + * @return void */ public function offsetSet($offset, $value) { @@ -134,7 +141,9 @@ class UtfString implements \ArrayAccess /** * Unsets an index. * - * @param int $offset + * @param int $offset The value to be unset. + * + * @return void */ public function offsetUnset($offset) { @@ -148,9 +157,9 @@ class UtfString implements \ArrayAccess * However, this implemenation supports UTF-8 characters containing up to 6 * bytes. * - * @see http://tools.ietf.org/html/rfc3629 + * @param string $byte The byte to be analyzed. * - * @param string $byte + * @see http://tools.ietf.org/html/rfc3629 * * @return int */ @@ -197,8 +206,10 @@ class UtfString implements \ArrayAccess /** * Gets the values of the indexes. * - * @param int &$byte - * @param int &$char + * @param int &$byte Reference to the byte index. + * @param int &$char Reference to the character index. + * + * @return void */ public function getIndexes(&$byte, &$char) { @@ -209,8 +220,10 @@ class UtfString implements \ArrayAccess /** * Sets the values of the indexes. * - * @param int $byte - * @param int $char + * @param int $byte The byte index. + * @param int $char The character index. + * + * @return void */ public function setIndexes($byte = 0, $char = 0) { diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 473bf9bf99..a29951e6e8 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -4,6 +4,15 @@ namespace SqlParser\Utils; use SqlParser\Statements\SelectStatement; +/** + * Miscellaneous utilities. + * + * @category Misc + * @package SqlParser + * @subpackage Utils + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Misc { @@ -11,7 +20,7 @@ class Misc * Gets a list of all aliases and their original names. * * @param SelectStatement $tree The tree that was generated after parsing. - * @param string $db + * @param string $db The name of the database. * * @return array */ @@ -21,7 +30,9 @@ class Misc $tables = array(); - if ((!empty($tree->join->expr->table)) && (!empty($tree->join->expr->alias))) { + if ((!empty($tree->join->expr->table)) + && (!empty($tree->join->expr->alias)) + ) { $thisDb = empty($tree->join->expr->database) ? $db : $tree->join->expr->database; @@ -81,7 +92,8 @@ class Misc } else { $thisTable = isset($tables[$thisDb][$expr->table]) ? $tables[$thisDb][$expr->table] : $expr->table; - $retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias; + $retval[$thisDb]['tables'] + [$thisTable]['columns'][$expr->column] = $expr->alias; } } diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 36511ca529..f234d97b55 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -8,6 +8,15 @@ use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; use SqlParser\Statements\CreateStatement; +/** + * Routine utilities. + * + * @category Routines + * @package SqlParser + * @subpackage Utils + * @author Dan Ungureanu + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ class Routine { From ffbbf21ef674002eb81c2321a7f7c32d1ef7233a Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Jun 2015 15:24:50 +0300 Subject: [PATCH 17/57] Removed dead code. Signed-off-by: Dan Ungureanu --- libraries/Table.class.php | 49 --------------------------------- test/classes/PMA_Table_test.php | 31 --------------------- 2 files changed, 80 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d1ec487863..f6eff4c8bb 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -247,55 +247,6 @@ class PMA_Table return $result ? true : false; } - /** - * Returns the analysis of 'SHOW CREATE TABLE' query for the table. - * In case of a view, the values are taken from the information_schema. - * - * @param string $db database - * @param string $table table - * - * @return array analysis of 'SHOW CREATE TABLE' query for the table - */ - static public function analyzeStructure($db = null, $table = null) - { - if (empty($db) || empty($table)) { - return false; - } - - $analyzed_sql = array(); - if (self::isView($db, $table)) { - // For a view, 'SHOW CREATE TABLE' returns the definition, - // but the structure of the view. So, we try to mock - // the result of analyzing 'SHOW CREATE TABLE' query. - $analyzed_sql[0] = array(); - $analyzed_sql[0]['create_table_fields'] = array(); - - $results = $GLOBALS['dbi']->fetchResult( - "SELECT COLUMN_NAME, DATA_TYPE - FROM information_schema.COLUMNS - WHERE TABLE_SCHEMA = '" . PMA_Util::sqlAddSlashes($db) . "' - AND TABLE_NAME = '" . PMA_Util::sqlAddSlashes($table) . "'" - ); - - foreach ($results as $result) { - $analyzed_sql[0]['create_table_fields'][$result['COLUMN_NAME']] - = array( - 'type' => /*overload*/mb_strtoupper($result['DATA_TYPE']) - ); - } - } else { - $show_create_table = $GLOBALS['dbi']->fetchValue( - 'SHOW CREATE TABLE ' - . PMA_Util::backquote($db) - . '.' . PMA_Util::backquote($table), - 0, - 1 - ); - $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); - } - return $analyzed_sql; - } - /** * sets given $value for given $param * diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php index 4005ba508e..1bd637638c 100644 --- a/test/classes/PMA_Table_test.php +++ b/test/classes/PMA_Table_test.php @@ -607,37 +607,6 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase ); } - /** - * Test for analyzeStructure - * - * @return void - */ - public function testAnalyzeStructure() - { - $this->assertEquals( - false, - PMA_Table::analyzeStructure() - ); - - //validate that it is the same as DBI fetchResult - $show_create_table = PMA_Table::analyzeStructure('PMA', 'PMA_BookMark'); - $this->assertEquals( - array('type'=>'DATA_TYPE'), - $show_create_table[0]['create_table_fields']['COLUMN_NAME'] - ); - //not a view - $show_create_table = PMA_Table::analyzeStructure('PMA', 'PMA_BookMark_2'); - $this->assertEquals( - array('type'=>'INT', 'timestamp_not_null'=>false), - $show_create_table[0]['create_table_fields']['id'] - ); - $this->assertEquals( - array('type'=>'TEXT', 'timestamp_not_null'=>false), - $show_create_table[0]['create_table_fields']['username'] - ); - - } - /** * Test for isMerge * From 83c6f77716d423fc1a22a6c0ca58886d131b3c35 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Jun 2015 22:09:11 +0300 Subject: [PATCH 18/57] Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/common.inc.php | 2 +- libraries/sql-parser/src/Context.php | 279 +++--------------- .../src/Contexts/ContextMySql50000.php | 178 +++++++++++ .../src/Contexts/ContextMySql50100.php | 192 ++++++++++++ .../src/Contexts/ContextMySql50500.php | 195 ++++++++++++ .../src/Contexts/ContextMySql50600.php | 206 +++++++++++++ .../src/Contexts/ContextMySql50700.php | 211 +++++++++++++ .../src/Fragments/DataTypeFragment.php | 4 +- .../src/Fragments/FieldDefFragment.php | 35 ++- .../src/Fragments/OptionsFragment.php | 40 ++- libraries/sql-parser/src/Token.php | 15 +- libraries/sql-parser/src/Utils/Misc.php | 12 +- libraries/sql-parser/src/Utils/Routine.php | 2 + libraries/sql-parser/src/Utils/Table.php | 69 +++++ 14 files changed, 1145 insertions(+), 295 deletions(-) create mode 100644 libraries/sql-parser/src/Contexts/ContextMySql50000.php create mode 100644 libraries/sql-parser/src/Contexts/ContextMySql50100.php create mode 100644 libraries/sql-parser/src/Contexts/ContextMySql50500.php create mode 100644 libraries/sql-parser/src/Contexts/ContextMySql50600.php create mode 100644 libraries/sql-parser/src/Contexts/ContextMySql50700.php create mode 100644 libraries/sql-parser/src/Utils/Table.php diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 9632a0709b..c71ada952f 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1059,7 +1059,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { include_once './libraries/sqlparser.lib.php'; include_once './libraries/sql-parser/autoload.php'; try { - SqlParser\Context::load((PMA_DRIZZLE ? 'Drizzle' : 'MySQL') . PMA_MYSQL_INT_VERSION); + SqlParser\Context::load((PMA_DRIZZLE ? 'Drizzle' : 'MySql') . PMA_MYSQL_INT_VERSION); } catch (\Exception $e) { // If this fails, it will continue using the default context. } diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index e46a0478cc..eed10d3687 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -3,7 +3,7 @@ namespace SqlParser; /** - * Default MySQL context (based on MySQL 5.7). + * Default MySQL context. * * @category Contexts * @package SqlParser @@ -36,14 +36,22 @@ abstract class Context * * @var string */ - public static $defaultContext = '\\SqlParser\\Contexts\\Context_MySQL50700'; + public static $defaultContext = '\\SqlParser\\Contexts\\ContextMySql50700'; /** * The name of the loaded context. * * @var string */ - public static $loadedContext = '\\SqlParser\\Contexts\\Context_MySQL50700'; + public static $loadedContext = '\\SqlParser\\Contexts\\ContextMySql50700'; + + /** + * The prefix concatenated to the context name when an incomplete class name + * is specified. + * + * @var string + */ + public static $contextPrefix = '\\SqlParser\\Contexts\\Context'; // ------------------------------------------------------------------------- // Keywords. @@ -64,225 +72,7 @@ abstract class Context * * @var array */ - public static $KEYWORDS = array( - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, - 'ON' => 1, 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, - 'DIV' => 1, 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, - 'MOD' => 1, 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, - 'SSL' => 1, 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, - 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, - 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, - 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, - 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, - 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, - 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, - 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, - 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, - 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, - 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, - 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, - 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, - 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, - 'WHILE' => 1, 'WRITE' => 1, - 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, - 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, - 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, - 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, - 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, - 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, - 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'STORED' => 1, - 'UNIQUE' => 1, 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, - 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, - 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, - 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, - 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, - 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, - 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, - 'VIRTUAL' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, - 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, - 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, - 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, - 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, - 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, - 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, - 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, - 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, - 'GENERATED' => 1, 'LOCALTIME' => 1, 'MEDIUMINT' => 1, - 'MIDDLEINT' => 1, 'PARTITION' => 1, 'PRECISION' => 1, - 'PROCEDURE' => 1, 'SENSITIVE' => 1, 'SEPARATOR' => 1, - 'VARBINARY' => 1, - 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, - 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, - 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, - 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, - 'YEAR_MONTH' => 1, - 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, - 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, - 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, - 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, - 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, - 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, - 'IO_AFTER_GTIDS' => 1, 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, - 'DAY_MICROSECOND' => 1, 'IO_BEFORE_GTIDS' => 1, 'OPTIMIZER_COSTS' => 1, - 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, - 'CURRENT_TIMESTAMP' => 1, - 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, - 'SECOND_MICROSECOND' => 1, - 'SQL_CALC_FOUND_ROWS' => 1, - 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, - - 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, - 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, - 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XID' => 2, - 'XML' => 2, - 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, - 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, - 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, - 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, - 'ONLY' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, - 'SLOW' => 2, 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, - 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, - 'X509' => 2, 'YEAR' => 2, - 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, - 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, - 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, - 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, - 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'NEVER' => 2, - 'OWNER' => 2, 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, - 'QUICK' => 2, 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, - 'SLAVE' => 2, 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, - 'UNTIL' => 2, 'VALUE' => 2, - 'ACTION' => 2, 'ALWAYS' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, - 'CLIENT' => 2, 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, - 'ESCAPE' => 2, 'EVENTS' => 2, 'EXPIRE' => 2, 'EXPORT' => 2, 'FAULTS' => 2, - 'FIELDS' => 2, 'FILTER' => 2, 'FORMAT' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, - 'IMPORT' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, 'MEDIUM' => 2, - 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'NUMBER' => 2, 'OFFSET' => 2, - 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, - 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, - 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, - 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, - 'ACCOUNT' => 2, 'AGAINST' => 2, 'ANALYSE' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, - 'CHANNEL' => 2, 'CHARSET' => 2, 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, - 'CONTEXT' => 2, 'CURRENT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, 'DISCARD' => 2, - 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, 'FOLLOWS' => 2, 'GENERAL' => 2, - 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, - 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, - 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, - 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'REVERSE' => 2, 'ROUTINE' => 2, - 'SESSION' => 2, 'STACKED' => 2, 'STORAGE' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, - 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WITHOUT' => 2, - 'WRAPPER' => 2, - 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, - 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXCHANGE' => 2, - 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, 'LANGUAGE' => 2, - 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, - 'NVARCHAR' => 2, 'PASSWORD' => 2, 'PRECEDES' => 2, 'PRESERVE' => 2, - 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, - 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, - 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, - 'WARNINGS' => 2, - 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, - 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, - 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'READ_ONLY' => 2, - 'REDUNDANT' => 2, 'ROW_COUNT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, - 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, - 'UNINSTALL' => 2, 'VARIABLES' => 2, - 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, - 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, - 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, - 'PARTITIONS' => 2, 'PLUGIN_DIR' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, - 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, - 'TABLE_NAME' => 2, 'VALIDATION' => 2, - 'COLUMN_NAME' => 2, 'COMPRESSION' => 2, 'CURSOR_NAME' => 2, 'DIAGNOSTICS' => 2, - 'EXTENT_SIZE' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, - 'MICROSECOND' => 2, 'MYSQL_ERRNO' => 2, 'NONBLOCKING' => 2, 'PROCESSLIST' => 2, - 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, - 'UNCOMMITTED' => 2, - 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'DEFAULT_AUTH' => 2, - 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, 'MASTER_DELAY' => 2, - 'MESSAGE_TEXT' => 2, 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, - 'PARTITIONING' => 2, 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, - 'SQL_NO_CACHE' => 2, 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, - 'SQL_TSI_YEAR' => 2, 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, - 'COLUMN_FORMAT' => 2, 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, - 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, - 'TIMESTAMPDIFF' => 2, 'WEIGHT_STRING' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, - 'MASTER_LOG_POS' => 2, 'MASTER_SSL_CRL' => 2, 'MASTER_SSL_KEY' => 2, - 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, - 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, - 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, - 'FILE_BLOCK_SIZE' => 2, 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, - 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, 'PARSE_GCOL_EXPR' => 2, - 'REPLICATE_DO_DB' => 2, 'SQL_AFTER_GTIDS' => 2, 'SQL_TSI_QUARTER' => 2, - 'SUBCLASS_ORIGIN' => 2, - 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'SQL_BEFORE_GTIDS' => 2, - 'STATS_PERSISTENT' => 2, 'UNDO_BUFFER_SIZE' => 2, - 'CONSTRAINT_SCHEMA' => 2, 'GROUP_REPLICATION' => 2, 'IGNORE_SERVER_IDS' => 2, - 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'RETURNED_SQLSTATE' => 2, - 'SQL_BUFFER_RESULT' => 2, 'STATS_AUTO_RECALC' => 2, - 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, 'MASTER_RETRY_COUNT' => 2, - 'MASTER_SSL_CRLPATH' => 2, 'MAX_STATEMENT_TIME' => 2, 'REPLICATE_DO_TABLE' => 2, - 'SQL_AFTER_MTS_GAPS' => 2, 'STATS_SAMPLE_PAGES' => 2, - 'REPLICATE_IGNORE_DB' => 2, - 'MASTER_AUTO_POSITION' => 2, 'MASTER_CONNECT_RETRY' => 2, - 'MAX_QUERIES_PER_HOUR' => 2, 'MAX_UPDATES_PER_HOUR' => 2, - 'MAX_USER_CONNECTIONS' => 2, 'REPLICATE_REWRITE_DB' => 2, - 'REPLICATE_IGNORE_TABLE' => 2, - 'MASTER_HEARTBEAT_PERIOD' => 2, 'REPLICATE_WILD_DO_TABLE' => 2, - 'MAX_CONNECTIONS_PER_HOUR' => 2, - 'REPLICATE_WILD_IGNORE_TABLE' => 2, - - 'NOT NULL' => 4, - 'INDEX KEY' => 4, - 'UNIQUE KEY' => 4, - 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, - 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, - 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, - 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, - 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, - 'DEFAULT CHARACTER SET' => 4, - ); - - // ------------------------------------------------------------------------- - // Keys and Data Types. - - /** - * Types of keys. - * - * @var array - */ - public static $KEY_TYPES = array( - 'FOREIGN KEY' => 1, 'FULLTEXT INDEX' => 1, 'FULLTEXT KEY' => 1, - 'INDEX KEY' => 1, 'INDEX' => 1, 'KEY' => 1, 'PRIMARY KEY' => 1, - 'SPATIAL INDEX' => 1, 'SPATIAL KEY' => 1, 'UNIQUE INDEX' => 1, - 'UNIQUE KEY' => 1, 'UNIQUE' => 1, - ); - - /** - * All data types. - * - * @var array - */ - public static $DATA_TYPES = array( - 'ARRAY' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'BINARY VARYING' => 1, - 'BLOB' => 1, 'BOOLEAN' => 1, 'CHAR' => 1, 'CHARACTER' => 1, 'DATE' => 1, - 'DATETIME' => 1, 'DECIMAL' => 1, 'DOUBLE' => 1, 'ENUM' => 1, - 'FLOAT' => 1, 'INT' => 1, 'INTEGER' => 1, 'INTERVAL' => 1, - 'LONGBLOB' => 1, 'LONGTEXT' => 1, 'MEDIUMBLOB' => 1, 'MEDIUMINT' => 1, - 'MEDIUMTEXT' => 1, 'MULTISET' => 1, 'NUMERIC' => 1, 'REAL' => 1, - 'SET' => 1, 'SMALLINT' => 1, 'TEXT' => 1, 'TIME' => 1, 'TIMESTAMP' => 1, - 'TINYBLOB' => 1, 'TINYINT' => 1, 'TINYTEXT' => 1, 'VARBINARY' => 1, - 'VARCHAR' => 1, 'XML' => 1, 'YEAR' => 1 - ); + public static $KEYWORDS = array(); // ------------------------------------------------------------------------- // Operators. @@ -474,13 +264,13 @@ abstract class Context /** * Checks if the given character is a whitespace. * - * @param string $ch String to be checked. + * @param string $str String to be checked. * * @return bool */ - public static function isWhitespace($ch) + public static function isWhitespace($str) { - return ($ch === ' ') || ($ch === "\r") || ($ch === "\n") || ($ch === "\t"); + return ($str === ' ') || ($str === "\r") || ($str === "\n") || ($str === "\t"); } // ------------------------------------------------------------------------- @@ -519,14 +309,14 @@ abstract class Context * This actually check only for `TRUE` and `FALSE` because `1` or `0` are * actually numbers and are parsed by specific methods. * - * @param string $ch String to be checked. + * @param string $str String to be checked. * * @return bool */ - public static function isBool($ch) + public static function isBool($str) { - $ch = strtoupper($ch); - return ($ch === 'TRUE') || ($ch === 'FALSE'); + $str = strtoupper($str); + return ($str === 'TRUE') || ($str === 'FALSE'); } // ------------------------------------------------------------------------- @@ -535,14 +325,14 @@ abstract class Context /** * Checks if the given character can be a part of a number. * - * @param string $ch String to be checked. + * @param string $str String to be checked. * * @return bool */ - public static function isNumber($ch) + public static function isNumber($str) { - return (($ch >= '0') && ($ch <= '9')) || ($ch === '.') - || ($ch === '-') || ($ch === '+') || ($ch === 'e') || ($ch === 'E'); + return (($str >= '0') && ($str <= '9')) || ($str === '.') + || ($str === '-') || ($str === '+') || ($str === 'e') || ($str === 'E'); } // ------------------------------------------------------------------------- @@ -552,15 +342,15 @@ abstract class Context * Checks if the given character is the beginning of a symbol. A symbol * can be either a variable or a field name. * - * @param string $ch String to be checked. + * @param string $str String to be checked. * * @return int The appropriate flag for the symbol type. */ - public static function isSymbol($ch) + public static function isSymbol($str) { - if ($ch[0] === '@') { + if ($str[0] === '@') { return Token::FLAG_SYMBOL_VARIABLE; - } elseif ($ch[0] === '`') { + } elseif ($str[0] === '`') { return Token::FLAG_SYMBOL_BACKTICK; } return null; @@ -592,13 +382,13 @@ abstract class Context /** * Checks if the given character can be a separator for two lexems. * - * @param string $ch String to be checked. + * @param string $str String to be checked. * * @return bool */ - public static function isSeparator($ch) + public static function isSeparator($str) { - return !ctype_alnum($ch) && $ch !== '_'; + return !ctype_alnum($str) && $str !== '_'; } /** @@ -618,12 +408,15 @@ abstract class Context } if ($context[0] !== '\\') { // Short context name (must be formatted into class name). - $context = '\\SqlParser\\Contexts\\Context_' . $context; + $context = self::$contextPrefix . $context; } if (!class_exists($context)) { throw new \Exception('Specified context ("' . $context . '") doesn\'t exist.'); } - static::$loadedContext = $context; - static::$KEYWORDS = $context::$KEYWORDS; + self::$loadedContext = $context; + self::$KEYWORDS = $context::$KEYWORDS; } } + +// Initializng the default context. +Context::load(); diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php new file mode 100644 index 0000000000..b81d687f0c --- /dev/null +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -0,0 +1,178 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ContextMySql50000 extends Context +{ + + public static $KEYWORDS = array( + + 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, + 'ANY' => 1, 'AVG' => 1, 'BDB' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, + 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'FAST' => 1, + 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, 'HOUR' => 1, 'LAST' => 1, + 'LOGS' => 1, 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, + 'PAGE' => 1, 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, 'TYPE' => 1, + 'USER' => 1, 'VIEW' => 1, 'WEEK' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, + 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'FIRST' => 1, 'FIXED' => 1, + 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, + 'LOCKS' => 1, 'MERGE' => 1, 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, + 'NCHAR' => 1, 'PHASE' => 1, 'POINT' => 1, 'QUERY' => 1, 'QUICK' => 1, + 'RAID0' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, + 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, + 'VALUE' => 1, + 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, + 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, + 'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, + 'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, + 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'OFFSET' => 1, + 'RELOAD' => 1, 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, + 'SERIAL' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, + 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'CHANGED' => 1, 'CHARSET' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, + 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, + 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, 'INDEXES' => 1, + 'INVOKER' => 1, 'MIGRATE' => 1, 'PARTIAL' => 1, 'POLYGON' => 1, 'PREPARE' => 1, + 'PROFILE' => 1, 'QUARTER' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, + 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'STRIPED' => 1, 'SUBJECT' => 1, + 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'CONTAINS' => 1, 'DUMPFILE' => 1, + 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, + 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, + 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PROFILES' => 1, + 'ROLLBACK' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, + 'SWITCHES' => 1, 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, + 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, + 'ISOLATION' => 1, 'PACK_KEYS' => 1, 'RAID_TYPE' => 1, 'REDUNDANT' => 1, + 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, + 'UNDEFINED' => 1, 'VARIABLES' => 1, + 'BERKELEYDB' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, + 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, + 'PRIVILEGES' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, + 'TABLESPACE' => 1, + 'FRAC_SECOND' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, + 'MICROSECOND' => 1, 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, 'REPLICATION' => 1, + 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'DES_KEY_FILE' => 1, 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, + 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, + 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, + 'TIMESTAMPADD' => 1, + 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1, + 'SQL_TSI_MONTH' => 1, 'TIMESTAMPDIFF' => 1, + 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'MASTER_LOG_POS' => 1, + 'MASTER_SSL_KEY' => 1, 'RAID_CHUNKSIZE' => 1, 'RELAY_LOG_FILE' => 1, + 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'USER_RESOURCES' => 1, + 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, + 'MASTER_SSL_CERT' => 1, 'MULTILINESTRING' => 1, 'SQL_TSI_QUARTER' => 1, + 'MASTER_SERVER_ID' => 1, + 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1, + 'GEOMETRYCOLLECTION' => 1, + 'SQL_TSI_FRAC_SECOND' => 1, + 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, + 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, + 'MAX_CONNECTIONS_PER_HOUR' => 1, + + 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, + 'TO' => 3, + 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, + 'FOR' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, + 'USE' => 3, 'XOR' => 3, + 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, + 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, + 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, + 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, + 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, + 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, + 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, + 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'READS' => 3, 'RIGHT' => 3, 'RLIKE' => 3, + 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, + 'WHILE' => 3, 'WRITE' => 3, + 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, + 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'OPTION' => 3, + 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, 'REVOKE' => 3, + 'SCHEMA' => 3, 'SELECT' => 3, 'SONAME' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, + 'VALUES' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, + 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, + 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, + 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, + 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, + 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MODIFIES' => 3, + 'OPTIMIZE' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3, + 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'UTC_DATE' => 3, + 'UTC_TIME' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, + 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3, + 'OPTIONALLY' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3, + 'YEAR_MONTH' => 3, + 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, + 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, + 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, + 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, + 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, + 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'DAY_MICROSECOND' => 3, + 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, + 'CURRENT_TIMESTAMP' => 3, + 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, + 'SQL_CALC_FOUND_ROWS' => 3, + + 'NOT NULL' => 5, + 'ON UPDATE' => 5, + 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, + 'DATA DIRECTORY' => 5, + 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, + 'DEFAULT CHARACTER SET' => 5, + + 'XML' => 9, + 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ARRAY' => 9, + 'BOOLEAN' => 9, + 'DATETIME' => 9, 'MULTISET' => 9, + 'TIMESTAMP' => 9, + + 'INT' => 11, 'SET' => 11, + 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'FLOAT' => 11, + 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, + 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, + 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, + 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, + 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, + + 'BINARY VARYING' => 13, + + 'KEY' => 19, + 'INDEX' => 19, + 'UNIQUE' => 19, + + 'INDEX KEY' => 21, + 'UNIQUE KEY' => 21, + 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, + 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, + 'SPATIAL INDEX' => 21, + 'FULLTEXT INDEX' => 21, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php new file mode 100644 index 0000000000..260925e21f --- /dev/null +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -0,0 +1,192 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ContextMySql50100 extends Context +{ + + public static $KEYWORDS = array( + + 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, + 'ANY' => 1, 'AVG' => 1, 'BDB' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, + 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, + 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'GOTO' => 1, 'HASH' => 1, + 'HELP' => 1, 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, + 'LOGS' => 1, 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, + 'PAGE' => 1, 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, + 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WEEK' => 1, + 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, + 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'EVENT' => 1, 'EVERY' => 1, + 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, + 'LABEL' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, + 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, + 'PHASE' => 1, 'POINT' => 1, 'QUERY' => 1, 'QUICK' => 1, 'RAID0' => 1, + 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, + 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1, + 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, + 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, + 'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, + 'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, + 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'OFFSET' => 1, + 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, + 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, + 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, + 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'CHARSET' => 1, 'COLUMNS' => 1, + 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, + 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, + 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, + 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'POLYGON' => 1, + 'PREPARE' => 1, 'PROFILE' => 1, 'QUARTER' => 1, 'REBUILD' => 1, 'RECOVER' => 1, + 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, + 'STRIPED' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, + 'UPGRADE' => 1, 'USE_FRM' => 1, 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, + 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, + 'GEOMETRY' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, 'MAXVALUE' => 1, + 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, + 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PRESERVE' => 1, + 'PROFILES' => 1, 'REDOFILE' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, + 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, + 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, + 'RAID_TYPE' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, + 'SCHEDULER' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, + 'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1, + 'BERKELEYDB' => 1, 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, + 'CONNECTION' => 1, 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, + 'IDENTIFIED' => 1, 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, + 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PRIVILEGES' => 1, 'REORGANISE' => 1, + 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, + 'TABLESPACE' => 1, + 'EXTENT_SIZE' => 1, 'FRAC_SECOND' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, + 'MASTER_USER' => 1, 'MICROSECOND' => 1, 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, + 'REPLICATION' => 1, 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'CONTRIBUTORS' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, + 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, 'PARTITIONING' => 1, + 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, + 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, + 'SUBPARTITION' => 1, 'TIMESTAMPADD' => 1, + 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'PAGE_CHECKSUM' => 1, + 'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, + 'TIMESTAMPDIFF' => 1, 'TRANSACTIONAL' => 1, + 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, + 'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RAID_CHUNKSIZE' => 1, + 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, + 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, + 'AUTOEXTEND_SIZE' => 1, 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, + 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, 'MULTILINESTRING' => 1, + 'SQL_TSI_QUARTER' => 1, + 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'UNDO_BUFFER_SIZE' => 1, + 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1, + 'GEOMETRYCOLLECTION' => 1, + 'SQL_TSI_FRAC_SECOND' => 1, + 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, + 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, + 'MAX_CONNECTIONS_PER_HOUR' => 1, + + 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, + 'TO' => 3, + 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, + 'FOR' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, + 'USE' => 3, 'XOR' => 3, + 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, + 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, + 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, + 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, + 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, + 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, + 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, + 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, + 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, + 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, + 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, + 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, + 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, + 'VALUES' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, + 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, + 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, + 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, + 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, + 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MODIFIES' => 3, + 'OPTIMIZE' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3, + 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'UTC_DATE' => 3, + 'UTC_TIME' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, + 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, + 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, + 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, + 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, + 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, + 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, + 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, + 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, + 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'DAY_MICROSECOND' => 3, + 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, + 'CURRENT_TIMESTAMP' => 3, + 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, + 'SQL_CALC_FOUND_ROWS' => 3, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, + + 'NOT NULL' => 5, + 'ON UPDATE' => 5, + 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, + 'DATA DIRECTORY' => 5, + 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, + 'DEFAULT CHARACTER SET' => 5, + + 'XML' => 9, + 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ARRAY' => 9, + 'BOOLEAN' => 9, + 'DATETIME' => 9, 'MULTISET' => 9, + 'TIMESTAMP' => 9, + + 'INT' => 11, 'SET' => 11, + 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'FLOAT' => 11, + 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, + 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, + 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, + 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, + 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, + + 'BINARY VARYING' => 13, + + 'KEY' => 19, + 'INDEX' => 19, + 'UNIQUE' => 19, + + 'INDEX KEY' => 21, + 'UNIQUE KEY' => 21, + 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, + 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, + 'SPATIAL INDEX' => 21, + 'FULLTEXT INDEX' => 21, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php new file mode 100644 index 0000000000..e70b931994 --- /dev/null +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -0,0 +1,195 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ContextMySql50500 extends Context +{ + + public static $KEYWORDS = array( + + 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, + 'ANY' => 1, 'AVG' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, 'END' => 1, + 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, + 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, + 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, + 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1, + 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1, + 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WEEK' => 1, + 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, + 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, + 'EVERY' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, + 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, + 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, + 'PHASE' => 1, 'POINT' => 1, 'PROXY' => 1, 'QUERY' => 1, 'QUICK' => 1, + 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, + 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, + 'VALUE' => 1, + 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, + 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, + 'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, + 'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, + 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'OFFSET' => 1, + 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, + 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, + 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, + 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'CHARSET' => 1, 'COLUMNS' => 1, + 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, + 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'GENERAL' => 1, + 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, + 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, + 'POLYGON' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'QUARTER' => 1, 'REBUILD' => 1, + 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, + 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, + 'UPGRADE' => 1, 'USE_FRM' => 1, 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, + 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, + 'GEOMETRY' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, + 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, + 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, + 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, + 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, + 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, + 'READ_ONLY' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, + 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, + 'VARIABLES' => 1, + 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, + 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, + 'PARTITIONS' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, 'REPEATABLE' => 1, + 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, 'TABLE_NAME' => 1, + 'COLUMN_NAME' => 1, 'CURSOR_NAME' => 1, 'EXTENT_SIZE' => 1, 'FRAC_SECOND' => 1, + 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MICROSECOND' => 1, + 'MYSQL_ERRNO' => 1, 'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, + 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'CONTRIBUTORS' => 1, + 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, 'MESSAGE_TEXT' => 1, + 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, 'PARTITIONING' => 1, + 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, + 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, + 'SUBPARTITION' => 1, 'TIMESTAMPADD' => 1, + 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1, + 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, 'TIMESTAMPDIFF' => 1, + 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, + 'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RELAY_LOG_FILE' => 1, + 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'TABLE_CHECKSUM' => 1, + 'USER_RESOURCES' => 1, + 'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1, + 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, + 'MULTILINESTRING' => 1, 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1, + 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'UNDO_BUFFER_SIZE' => 1, + 'CONSTRAINT_SCHEMA' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1, + 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1, + 'CONSTRAINT_CATALOG' => 1, 'GEOMETRYCOLLECTION' => 1, + 'SQL_TSI_FRAC_SECOND' => 1, + 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, + 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, + 'MASTER_HEARTBEAT_PERIOD' => 1, + 'MAX_CONNECTIONS_PER_HOUR' => 1, + + 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, + 'TO' => 3, + 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, + 'FOR' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, + 'USE' => 3, 'XOR' => 3, + 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, + 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, + 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, + 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, + 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, + 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, + 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, + 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, + 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, + 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, + 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, + 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, + 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'SIGNAL' => 3, 'UNLOCK' => 3, + 'UPDATE' => 3, 'VALUES' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, + 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, + 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, + 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, + 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, + 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, + 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, + 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, + 'UNSIGNED' => 3, 'UTC_DATE' => 3, 'UTC_TIME' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, + 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, + 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, + 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, + 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, + 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, + 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, + 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, + 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, + 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'DAY_MICROSECOND' => 3, + 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, + 'CURRENT_TIMESTAMP' => 3, + 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, + 'SQL_CALC_FOUND_ROWS' => 3, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, + + 'NOT NULL' => 5, + 'ON UPDATE' => 5, + 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, + 'DATA DIRECTORY' => 5, + 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, + 'DEFAULT CHARACTER SET' => 5, + + 'XML' => 9, + 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ARRAY' => 9, + 'BOOLEAN' => 9, + 'DATETIME' => 9, 'MULTISET' => 9, + 'TIMESTAMP' => 9, + + 'INT' => 11, 'SET' => 11, + 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'FLOAT' => 11, + 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, + 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, + 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, + 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, + 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, + + 'BINARY VARYING' => 13, + + 'KEY' => 19, + 'INDEX' => 19, + 'UNIQUE' => 19, + + 'INDEX KEY' => 21, + 'UNIQUE KEY' => 21, + 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, + 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, + 'SPATIAL INDEX' => 21, + 'FULLTEXT INDEX' => 21, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php new file mode 100644 index 0000000000..819ec1c53f --- /dev/null +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -0,0 +1,206 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ContextMySql50600 extends Context +{ + + public static $KEYWORDS = array( + + 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, + 'ANY' => 1, 'AVG' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, 'END' => 1, + 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, + 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, + 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, + 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, + 'PAGE' => 1, 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, + 'STOP' => 1, 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, + 'WEEK' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, + 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, + 'EVERY' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, + 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, + 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, + 'PHASE' => 1, 'POINT' => 1, 'PROXY' => 1, 'QUERY' => 1, 'QUICK' => 1, + 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, + 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, + 'VALUE' => 1, + 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, + 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, + 'EVENTS' => 1, 'EXPIRE' => 1, 'EXPORT' => 1, 'FAULTS' => 1, 'FIELDS' => 1, + 'FORMAT' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'ISSUER' => 1, + 'LEAVES' => 1, 'MASTER' => 1, 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, + 'MODIFY' => 1, 'NUMBER' => 1, 'OFFSET' => 1, 'PARSER' => 1, 'PLUGIN' => 1, + 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, + 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, + 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, + 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'ANALYSE' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'CHARSET' => 1, + 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'CURRENT' => 1, + 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, + 'EXECUTE' => 1, 'GENERAL' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1, + 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1, + 'PARTIAL' => 1, 'PLUGINS' => 1, 'POLYGON' => 1, 'PREPARE' => 1, 'PROFILE' => 1, + 'QUARTER' => 1, 'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, + 'REVERSE' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, + 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, + 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, + 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXCHANGE' => 1, 'EXTENDED' => 1, + 'FUNCTION' => 1, 'GEOMETRY' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, + 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, + 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, + 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, + 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, + 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, + 'REDUNDANT' => 1, 'ROW_COUNT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, + 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, + 'VARIABLES' => 1, + 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, + 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, + 'PARTITIONS' => 1, 'PLUGIN_DIR' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, + 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, + 'TABLE_NAME' => 1, + 'COLUMN_NAME' => 1, 'CURSOR_NAME' => 1, 'DIAGNOSTICS' => 1, 'EXTENT_SIZE' => 1, + 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MICROSECOND' => 1, + 'MYSQL_ERRNO' => 1, 'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, + 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'CONTRIBUTORS' => 1, + 'DEFAULT_AUTH' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, + 'MASTER_DELAY' => 1, 'MESSAGE_TEXT' => 1, 'MULTIPOLYGON' => 1, + 'OLD_PASSWORD' => 1, 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, + 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, + 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, + 'TIMESTAMPADD' => 1, + 'COLUMN_FORMAT' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, + 'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, + 'TIMESTAMPDIFF' => 1, 'WEIGHT_STRING' => 1, + 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, + 'MASTER_LOG_POS' => 1, 'MASTER_SSL_CRL' => 1, 'MASTER_SSL_KEY' => 1, + 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, + 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, + 'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1, + 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, + 'MULTILINESTRING' => 1, 'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, + 'SUBCLASS_ORIGIN' => 1, + 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'SQL_BEFORE_GTIDS' => 1, + 'STATS_PERSISTENT' => 1, 'UNDO_BUFFER_SIZE' => 1, + 'CONSTRAINT_SCHEMA' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1, + 'MASTER_SSL_CIPHER' => 1, 'RETURNED_SQLSTATE' => 1, 'SQL_BUFFER_RESULT' => 1, + 'STATS_AUTO_RECALC' => 1, + 'CONSTRAINT_CATALOG' => 1, 'GEOMETRYCOLLECTION' => 1, 'MASTER_RETRY_COUNT' => 1, + 'MASTER_SSL_CRLPATH' => 1, 'SQL_AFTER_MTS_GAPS' => 1, 'STATS_SAMPLE_PAGES' => 1, + 'MASTER_AUTO_POSITION' => 1, 'MASTER_CONNECT_RETRY' => 1, + 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, + 'MAX_USER_CONNECTIONS' => 1, + 'MASTER_HEARTBEAT_PERIOD' => 1, + 'MAX_CONNECTIONS_PER_HOUR' => 1, + + 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, + 'TO' => 3, + 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, + 'FOR' => 3, 'GET' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, + 'SSL' => 3, 'USE' => 3, 'XOR' => 3, + 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, + 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, + 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, + 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, + 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, + 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, + 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, + 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, + 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, + 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, + 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, + 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, + 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'SIGNAL' => 3, 'UNLOCK' => 3, + 'UPDATE' => 3, 'VALUES' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, + 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, + 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, + 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, + 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, + 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, + 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, + 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, + 'UNSIGNED' => 3, 'UTC_DATE' => 3, 'UTC_TIME' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, + 'PARTITION' => 3, 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, + 'SEPARATOR' => 3, + 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, + 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, + 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, + 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, + 'MASTER_BIND' => 3, + 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, + 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, + 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, + 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, + 'IO_AFTER_GTIDS' => 3, 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'DAY_MICROSECOND' => 3, 'IO_BEFORE_GTIDS' => 3, + 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, + 'CURRENT_TIMESTAMP' => 3, + 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, + 'SQL_CALC_FOUND_ROWS' => 3, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, + + 'NOT NULL' => 5, + 'ON UPDATE' => 5, + 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, + 'DATA DIRECTORY' => 5, + 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, + 'DEFAULT CHARACTER SET' => 5, + + 'XML' => 9, + 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ARRAY' => 9, + 'BOOLEAN' => 9, + 'DATETIME' => 9, 'MULTISET' => 9, + 'TIMESTAMP' => 9, + + 'INT' => 11, 'SET' => 11, + 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'FLOAT' => 11, + 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, + 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, + 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, + 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, + 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, + + 'BINARY VARYING' => 13, + + 'KEY' => 19, + 'INDEX' => 19, + 'UNIQUE' => 19, + + 'INDEX KEY' => 21, + 'UNIQUE KEY' => 21, + 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, + 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, + 'SPATIAL INDEX' => 21, + 'FULLTEXT INDEX' => 21, + + ); +} diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php new file mode 100644 index 0000000000..db047b1c46 --- /dev/null +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -0,0 +1,211 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ContextMySql50700 extends Context +{ + + public static $KEYWORDS = array( + + 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, + 'ANY' => 1, 'AVG' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, 'END' => 1, + 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'XID' => 1, + 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, + 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, + 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, + 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, + 'PAGE' => 1, 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, + 'STOP' => 1, 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, + 'WEEK' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, + 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, + 'EVERY' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, + 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, + 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'NEVER' => 1, + 'OWNER' => 1, 'PHASE' => 1, 'POINT' => 1, 'PROXY' => 1, 'QUERY' => 1, + 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, + 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, + 'UNTIL' => 1, 'VALUE' => 1, + 'ACTION' => 1, 'ALWAYS' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, + 'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, + 'ESCAPE' => 1, 'EVENTS' => 1, 'EXPIRE' => 1, 'EXPORT' => 1, 'FAULTS' => 1, + 'FIELDS' => 1, 'FILTER' => 1, 'FORMAT' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, + 'IMPORT' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, 'MEDIUM' => 1, + 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'NUMBER' => 1, 'OFFSET' => 1, + 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, + 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, + 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, + 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'ACCOUNT' => 1, 'AGAINST' => 1, 'ANALYSE' => 1, 'CHANGED' => 1, 'CHANNEL' => 1, + 'CHARSET' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, + 'CURRENT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, + 'ENGINES' => 1, 'EXECUTE' => 1, 'FOLLOWS' => 1, 'GENERAL' => 1, 'HANDLER' => 1, + 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, + 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'POLYGON' => 1, + 'PREPARE' => 1, 'PROFILE' => 1, 'QUARTER' => 1, 'REBUILD' => 1, 'RECOVER' => 1, + 'RESTORE' => 1, 'RETURNS' => 1, 'REVERSE' => 1, 'ROUTINE' => 1, 'SESSION' => 1, + 'STACKED' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, + 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WITHOUT' => 1, 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, + 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXCHANGE' => 1, 'EXTENDED' => 1, + 'FUNCTION' => 1, 'GEOMETRY' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, + 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, + 'PASSWORD' => 1, 'PRECEDES' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, + 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, + 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, + 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, + 'REDUNDANT' => 1, 'ROW_COUNT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, + 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, + 'VARIABLES' => 1, + 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, + 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, + 'PARTITIONS' => 1, 'PLUGIN_DIR' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, + 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, + 'TABLE_NAME' => 1, 'VALIDATION' => 1, + 'COLUMN_NAME' => 1, 'COMPRESSION' => 1, 'CURSOR_NAME' => 1, 'DIAGNOSTICS' => 1, + 'EXTENT_SIZE' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, + 'MICROSECOND' => 1, 'MYSQL_ERRNO' => 1, 'NONBLOCKING' => 1, 'PROCESSLIST' => 1, + 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, + 'UNCOMMITTED' => 1, + 'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'DEFAULT_AUTH' => 1, + 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, 'MASTER_DELAY' => 1, + 'MESSAGE_TEXT' => 1, 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, + 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, + 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, + 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, 'TIMESTAMPADD' => 1, + 'COLUMN_FORMAT' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, + 'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, + 'TIMESTAMPDIFF' => 1, 'WEIGHT_STRING' => 1, + 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, + 'MASTER_LOG_POS' => 1, 'MASTER_SSL_CRL' => 1, 'MASTER_SSL_KEY' => 1, + 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, + 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, + 'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1, + 'FILE_BLOCK_SIZE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, + 'MASTER_SSL_CERT' => 1, 'MULTILINESTRING' => 1, 'PARSE_GCOL_EXPR' => 1, + 'REPLICATE_DO_DB' => 1, 'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, + 'SUBCLASS_ORIGIN' => 1, + 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'SQL_BEFORE_GTIDS' => 1, + 'STATS_PERSISTENT' => 1, 'UNDO_BUFFER_SIZE' => 1, + 'CONSTRAINT_SCHEMA' => 1, 'GROUP_REPLICATION' => 1, 'IGNORE_SERVER_IDS' => 1, + 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'RETURNED_SQLSTATE' => 1, + 'SQL_BUFFER_RESULT' => 1, 'STATS_AUTO_RECALC' => 1, + 'CONSTRAINT_CATALOG' => 1, 'GEOMETRYCOLLECTION' => 1, 'MASTER_RETRY_COUNT' => 1, + 'MASTER_SSL_CRLPATH' => 1, 'MAX_STATEMENT_TIME' => 1, 'REPLICATE_DO_TABLE' => 1, + 'SQL_AFTER_MTS_GAPS' => 1, 'STATS_SAMPLE_PAGES' => 1, + 'REPLICATE_IGNORE_DB' => 1, + 'MASTER_AUTO_POSITION' => 1, 'MASTER_CONNECT_RETRY' => 1, + 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, + 'MAX_USER_CONNECTIONS' => 1, 'REPLICATE_REWRITE_DB' => 1, + 'REPLICATE_IGNORE_TABLE' => 1, + 'MASTER_HEARTBEAT_PERIOD' => 1, 'REPLICATE_WILD_DO_TABLE' => 1, + 'MAX_CONNECTIONS_PER_HOUR' => 1, + 'REPLICATE_WILD_IGNORE_TABLE' => 1, + + 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, + 'TO' => 3, + 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, + 'FOR' => 3, 'GET' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, + 'SSL' => 3, 'USE' => 3, 'XOR' => 3, + 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, + 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, + 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, + 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, + 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, + 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, + 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, + 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, + 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, + 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, + 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, + 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, + 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'SIGNAL' => 3, 'STORED' => 3, + 'UNLOCK' => 3, 'UPDATE' => 3, 'VALUES' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, + 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, + 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, + 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, + 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, 'VIRTUAL' => 3, + 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, + 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, + 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, + 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, + 'UNSIGNED' => 3, 'UTC_DATE' => 3, 'UTC_TIME' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'GENERATED' => 3, 'LOCALTIME' => 3, + 'MIDDLEINT' => 3, 'PARTITION' => 3, 'PRECISION' => 3, 'PROCEDURE' => 3, + 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, + 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, + 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, + 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, + 'MASTER_BIND' => 3, + 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, + 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, + 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, + 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, + 'IO_AFTER_GTIDS' => 3, 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'DAY_MICROSECOND' => 3, 'IO_BEFORE_GTIDS' => 3, 'OPTIMIZER_COSTS' => 3, + 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, + 'CURRENT_TIMESTAMP' => 3, + 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, + 'SQL_CALC_FOUND_ROWS' => 3, + 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, + + 'NOT NULL' => 5, + 'ON UPDATE' => 5, + 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, + 'DATA DIRECTORY' => 5, + 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, + 'DEFAULT CHARACTER SET' => 5, + + 'XML' => 9, + 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ARRAY' => 9, + 'BOOLEAN' => 9, + 'DATETIME' => 9, 'MULTISET' => 9, + 'TIMESTAMP' => 9, + + 'INT' => 11, 'SET' => 11, + 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'FLOAT' => 11, + 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, + 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, + 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, + 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, + 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, + + 'BINARY VARYING' => 13, + + 'KEY' => 19, + 'INDEX' => 19, + 'UNIQUE' => 19, + + 'INDEX KEY' => 21, + 'UNIQUE KEY' => 21, + 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, + 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, + 'SPATIAL INDEX' => 21, + 'FULLTEXT INDEX' => 21, + + ); +} diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index 7baefddb48..740fbfd85d 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -88,8 +88,8 @@ class DataTypeFragment extends Fragment } if ($state === 0) { - $ret->name = $token->value; - if (!isset(Context::$DATA_TYPES[$token->value])) { + $ret->name = strtoupper($token->value); + if (($token->type !== Token::TYPE_KEYWORD) || (!($token->flags & Token::FLAG_KEYWORD_DATA_TYPE))) { $parser->error('Unrecognized data type.', $token); } $state = 1; diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index ba4b6dcd16..f4a08bdc8d 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -38,6 +38,7 @@ class FieldDefFragment extends Fragment 'UNIQUE KEY' => 4, 'COMMENT' => array(5, 'var'), 'COLUMN_FORMAT' => array(6, 'var'), + 'ON UPDATE' => array(7, 'var'), ); /** @@ -133,16 +134,14 @@ class FieldDefFragment extends Fragment } continue; } elseif ($state === 1) { - if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { - if ($token->value === 'CONSTRAINT') { - $state = 4; - } elseif (isset(Context::$KEY_TYPES[$token->value])) { - $expr->type = $token->value; - $state = 5; - } else { - $parser->error('Unexpected keyword.', $token); - break; // TODO: Skip to the end of the query. - } + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'CONSTRAINT')) { + $state = 4; + } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_KEY)) { + $expr->type = $token->value; + $state = 5; + } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { + $parser->error('Unexpected keyword.', $token); + break; // TODO: Skip to the end of the query. } else { $expr->name = $token->value; $state = 2; @@ -154,17 +153,23 @@ class FieldDefFragment extends Fragment $expr->options = OptionsFragment::parse($parser, $list, static::$FIELD_OPTIONS); $state = 6; } elseif ($state === 4) { - if (!isset(Context::$KEY_TYPES[$token->value])) { + if (($token->type !== Token::TYPE_KEYWORD) || (!($token->flags & Token::FLAG_KEYWORD_KEY))) { $expr->name = $token->value; } else { $expr->type = $token->value; $state = 5; } } elseif ($state === 5) { - $expr->indexes = ArrayFragment::parse($parser, $list); - $state = 6; + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $expr->indexes = ArrayFragment::parse($parser, $list); + $state = 6; + } else { + $expr->name = $token->value; + } } elseif ($state === 6) { - $ret[] = $expr; + if (!empty($expr->type)) { + $ret[] = $expr; + } $expr = new FieldDefFragment(); if ($token->value === ',') { $state = 1; @@ -178,7 +183,7 @@ class FieldDefFragment extends Fragment } // Last iteration was not saved. - if (!empty($expr->name)) { + if (!empty($expr->type)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index f002f5bd32..dfb4fc98fb 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -70,30 +70,24 @@ class OptionsFragment extends Fragment continue; } - if (isset($options[strtoupper($token->value)])) { - $lastOption = $options[strtoupper($token->value)]; - $lastOptionId = is_array($lastOption) ? $lastOption[0] : $lastOption; + if ($lastOption === null) { + if (isset($options[strtoupper($token->value)])) { + $lastOption = $options[strtoupper($token->value)]; + $lastOptionId = is_array($lastOption) ? $lastOption[0] : $lastOption; - // Checking for option conflicts. - // For example, in `SELECT` statements the keywords `ALL` and `DISTINCT` - // conflict and if used together, they produce an invalid query. - // Usually, tokens can be identified in the array by the option ID, - // but if conflicts occur, a psuedo option ID is used. - // The first pseudo duplicate ID is the maximum value of the real - // options (e.g. if there are 5 options, the first fake ID is 6). - if (isset($ret->options[$lastOptionId])) { - $parser->error('This option conflicts with \'' . $ret->options[$lastOptionId] . '\'.', $token); - $lastOptionId = $lastAssignedId++; - } - } else { - // There is no option to be processed. - if ($lastOption === null) { - break; - } - - // The only keywords that are expected are those which are - // options. - if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { + // Checking for option conflicts. + // For example, in `SELECT` statements the keywords `ALL` and `DISTINCT` + // conflict and if used together, they produce an invalid query. + // Usually, tokens can be identified in the array by the option ID, + // but if conflicts occur, a psuedo option ID is used. + // The first pseudo duplicate ID is the maximum value of the real + // options (e.g. if there are 5 options, the first fake ID is 6). + if (isset($ret->options[$lastOptionId])) { + $parser->error('This option conflicts with \'' . $ret->options[$lastOptionId] . '\'.', $token); + $lastOptionId = $lastAssignedId++; + } + } else { + // There is no option to be processed. break; } } diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index 5a378ca0e4..867976c2bc 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -114,9 +114,12 @@ class Token const TYPE_DELIMITER = 9; // Flags that describe the tokens in more detail. - const FLAG_KEYWORD_RESERVED = 1; - const FLAG_KEYWORD_UNRESERVED = 2; + // All keywords must have flag 1 so `Context::isKeyword` method doesn't + // require strict comparison. + const FLAG_KEYWORD_RESERVED = 2; const FLAG_KEYWORD_COMPOSED = 4; + const FLAG_KEYWORD_DATA_TYPE = 8; + const FLAG_KEYWORD_KEY = 16; // Numbers related flags. const FLAG_NUMBER_HEX = 1; @@ -207,10 +210,12 @@ class Token { switch ($this->type) { case Token::TYPE_KEYWORD: - if ($this->flags & Token::FLAG_KEYWORD_RESERVED) { - return strtoupper($this->token); + if (!($this->flags & Token::FLAG_KEYWORD_RESERVED)) { + // Unreserved keywords should stay the way they are because they + // might represent field names. + return $this->token; } - return $this->token; + return strtoupper($this->token); case Token::TYPE_WHITESPACE: return ' '; case Token::TYPE_BOOL: diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index a29951e6e8..22227a8b6e 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -19,12 +19,12 @@ class Misc /** * Gets a list of all aliases and their original names. * - * @param SelectStatement $tree The tree that was generated after parsing. - * @param string $db The name of the database. + * @param SelectStatement $tree The tree that was generated after parsing. + * @param string $database The name of the database. * * @return array */ - public static function getAliases(SelectStatement $tree, $db) + public static function getAliases(SelectStatement $tree, $database) { $retval = array(); @@ -34,7 +34,7 @@ class Misc && (!empty($tree->join->expr->alias)) ) { $thisDb = empty($tree->join->expr->database) ? - $db : $tree->join->expr->database; + $database : $tree->join->expr->database; $retval = array( $thisDb => array( @@ -56,7 +56,7 @@ class Misc continue; } - $thisDb = empty($expr->database) ? $db : $expr->database; + $thisDb = empty($expr->database) ? $database : $expr->database; if (!isset($retval[$thisDb])) { $retval[$thisDb] = array( @@ -83,7 +83,7 @@ class Misc continue; } - $thisDb = empty($expr->database) ? $db : $expr->database; + $thisDb = empty($expr->database) ? $database : $expr->database; if (empty($expr->table)) { foreach ($retval[$thisDb]['tables'] as &$table) { diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index f234d97b55..9bc10f7546 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -101,6 +101,7 @@ class Routine 'name' => array(), 'type' => array(), 'length' => array(), + 'length_arr' => array(), 'opts' => array(), ); @@ -110,6 +111,7 @@ class Routine $retval['name'][$idx] = $param->name; $retval['type'][$idx] = $param->type->name; $retval['length'][$idx] = implode(',', $param->type->size); + $retval['length_arr'][$idx] = $param->type->size; $retval['opts'][$idx] = array(); foreach ($param->type->options->options as $opt) { $retval['opts'][$idx][] = is_string($opt) ? diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php new file mode 100644 index 0000000000..7560f9d07a --- /dev/null +++ b/libraries/sql-parser/src/Utils/Table.php @@ -0,0 +1,69 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class Table +{ + + public static function getFields(CreateStatement $tree) + { + if (($tree->fields === null) || (!$tree->options->has('TABLE'))) { + return array(); + } + + $ret = array(); + + foreach ($tree->fields as $field) { + + // Skipping keys. + if (is_string($field->type)) { + continue; + } + + $ret[$field->name] = array( + 'type' => $field->type->name, + 'timestamp_not_null' => false, + ); + + if ($field->options) { + + if ($field->type->name === 'TIMESTAMP') { + if ($field->options->has('NOT NULL')) { + $ret[$field->name]['timestamp_not_null'] = true; + } + } + + if (($option = $field->options->has('DEFAULT'))) { + $ret[$field->name]['default_value'] = $option; + if ($option === 'CURRENT_TIMESTAMP') { + $ret[$field->name]['default_current_timestamp'] = true; + } + } + + if (($option = $field->options->has('ON UPDATE'))) { + if ($option === 'CURRENT_TIMESTAMP') { + $ret[$field->name]['on_update_current_timestamp'] = true; + } + } + } + + } + + return $ret; + } +} From 6c3ccb2d5643663ff4d1104b18b73e4b856119c3 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Jun 2015 22:28:33 +0300 Subject: [PATCH 19/57] Use new parser in routines' execute form. Signed-off-by: Dan Ungureanu --- libraries/rte/rte_routines.lib.php | 39 ++++++++----------- .../rte/PMA_RTN_getExecuteForm_test.php | 16 ++++++++ 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 73980f41c4..8cb00379a0 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -520,13 +520,14 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) $routineStatement = $parser->statements[0]; $params = SqlParser\Utils\Routine::getParameters($routineStatement); - $retval['item_num_params'] = $params['num']; - $retval['item_param_dir'] = $params['dir']; - $retval['item_param_name'] = $params['name']; - $retval['item_param_type'] = $params['type']; - $retval['item_param_length'] = $params['length']; - $retval['item_param_opts_num'] = $params['opts']; - $retval['item_param_opts_text'] = $params['opts']; + $retval['item_num_params'] = $params['num']; + $retval['item_param_dir'] = $params['dir']; + $retval['item_param_name'] = $params['name']; + $retval['item_param_type'] = $params['type']; + $retval['item_param_length'] = $params['length']; + $retval['item_param_length_arr'] = $params['length_arr']; + $retval['item_param_opts_num'] = $params['opts']; + $retval['item_param_opts_text'] = $params['opts']; // Get extra data if (!$all) { @@ -538,8 +539,8 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) } else { $retval['item_type_toggle'] = 'FUNCTION'; } - $retval['item_returntype'] = ''; - $retval['item_returnlength'] = ''; + $retval['item_returntype'] = ''; + $retval['item_returnlength'] = ''; $retval['item_returnopts_num'] = ''; $retval['item_returnopts_text'] = ''; @@ -1543,24 +1544,18 @@ function PMA_RTN_getExecuteForm($routine) } $retval .= "\n"; if (in_array($routine['item_param_type'][$i], array('ENUM', 'SET'))) { - $tokens = PMA_SQP_parse($routine['item_param_length'][$i]); if ($routine['item_param_type'][$i] == 'ENUM') { $input_type = 'radio'; } else { $input_type = 'checkbox'; } - for ($j = 0; $j < $tokens['len']; $j++) { - if ($tokens[$j]['type'] != 'punct_listsep') { - $tokens[$j]['data'] = htmlentities( - PMA_Util::unquote($tokens[$j]['data']), - ENT_QUOTES - ); - $retval .= "" - . $tokens[$j]['data'] . "
\n"; - } + foreach ($routine['item_param_length_arr'][$i] as $value) { + $value = htmlentities(PMA_Util::unquote($value), ENT_QUOTES); + $retval .= "" + . $value . "
\n"; } } else if (in_array( /*overload*/mb_strtolower($routine['item_param_type'][$i]), diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index 4ac10f5285..44061c9090 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -113,6 +113,14 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase 4 => "'a','b'", 5 => "'a','b'" ), + 'item_param_length_arr' => array( + 0 => array(), + 1 => array('22'), + 2 => array(), + 3 => array(), + 4 => array("'a'", "'b'"), + 5 => array("'a'", "'b'") + ), 'item_param_opts_num' => array( 0 => '', 1 => '', @@ -241,6 +249,14 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase 4 => "'a','b'", 5 => "'a','b'" ), + 'item_param_length_arr' => array( + 0 => array(), + 1 => array('22'), + 2 => array(), + 3 => array(), + 4 => array("'a'", "'b'"), + 5 => array("'a'", "'b'") + ), 'item_param_opts_num' => array( 0 => '', 1 => '', From 11adecc1d80f32234f48791fe121a3a59485c28e Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Jun 2015 22:36:13 +0300 Subject: [PATCH 20/57] Use new parser for table's structure. Signed-off-by: Dan Ungureanu --- libraries/display_structure.inc.php | 6 +++--- tbl_structure.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/display_structure.inc.php b/libraries/display_structure.inc.php index a23f487644..ec561decc1 100644 --- a/libraries/display_structure.inc.php +++ b/libraries/display_structure.inc.php @@ -115,9 +115,9 @@ foreach ($fields as $row) { $attribute = $extracted_columnspec['attribute']; // prepare a common variable to reuse below; however, - // in case of a VIEW, $analyzed_sql[0]['create_table_fields'] is empty - if (isset($analyzed_sql[0]['create_table_fields'][$row['Field']])) { - $tempField = $analyzed_sql[0]['create_table_fields'][$row['Field']]; + // in case of a VIEW, $create_table_fields is empty + if (isset($create_table_fields[$row['Field']])) { + $tempField = $create_table_fields[$row['Field']]; } else { $tempField = array(); } diff --git a/tbl_structure.php b/tbl_structure.php index 9d5178c048..094356c355 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -199,7 +199,8 @@ $show_create_table = $GLOBALS['dbi']->fetchValue( . PMA_Util::backquote($table), 0, 1 ); -$analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); +$parser = new SqlParser\Parser($show_create_table); +$create_table_fields = SqlParser\Utils\Table::getFields($parser->statements[0]); /** * prepare table infos From 484d456f59e3a3b588aaceb5d8cd551ff9a5f13b Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 23 Jun 2015 22:30:12 +0300 Subject: [PATCH 21/57] Use new parser for relations. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/relation.lib.php | 11 +- libraries/sql-parser/src/Context.php | 19 +-- .../src/Contexts/ContextMySql50000.php | 19 ++- .../src/Contexts/ContextMySql50100.php | 19 ++- .../src/Contexts/ContextMySql50500.php | 19 ++- .../src/Contexts/ContextMySql50600.php | 19 ++- .../src/Contexts/ContextMySql50700.php | 19 ++- .../src/Fragments/ArrayFragment.php | 4 +- .../sql-parser/src/Fragments/CallKeyword.php | 3 +- .../src/Fragments/DataTypeFragment.php | 27 +++- .../src/Fragments/FieldDefFragment.php | 76 +++++------ .../sql-parser/src/Fragments/IntoKeyword.php | 28 +--- .../sql-parser/src/Fragments/KeyFragment.php | 124 ++++++++++++++++++ .../sql-parser/src/Fragments/LimitKeyword.php | 8 +- .../sql-parser/src/Fragments/OrderKeyword.php | 51 ++++--- .../src/Fragments/ReferencesKeyword.php | 115 ++++++++++++++++ .../src/Statements/CreateStatement.php | 1 + libraries/sql-parser/src/Utils/Misc.php | 3 +- libraries/sql-parser/src/Utils/Routine.php | 16 +-- libraries/sql-parser/src/Utils/Table.php | 45 ++++++- 20 files changed, 489 insertions(+), 137 deletions(-) create mode 100644 libraries/sql-parser/src/Fragments/KeyFragment.php create mode 100644 libraries/sql-parser/src/Fragments/ReferencesKeyword.php diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index d8b9552d64..340db7d238 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -734,15 +734,14 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') if (($source == 'both' || $source == 'foreign') && /*overload*/mb_strlen($table) ) { - - $showCreateTableQuery = 'SHOW CREATE TABLE ' - . PMA_Util::backquote($db) . '.' . PMA_Util::backquote($table); $show_create_table = $GLOBALS['dbi']->fetchValue( - $showCreateTableQuery, 0, 1 + 'SHOW CREATE TABLE ' . PMA_Util::backquote($db) . '.' + . PMA_Util::backquote($table), + 0, 1 ); if ($show_create_table) { - $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); - $foreign['foreign_keys_data'] = $analyzed_sql[0]['foreign_keys']; + $parser = new SqlParser\Parser($show_create_table); + $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys($parser->statements[0]); } } diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index eed10d3687..cbe666df57 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -53,30 +53,22 @@ abstract class Context */ public static $contextPrefix = '\\SqlParser\\Contexts\\Context'; - // ------------------------------------------------------------------------- - // Keywords. - /** * List of keywords. * * Because, PHP's associative arrays are basically hash tables, it is more * efficient to store keywords as keys instead of values. * - * There are multiple types of keyword, depending on the value associated: - * 1 - reserved keywords - * 2 - keyword - * 3 - composite keyword (unofficial); used to make the job of the lexer - * much easier by grouping keywords that may appear together + * The value associated to each keyword represents its flags. * - * Keywords below are sorted by type, length and keyword. + * @see Token::FLAG_KEYWORD_* + * + * Elements are sorted by flags, length and keyword. * * @var array */ public static $KEYWORDS = array(); - // ------------------------------------------------------------------------- - // Operators. - /** * List of operators and their flags. * @@ -110,9 +102,6 @@ abstract class Context '(' => 16, ')' => 16, '.' => 16, ',' => 16, ); - // ------------------------------------------------------------------------- - // SQL Modes. - /* * Server SQL Modes * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index b81d687f0c..f2357f2b2b 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -1,5 +1,11 @@ 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, @@ -137,8 +152,8 @@ class ContextMySql50000 extends Context 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, - 'NOT NULL' => 5, - 'ON UPDATE' => 5, + 'NOT NULL' => 5, 'SET NULL' => 5, + 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, 'DATA DIRECTORY' => 5, 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index 260925e21f..dcdce84850 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -1,5 +1,11 @@ 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, @@ -151,8 +166,8 @@ class ContextMySql50100 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, - 'ON UPDATE' => 5, + 'NOT NULL' => 5, 'SET NULL' => 5, + 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, 'DATA DIRECTORY' => 5, 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index e70b931994..15e079e554 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -1,5 +1,11 @@ 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, @@ -154,8 +169,8 @@ class ContextMySql50500 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, - 'ON UPDATE' => 5, + 'NOT NULL' => 5, 'SET NULL' => 5, + 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, 'DATA DIRECTORY' => 5, 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index 819ec1c53f..1135e52dd0 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -1,5 +1,11 @@ 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, @@ -165,8 +180,8 @@ class ContextMySql50600 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, - 'ON UPDATE' => 5, + 'NOT NULL' => 5, 'SET NULL' => 5, + 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, 'DATA DIRECTORY' => 5, 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index db047b1c46..799ae1b4be 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -1,5 +1,11 @@ 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, @@ -170,8 +185,8 @@ class ContextMySql50700 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, - 'ON UPDATE' => 5, + 'NOT NULL' => 5, 'SET NULL' => 5, + 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, 'DATA DIRECTORY' => 5, 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Fragments/ArrayFragment.php index eb5a80b8ee..a713dde228 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Fragments/ArrayFragment.php @@ -24,7 +24,7 @@ class ArrayFragment extends Fragment * * @var array */ - public $array = array(); + public $values = array(); /** * The array that contains the unprocessed value of each token. @@ -89,7 +89,7 @@ class ArrayFragment extends Fragment // Empty array. break; } - $ret->array[] = $token->value; + $ret->values[] = $token->value; $ret->raw[] = $token->token; $state = 2; } elseif ($state === 2) { diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php index db11120c49..4c1ed0c810 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -80,8 +80,7 @@ class CallKeyword extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $parameters = ArrayFragment::parse($parser, $list); - $ret->parameters = $parameters->array; + $ret->parameters = ArrayFragment::parse($parser, $list)->values; } break; } diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index 740fbfd85d..a8045cf3e8 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -20,7 +20,12 @@ use SqlParser\TokensList; class DataTypeFragment extends Fragment { - public static $OPTIONS = array( + /** + * All data type options. + * + * @var array + */ + public static $DATA_TYPE_OPTIONS = array( 'BINARY' => 1, 'CHARACTER SET' => array(2, 'var'), 'CHARSET' => array(2, 'var'), @@ -37,18 +42,26 @@ class DataTypeFragment extends Fragment public $name; /** - * The size of this data type. + * The parameters of this data type. + * + * Some data types have no parameters. + * Numeric types might have parameters for the maximum number of digits, + * precision, etc. + * String ypes might have parameters for the maxium length stored. + * `ENUM` and `SET` have parameters for possible values. + * + * For more information, check the MySQL manual. * * @var array */ - public $size = array(); + public $parameters = array(); /** * The options of this data type. * * @var OptionsFragment */ - public $options = array(); + public $options; /** * @param Parser $parser The parser that serves as context. @@ -97,10 +110,10 @@ class DataTypeFragment extends Fragment if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { $size = ArrayFragment::parse($parser, $list); ++$list->idx; - $ret->size = (($ret->name === 'ENUM') || ($ret->name === 'SET')) ? - $size->raw : $size->array; + $ret->parameters = (($ret->name === 'ENUM') || ($ret->name === 'SET')) ? + $size->raw : $size->values; } - $ret->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + $ret->options = OptionsFragment::parse($parser, $list, static::$DATA_TYPE_OPTIONS); ++$list->idx; break; } diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index f4a08bdc8d..20983e9e37 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -48,6 +48,13 @@ class FieldDefFragment extends Fragment */ public $name; + /** + * Whether this field is a constraint or not. + * + * @var bool + */ + public $isConstraint; + /** * The data type of thew new column. * @@ -56,11 +63,18 @@ class FieldDefFragment extends Fragment public $type; /** - * The array of indexes. + * The key. * - * @var ArrayFragment + * @var KeyFragment */ - public $indexes; + public $key; + + /** + * The table that is referenced. + * + * @var ReferencesKeyword + */ + public $references; /** * The options of the new field fragment. @@ -89,22 +103,18 @@ class FieldDefFragment extends Fragment * * 0 -----------------------[ ( ]------------------------> 1 * - * 1 -------------------[ CONSTRAINT ]-------------------> 4 - * 1 --------------------[ key type ]--------------------> 5 - * 1 -------------------[ column name ]------------------> 2 + * 1 --------------------[ CONSTRAINT ]------------------> 1 + * 1 -----------------------[ key ]----------------------> 2 + * 1 -------------[ constraint / column name ]-----------> 2 * - * 2 -------------------[ data type ]--------------------> 3 + * 2 --------------------[ data type ]-------------------> 3 * - * 3 ---------------------[ size ]---------------------> 3 * 3 ---------------------[ options ]--------------------> 4 * - * 4 -----------------[ CONSTRAINT name ]----------------> 4 - * 4 -----------------[ CONSTRAINT type ]----------------> 5 + * 4 --------------------[ REFERENCES ]------------------> 4 * - * 5 -------------------[ index names ]------------------> 6 - * - * 6 ------------------------[ , ]-----------------------> 1 - * 6 ------------------------[ ) ]-----------------------> -1 + * 5 ------------------------[ , ]-----------------------> 1 + * 5 ------------------------[ ) ]-----------------------> -1 * * @var int */ @@ -132,42 +142,34 @@ class FieldDefFragment extends Fragment if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { $state = 1; } - continue; } elseif ($state === 1) { if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'CONSTRAINT')) { - $state = 4; + $expr->isConstraint = true; } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_KEY)) { - $expr->type = $token->value; - $state = 5; - } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { - $parser->error('Unexpected keyword.', $token); - break; // TODO: Skip to the end of the query. + $expr->key = KeyFragment::parse($parser, $list); + $state = 4; } else { $expr->name = $token->value; - $state = 2; + if (!$expr->isConstraint) { + $state = 2; + } } } elseif ($state === 2) { $expr->type = DataTypeFragment::parse($parser, $list); $state = 3; } elseif ($state === 3) { $expr->options = OptionsFragment::parse($parser, $list, static::$FIELD_OPTIONS); - $state = 6; + $state = 4; } elseif ($state === 4) { - if (($token->type !== Token::TYPE_KEYWORD) || (!($token->flags & Token::FLAG_KEYWORD_KEY))) { - $expr->name = $token->value; + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'REFERENCES')) { + ++$list->idx; // Skipping keyword 'REFERENCES'. + $expr->references = ReferencesKeyword::parse($parser, $list); } else { - $expr->type = $token->value; - $state = 5; + --$list->idx; } - } elseif ($state === 5) { - if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $expr->indexes = ArrayFragment::parse($parser, $list); - $state = 6; - } else { - $expr->name = $token->value; - } - } elseif ($state === 6) { - if (!empty($expr->type)) { + $state = 5; + } else if ($state === 5) { + if ((!empty($expr->type)) || (!empty($expr->key))) { $ret[] = $expr; } $expr = new FieldDefFragment(); @@ -183,7 +185,7 @@ class FieldDefFragment extends Fragment } // Last iteration was not saved. - if (!empty($expr->type)) { + if ((!empty($expr->type)) || (!empty($expr->key))) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index c4211fd47d..9cf634c427 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -82,30 +82,12 @@ class IntoKeyword extends Fragment break; } - if ($token->type === Token::TYPE_OPERATOR) { - if ($token->value === '(') { - if (empty($ret->table)) { - $parser->error('Table name was expected.', $token); - } - $state = 1; - continue; - } elseif ($token->value === ',') { - if ($state !== 2) { - $parser->error('Field name was expected.', $token); - } - $state = 1; - continue; - } - - // No other operator is expected. + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $ret->fields = ArrayFragment::parse($parser, $list)->values; + ++$list->idx; break; - } - - if ($state === 0) { - $ret->table .= $token->value; - } elseif ($state === 1) { - $ret->fields[] = $token->value; - $state = 2; + } else { + $ret->table = $token->value; } } diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Fragments/KeyFragment.php new file mode 100644 index 0000000000..11f4caf015 --- /dev/null +++ b/libraries/sql-parser/src/Fragments/KeyFragment.php @@ -0,0 +1,124 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class KeyFragment extends Fragment +{ + + /** + * All key options. + * + * @var array + */ + public static $KEY_OPTIONS = array( + 'KEY_BLOCK_SIZE' => array(1, 'var'), + 'USING' => array(2, 'var'), + 'WITH PARSER' => array(3, 'var'), + ); + + /** + * The name of this key. + * + * @var string + */ + public $name; + + /** + * Columns. + * + * @var array + */ + public $columns; + + /** + * The type of this key. + * + * @var string + */ + public $type; + + /** + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. + * + * @return KeyFragment[] + */ + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + $ret = new KeyFragment(); + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ----------------------[ type ]-----------------------> 1 + * + * 1 ----------------------[ name ]-----------------------> 1 + * 1 ---------------------[ columns ]---------------------> 2 + * + * 2 ---------------------[ options ]---------------------> 3 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + + /** + * Token parsed at this moment. + * @var Token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + $ret->type = $token->value; + $state = 1; + } elseif ($state === 1) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $ret->columns = ArrayFragment::parse($parser, $list)->values; + $state = 2; + } else { + $ret->name = $token->value; + } + } elseif ($state === 2) { + $ret->options = OptionsFragment::parse($parser, $list, static::$KEY_OPTIONS); + ++$list->idx; + break; + } + + } + + --$list->idx; + return $ret; + + } +} diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index 2e5b8193e5..6e12b444d0 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -64,7 +64,7 @@ class LimitKeyword extends Fragment continue; } - if ($token->value === 'OFFSET') { + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'OFFSET')) { if ($offset) { $parser->error('An offset was expected.'); } @@ -73,8 +73,8 @@ class LimitKeyword extends Fragment } if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { - $ret->offset = $ret->row_count; - $ret->row_count = 0; + $ret->offset = $ret->rowCount; + $ret->rowCount = 0; continue; } @@ -82,7 +82,7 @@ class LimitKeyword extends Fragment $ret->offset = $token->value; $offset = false; } else { - $ret->row_count = $token->value; + $ret->rowCount = $token->value; } } diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Fragments/OrderKeyword.php index 224a573263..34744e3d1c 100644 --- a/libraries/sql-parser/src/Fragments/OrderKeyword.php +++ b/libraries/sql-parser/src/Fragments/OrderKeyword.php @@ -20,11 +20,11 @@ class OrderKeyword extends Fragment { /** - * The name of the column that is being used for ordering. + * The field that is used for ordering. * - * @var string + * @var FieldFragment */ - public $column; + public $field; /** * The order type. @@ -46,6 +46,20 @@ class OrderKeyword extends Fragment $expr = new OrderKeyword(); + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ----------------------[ field ]----------------------> 1 + * + * 1 ------------------------[ , ]------------------------> 0 + * 1 -------------------[ ASC / DESC ]--------------------> 1 + * + * @var int + */ + $state = 0; + for (; $list->idx < $list->count; ++$list->idx) { /** @@ -64,30 +78,27 @@ class OrderKeyword extends Fragment continue; } - if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { - // Type of ordering. By default, it is `ASC`. - if (($token->value === 'ASC') || ($token->value === 'DESC')) { + if ($state === 0) { + $expr->field = FieldFragment::parse($parser, $list); + $state = 1; + } elseif ($state === 1) { + if (($token->type === Token::TYPE_KEYWORD) && (($token->value === 'ASC') || ($token->value === 'DESC'))) { $expr->type = $token->value; - continue; + } else if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { + if (!empty($expr->field)) { + $ret[] = $expr; + } + $expr = new OrderKeyword(); + $state = 0; + } else { + break; } - - // No other keyword is expected. - break; } - // Saving field. - if (($token->type === Token::TYPE_OPERATOR) && ($token->token === ',')) { - $ret[] = $expr; - $expr = new OrderKeyword(); - continue; - } - - $expr->column .= $token->token; - } // Last iteration was not processed. - if (!empty($expr->column)) { + if (!empty($expr->field)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php new file mode 100644 index 0000000000..939eb244ab --- /dev/null +++ b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php @@ -0,0 +1,115 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ReferencesKeyword extends Fragment +{ + + /** + * All references options. + * + * @var array + */ + public static $REFERENCES_OPTIONS = array( + 'MATCH' => array(1, 'var'), + 'ON DELETE' => array(2, 'var'), + 'ON UPDATE' => array(3, 'var'), + ); + + /** + * The referenced table. + * + * @var string + */ + public $table; + + /** + * The referenced columns. + * + * @var array + */ + public $columns; + + /** + * The options of the referencing. + * + * @var OptionsFragment + */ + public $options; + + /** + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. + * + * @return ReferencesKeyword + */ + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + $ret = new ReferencesKeyword(); + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ----------------------[ table ]---------------------> 1 + * + * 1 ---------------------[ columns ]--------------------> 2 + * + * 2 ---------------------[ options ]--------------------> -1 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + + /** + * Token parsed at this moment. + * @var Token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + $ret->table = $token->value; + $state = 1; + } else if ($state === 1) { + $ret->columns = ArrayFragment::parse($parser, $list)->values; + $state = 2; + } else if ($state === 2) { + $ret->options = OptionsFragment::parse($parser, $list, static::$REFERENCES_OPTIONS); + ++$list->idx; + break; + } + + } + + --$list->idx; + return $ret; + } +} diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 7a248e9032..edb87ea7fc 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -32,6 +32,7 @@ class CreateStatement extends Statement 'TABLE' => 1, 'TABLESPACE' => 1, 'TRIGGER' => 1, + 'USER' => 1, 'VIEW' => 1, 'TEMPORARY' => 2, diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 22227a8b6e..4e818c6789 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -92,8 +92,7 @@ class Misc } else { $thisTable = isset($tables[$thisDb][$expr->table]) ? $tables[$thisDb][$expr->table] : $expr->table; - $retval[$thisDb]['tables'] - [$thisTable]['columns'][$expr->column] = $expr->alias; + $retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias; } } diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 9bc10f7546..8be7db1260 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -32,22 +32,22 @@ class Routine $lexer = new Lexer($param); // A dummy parser is used for error reporting. - $param = DataTypeFragment::parse(new Parser(), $lexer->tokens); + $type = DataTypeFragment::parse(new Parser(), $lexer->tokens); - if ($param === null) { + if ($type === null) { return array('', '', '', '', ''); } $options = array(); - foreach ($param->options->options as $opt) { + foreach ($type->options->options as $opt) { $options[] = is_string($opt) ? $opt : $opt['value']; } return array( '', '', - $param->name, - implode(',', $param->size), + $type->name, + implode(',', $type->parameters), implode(' ', $options) ); } @@ -81,7 +81,7 @@ class Routine empty($param->inOut) ? '' : $param->inOut, $param->name, $param->type->name, - implode(',', $param->type->size), + implode(',', $param->type->parameters), implode(' ', $options) ); } @@ -110,8 +110,8 @@ class Routine $retval['dir'][$idx] = $param->inOut; $retval['name'][$idx] = $param->name; $retval['type'][$idx] = $param->type->name; - $retval['length'][$idx] = implode(',', $param->type->size); - $retval['length_arr'][$idx] = $param->type->size; + $retval['length'][$idx] = implode(',', $param->type->parameters); + $retval['length_arr'][$idx] = $param->type->parameters; $retval['opts'][$idx] = array(); foreach ($param->type->options->options as $opt) { $retval['opts'][$idx][] = is_string($opt) ? diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index 7560f9d07a..a814075459 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -20,6 +20,49 @@ use SqlParser\Statements\CreateStatement; class Table { + public static function getForeignKeys(CreateStatement $tree) + { + if (($tree->fields === null) || (!$tree->options->has('TABLE'))) { + return array(); + } + + $ret = array(); + + foreach ($tree->fields as $field) { + + if ((empty($field->key)) || ($field->key->type !== 'FOREIGN KEY')) { + continue; + } + + $tmp = array( + 'constraint' => $field->name, + 'index_list' => $field->key->columns, + ); + + if (!empty($field->references)) { + $tmp['ref_table_name'] = $field->references->table; + $tmp['ref_index_list'] = $field->references->columns; + + if (($opt = $field->references->options->has('ON UPDATE'))) { + $tmp['on_update'] = str_replace(' ', '_', $opt); + } + + if (($opt = $field->references->options->has('ON DELETE'))) { + $tmp['on_delete'] = str_replace(' ', '_', $opt); + } + + // if (($opt = $field->references->options->has('MATCH'))) { + // $tmp['match'] = str_replace(' ', '_', $opt); + // } + } + + $ret[] = $tmp; + + } + + return $ret; + } + public static function getFields(CreateStatement $tree) { if (($tree->fields === null) || (!$tree->options->has('TABLE'))) { @@ -31,7 +74,7 @@ class Table foreach ($tree->fields as $field) { // Skipping keys. - if (is_string($field->type)) { + if (empty($field->type)) { continue; } From acf0dbdacfd5f0719e8d505474e34b31eca0af86 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 24 Jun 2015 19:31:57 +0300 Subject: [PATCH 22/57] Updated sql-parser library. Signed-off-by: Dan Ungureanu --- .../src/Contexts/ContextMySql50000.php | 2 + .../src/Contexts/ContextMySql50100.php | 2 + .../src/Contexts/ContextMySql50500.php | 2 + .../src/Contexts/ContextMySql50600.php | 2 + .../src/Contexts/ContextMySql50700.php | 2 + libraries/sql-parser/src/Fragment.php | 8 +- libraries/sql-parser/src/Parser.php | 90 +++++++++++++------ libraries/sql-parser/src/Statement.php | 74 ++++++++------- libraries/sql-parser/src/Utils/Misc.php | 12 ++- libraries/sql-parser/src/Utils/Routine.php | 38 ++++---- libraries/sql-parser/src/Utils/Table.php | 10 +-- 11 files changed, 147 insertions(+), 95 deletions(-) diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index f2357f2b2b..63f4ca2780 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -159,6 +159,8 @@ class ContextMySql50000 extends Context 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, 'DEFAULT CHARACTER SET' => 5, + 'GROUP BY' => 7, 'ORDER BY' => 7, + 'XML' => 9, 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, 'ARRAY' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index dcdce84850..265979f8b2 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -173,6 +173,8 @@ class ContextMySql50100 extends Context 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, 'DEFAULT CHARACTER SET' => 5, + 'GROUP BY' => 7, 'ORDER BY' => 7, + 'XML' => 9, 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, 'ARRAY' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index 15e079e554..3a5496a9ba 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -176,6 +176,8 @@ class ContextMySql50500 extends Context 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, 'DEFAULT CHARACTER SET' => 5, + 'GROUP BY' => 7, 'ORDER BY' => 7, + 'XML' => 9, 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, 'ARRAY' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index 1135e52dd0..d9fcf715cd 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -187,6 +187,8 @@ class ContextMySql50600 extends Context 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, 'DEFAULT CHARACTER SET' => 5, + 'GROUP BY' => 7, 'ORDER BY' => 7, + 'XML' => 9, 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, 'ARRAY' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 799ae1b4be..808de0df49 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -192,6 +192,8 @@ class ContextMySql50700 extends Context 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, 'DEFAULT CHARACTER SET' => 5, + 'GROUP BY' => 7, 'ORDER BY' => 7, + 'XML' => 9, 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, 'ARRAY' => 9, diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php index 51cec95922..1c40699be3 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Fragment.php @@ -24,7 +24,9 @@ abstract class Fragment * * @return mixed */ - abstract public static function parse(Parser $parser, TokensList $list, - array $options = array() - ); + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + return null; + } + } diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 2973a03686..a5fe233563 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -56,32 +56,70 @@ class Parser */ public static $KEYWORD_PARSERS = array( - // Meta-keywords. - /* - '_ARRAY' => 'SqlParser\\Fragments\\ArrayFragment', - '_CALL' => 'SqlParser\\Fragments\\CallKeyword', - '_CREATE_DEF' => 'SqlParser\\Fragments\\CreateDefFragment', - '_DATA_TYPE' => 'SqlParser\\Fragments\\DataTypeFragment', - '_FIELD' => 'SqlParser\\Fragments\\FieldFragment', - '_FIELD_DEF' => 'SqlParser\\Fragments\\FieldDefFragment', - '_PARAM_DEF' => 'SqlParser\\Fragments\\ParamDefFragment', - '_OPTIONS' => 'SqlParser\\Fragments\\OptionsFragment', - '_RENAME' => 'SqlParser\\Fragments\\RenameKeyword', - '_SELECT' => 'SqlParser\\Fragments\\SelectKeyword', - */ - - 'FROM' => 'SqlParser\\Fragments\\FromKeyword', - 'GROUP' => 'SqlParser\\Fragments\\OrderKeyword', - 'HAVING' => 'SqlParser\\Fragments\\WhereKeyword', - 'INTO' => 'SqlParser\\Fragments\\IntoKeyword', - 'JOIN' => 'SqlParser\\Fragments\\JoinKeyword', - 'LIMIT' => 'SqlParser\\Fragments\\LimitKeyword', - 'ORDER' => 'SqlParser\\Fragments\\OrderKeyword', - 'PARTITION' => 'SqlParser\\Fragments\\ArrayFragment', - 'SET' => 'SqlParser\\Fragments\\SetKeyword', - 'VALUE' => 'SqlParser\\Fragments\\ValuesKeyword', - 'VALUES' => 'SqlParser\\Fragments\\ValuesKeyword', - 'WHERE' => 'SqlParser\\Fragments\\WhereKeyword', + 'CALL' => array( + 'class' => 'SqlParser\\Fragments\\CallKeyword', + 'field' => 'call', + ), + 'FROM' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'from', + ), + 'GROUP BY' => array( + 'class' => 'SqlParser\\Fragments\\OrderKeyword', + 'field' => 'group', + ), + 'HAVING' => array( + 'class' => 'SqlParser\\Fragments\\WhereKeyword', + 'field' => 'having', + ), + 'INTO' => array( + 'class' => 'SqlParser\\Fragments\\IntoKeyword', + 'field' => 'into', + ), + 'JOIN' => array( + 'class' => 'SqlParser\\Fragments\\JoinKeyword', + 'field' => 'join', + ), + 'LIMIT' => array( + 'class' => 'SqlParser\\Fragments\\LimitKeyword', + 'field' => 'limit', + ), + 'ORDER BY' => array( + 'class' => 'SqlParser\\Fragments\\OrderKeyword', + 'field' => 'order', + ), + 'PARTITION' => array( + 'class' => 'SqlParser\\Fragments\\ArrayFragment', + 'field' => 'partition', + ), + 'RENAME' => array( + 'class' => 'SqlParser\\Fragments\\RenameKeyword', + 'field' => 'renames', + ), + 'SET' => array( + 'class' => 'SqlParser\\Fragments\\SetKeyword', + 'field' => 'set', + ), + 'SELECT' => array( + 'class' => 'SqlParser\\Fragments\\SelectKeyword', + 'field' => 'expr', + ), + 'UPDATE' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'from', + ), + 'VALUE' => array( + 'class' => 'SqlParser\\Fragments\\ValuesKeyword', + 'field' => 'values', + ), + 'VALUES' => array( + 'class' => 'SqlParser\\Fragments\\ValuesKeyword', + 'field' => 'values', + ), + 'WHERE' => array( + 'class' => 'SqlParser\\Fragments\\WhereKeyword', + 'field' => 'where', + ), ); diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 13002f4d72..0e57bfd45e 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -50,6 +50,15 @@ abstract class Statement */ public function parse(Parser $parser, TokensList $list) { + + /** + * Whether otpions were parsed or not. + * For statements that do not have any options this is set to `true` by + * default. + * @var bool + */ + $parsedOptions = isset(static::$OPTIONS) ? false : true; + for (; $list->idx < $list->count; ++$list->idx) { /** @@ -75,12 +84,30 @@ abstract class Statement */ $class = null; + /** + * The name of the field where the result of the parsing is stored. + * @var string + */ + $field = null; + if (!empty(Parser::$KEYWORD_PARSERS[$token->value])) { - $class = Parser::$KEYWORD_PARSERS[$token->value]; - } elseif (!empty(Parser::$STATEMENT_PARSERS[$token->value])) { - // The keyword we are processing right now is the beginning of a - // statement and they are usually handled differently. - } else { + $class = Parser::$KEYWORD_PARSERS[$token->value]['class']; + $field = Parser::$KEYWORD_PARSERS[$token->value]['field']; + } + + if (!empty(Parser::$STATEMENT_PARSERS[$token->value])) { + if (!$parsedOptions) { + ++$list->idx; // Skipping keyword. + $this->options = OptionsFragment::parse( + $parser, + $list, + static::$OPTIONS + ); + $parsedOptions = true; + } + } else if ($class === null) { + // There is no parser for this keyword and isn't the beggining + // of a statement (so no options) either. $parser->error( 'Unrecognized keyword "' . $token->value . '".', $token @@ -88,26 +115,8 @@ abstract class Statement continue; } - /** - * The name of the field where the result is stored. - * @var string - */ - $field = strtolower($token->value); - - // Parsing options. - if (($class == null) && (isset(static::$OPTIONS))) { - ++$list->idx; // Skipping keyword. - $this->options = OptionsFragment::parse( - $parser, $list, - static::$OPTIONS - ); - } - - // Keyword specific code. - if ($token->value === 'CALL') { - ++$list->idx; - $this->call = CallKeyword::parse($parser, $list); - } elseif ($token->value === 'CREATE') { + // Special cases. + if ($token->value === 'CREATE') { ++$list->idx; $this->name = CreateDefFragment::parse($parser, $list); if ($this->options->has('TABLE')) { @@ -158,23 +167,10 @@ abstract class Statement } $class = null; // The statement has been processed here. } - } elseif (($token->value === 'GROUP') - || ($token->value === 'ORDER') - ) { - $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'BY'); - } elseif ($token->value === 'RENAME') { + } else if ($token->value === 'RENAME') { $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); - ++$list->idx; - $this->renames = RenameKeyword::parse($parser, $list); - } elseif ($token->value === 'SELECT') { - ++$list->idx; // Skipping last option. - $this->expr = SelectKeyword::parse($parser, $list); - } elseif ($token->value === 'UPDATE') { - ++$list->idx; // Skipping last option. - $this->from = FromKeyword::parse($parser, $list); } - // Finally, processing the keyword (if possible). if ($class !== null) { ++$list->idx; // Skipping keyword. $this->$field = $class::parse($parser, $list, array()); diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 4e818c6789..4332ae0642 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -2,7 +2,7 @@ namespace SqlParser\Utils; -use SqlParser\Statements\SelectStatement; +use SqlParser\Statement; /** * Miscellaneous utilities. @@ -19,13 +19,17 @@ class Misc /** * Gets a list of all aliases and their original names. * - * @param SelectStatement $tree The tree that was generated after parsing. - * @param string $database The name of the database. + * @param Statement $tree The tree that was generated after parsing. + * @param string $database The name of the database. * * @return array */ - public static function getAliases(SelectStatement $tree, $database) + public static function getAliases(Statement $tree, $database) { + if ((empty($tree->from)) || (empty($tree->expr))) { + return array(); + } + $retval = array(); $tables = array(); diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 8be7db1260..740ace371a 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -4,9 +4,9 @@ namespace SqlParser\Utils; use SqlParser\Lexer; use SqlParser\Parser; +use SqlParser\Statement; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; -use SqlParser\Statements\CreateStatement; /** * Routine utilities. @@ -89,11 +89,11 @@ class Routine /** * Gets the parameters of a routine from the parse tree. * - * @param CreateStatement $tree The tree that was generated after parsing. + * @param Statement $tree The tree that was generated after parsing. * * @return array */ - public static function getParameters(CreateStatement $tree) + public static function getParameters(Statement $tree) { $retval = array( 'num' => 0, @@ -105,23 +105,25 @@ class Routine 'opts' => array(), ); - $idx = 0; - foreach ($tree->parameters as $param) { - $retval['dir'][$idx] = $param->inOut; - $retval['name'][$idx] = $param->name; - $retval['type'][$idx] = $param->type->name; - $retval['length'][$idx] = implode(',', $param->type->parameters); - $retval['length_arr'][$idx] = $param->type->parameters; - $retval['opts'][$idx] = array(); - foreach ($param->type->options->options as $opt) { - $retval['opts'][$idx][] = is_string($opt) ? - $opt : $opt['value']; + if (!empty($tree->parameters)) { + $idx = 0; + foreach ($tree->parameters as $param) { + $retval['dir'][$idx] = $param->inOut; + $retval['name'][$idx] = $param->name; + $retval['type'][$idx] = $param->type->name; + $retval['length'][$idx] = implode(',', $param->type->parameters); + $retval['length_arr'][$idx] = $param->type->parameters; + $retval['opts'][$idx] = array(); + foreach ($param->type->options->options as $opt) { + $retval['opts'][$idx][] = is_string($opt) ? + $opt : $opt['value']; + } + $retval['opts'][$idx] = implode(' ', $retval['opts'][$idx]); + ++$idx; } - $retval['opts'][$idx] = implode(' ', $retval['opts'][$idx]); - ++$idx; - } - $retval['num'] = $idx; + $retval['num'] = $idx; + } return $retval; } diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index a814075459..7be3eac5b9 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -4,9 +4,9 @@ namespace SqlParser\Utils; use SqlParser\Lexer; use SqlParser\Parser; +use SqlParser\Statement; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; -use SqlParser\Statements\CreateStatement; /** * Table utilities. @@ -20,9 +20,9 @@ use SqlParser\Statements\CreateStatement; class Table { - public static function getForeignKeys(CreateStatement $tree) + public static function getForeignKeys(Statement $tree) { - if (($tree->fields === null) || (!$tree->options->has('TABLE'))) { + if ((empty($tree->fields)) || (!$tree->options->has('TABLE'))) { return array(); } @@ -63,9 +63,9 @@ class Table return $ret; } - public static function getFields(CreateStatement $tree) + public static function getFields(Statement $tree) { - if (($tree->fields === null) || (!$tree->options->has('TABLE'))) { + if ((empty($tree->fields)) || (!$tree->options->has('TABLE'))) { return array(); } From 3c9aeef364c71e32da76f40f37af90f9cd76ed04 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 25 Jun 2015 20:08:49 +0300 Subject: [PATCH 23/57] Updated sql-parser library. Refactoring and coding style fixes. Signed-off-by: Dan Ungureanu --- libraries/relation.lib.php | 6 +- libraries/rte/rte_list.lib.php | 8 +- libraries/rte/rte_routines.lib.php | 16 +- libraries/sql-parser/autoload.php | 59 +++- libraries/sql-parser/composer/ClassLoader.php | 100 +++--- .../sql-parser/composer/autoload_psr4.php | 8 - .../sql-parser/composer/autoload_real.php | 38 --- .../src/Contexts/ContextMySql50000.php | 243 +++++++++----- .../src/Contexts/ContextMySql50100.php | 269 +++++++++------ .../src/Contexts/ContextMySql50500.php | 270 +++++++++------ .../src/Contexts/ContextMySql50600.php | 306 +++++++++++------ .../src/Contexts/ContextMySql50700.php | 313 ++++++++++++------ .../src/Fragments/FieldFragment.php | 61 ++++ .../sql-parser/src/Fragments/IntoKeyword.php | 42 ++- .../sql-parser/src/Fragments/KeyFragment.php | 7 + .../sql-parser/src/Fragments/LimitKeyword.php | 2 +- .../src/Fragments/OptionsFragment.php | 17 + libraries/sql-parser/src/Parser.php | 63 +++- libraries/sql-parser/src/Statement.php | 63 +++- .../src/Statements/AlterStatement.php | 48 +++ .../src/Statements/AnalyzeStatement.php | 50 +++ .../src/Statements/BackupStatement.php | 51 +++ .../src/Statements/CheckStatement.php | 53 +++ .../src/Statements/ChecsumStatement.php | 49 +++ .../src/Statements/CreateStatement.php | 26 +- .../src/Statements/DropStatement.php | 57 ++++ .../src/Statements/ExplainStatement.php | 19 ++ .../src/Statements/OptimizeStatement.php | 50 +++ .../src/Statements/RepairStatement.php | 55 +++ .../src/Statements/RestoreStatement.php | 48 +++ .../src/Statements/SelectStatement.php | 14 + .../src/Statements/ShowStatement.php | 76 +++++ libraries/sql-parser/src/Token.php | 1 + libraries/sql-parser/src/Utils/Misc.php | 7 +- libraries/sql-parser/src/Utils/Query.php | 131 ++++++++ libraries/sql-parser/src/Utils/Routine.php | 5 +- libraries/sql-parser/src/Utils/Table.php | 19 +- tbl_structure.php | 8 +- 38 files changed, 2035 insertions(+), 623 deletions(-) delete mode 100644 libraries/sql-parser/composer/autoload_psr4.php delete mode 100644 libraries/sql-parser/composer/autoload_real.php create mode 100644 libraries/sql-parser/src/Statements/AlterStatement.php create mode 100644 libraries/sql-parser/src/Statements/AnalyzeStatement.php create mode 100644 libraries/sql-parser/src/Statements/BackupStatement.php create mode 100644 libraries/sql-parser/src/Statements/CheckStatement.php create mode 100644 libraries/sql-parser/src/Statements/ChecsumStatement.php create mode 100644 libraries/sql-parser/src/Statements/DropStatement.php create mode 100644 libraries/sql-parser/src/Statements/ExplainStatement.php create mode 100644 libraries/sql-parser/src/Statements/OptimizeStatement.php create mode 100644 libraries/sql-parser/src/Statements/RepairStatement.php create mode 100644 libraries/sql-parser/src/Statements/RestoreStatement.php create mode 100644 libraries/sql-parser/src/Statements/ShowStatement.php create mode 100644 libraries/sql-parser/src/Utils/Query.php diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 340db7d238..aac34cbdac 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -741,7 +741,11 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') ); if ($show_create_table) { $parser = new SqlParser\Parser($show_create_table); - $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys($parser->statements[0]); + /** + * @var CreateStatement $stmt + */ + $stmt = $parser->statements[0]; + $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys($stmt); } } diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index be509c7eb7..79abd376b5 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -228,7 +228,13 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') $routine['name'] ) ); - $params = SqlParser\Utils\Routine::getParameters($parser->statements[0]); + + /** + * @var CreateStatement $stmt + */ + $stmt = $parser->statements[0]; + + $params = SqlParser\Utils\Routine::getParameters($stmt); if ($routine !== false) { if (PMA_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 8cb00379a0..2671d620fe 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -517,9 +517,13 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) $routine['SPECIFIC_NAME'] ) ); - $routineStatement = $parser->statements[0]; - $params = SqlParser\Utils\Routine::getParameters($routineStatement); + /** + * @var CreateStatement $stmt + */ + $stmt = $parser->statements[0]; + + $params = SqlParser\Utils\Routine::getParameters($stmt); $retval['item_num_params'] = $params['num']; $retval['item_param_dir'] = $params['dir']; $retval['item_param_name'] = $params['name']; @@ -546,17 +550,17 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) if (! empty($routine['DTD_IDENTIFIER'])) { $options = array(); - foreach ($routineStatement->return->options->options as $opt) { + foreach ($stmt->return->options->options as $opt) { $options[] = is_string($opt) ? $opt : $opt['value']; } - $retval['item_returntype'] = $routineStatement->return->name; - $retval['item_returnlength'] = implode(',', $routineStatement->return->size); + $retval['item_returntype'] = $stmt->return->name; + $retval['item_returnlength'] = implode(',', $stmt->return->size); $retval['item_returnopts_num'] = implode(' ', $options); $retval['item_returnopts_text'] = implode(' ', $options); } - $retval['item_definer'] = $routineStatement->options->has('DEFINER'); + $retval['item_definer'] = $stmt->options->has('DEFINER'); $retval['item_definition'] = $routine['ROUTINE_DEFINITION']; $retval['item_isdeterministic'] = ''; if ($routine['IS_DETERMINISTIC'] == 'YES') { diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php index 0e42d154fd..882015deaf 100644 --- a/libraries/sql-parser/autoload.php +++ b/libraries/sql-parser/autoload.php @@ -1,5 +1,60 @@ $path) { + $loader->setPsr4($namespace, $path); + } + + $loader->register(true); + + return $loader; + } +} + +// Initializing Composer's autoloader +return ComposerAutoloaderInit::getLoader( + array( + 'SqlParser\\' => array(dirname(__FILE__) . '/src'), + ) +); diff --git a/libraries/sql-parser/composer/ClassLoader.php b/libraries/sql-parser/composer/ClassLoader.php index 48ee07c4f5..d2fd53f82d 100644 --- a/libraries/sql-parser/composer/ClassLoader.php +++ b/libraries/sql-parser/composer/ClassLoader.php @@ -1,6 +1,6 @@ @@ -43,50 +43,23 @@ namespace Composer\Autoload; class ClassLoader { // PSR-4 - private $prefixLengthsPsr4 = array(); - private $prefixDirsPsr4 = array(); - private $fallbackDirsPsr4 = array(); + public $prefixLengthsPsr4 = array(); + public $prefixDirsPsr4 = array(); + public $fallbackDirsPsr4 = array(); // PSR-0 - private $prefixesPsr0 = array(); - private $fallbackDirsPsr0 = array(); + public $prefixesPsr0 = array(); + public $fallbackDirsPsr0 = array(); - private $useIncludePath = false; - private $classMap = array(); + public $useIncludePath = false; + public $classMap = array(); - private $classMapAuthoritative = false; - - public function getPrefixes() - { - if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); - } - - return array(); - } - - public function getPrefixesPsr4() - { - return $this->prefixDirsPsr4; - } - - public function getFallbackDirs() - { - return $this->fallbackDirsPsr0; - } - - public function getFallbackDirsPsr4() - { - return $this->fallbackDirsPsr4; - } - - public function getClassMap() - { - return $this->classMap; - } + public $classMapAuthoritative = false; /** * @param array $classMap Class to filename map + * + * @return void */ public function addClassMap(array $classMap) { @@ -104,6 +77,8 @@ class ClassLoader * @param string $prefix The prefix * @param array|string $paths The PSR-0 root directories * @param bool $prepend Whether to prepend the directories + * + * @return void */ public function add($prefix, $paths, $prepend = false) { @@ -151,6 +126,8 @@ class ClassLoader * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException + * + * @return void */ public function addPsr4($prefix, $paths, $prepend = false) { @@ -196,6 +173,8 @@ class ClassLoader * * @param string $prefix The prefix * @param array|string $paths The PSR-0 base directories + * + * @return void */ public function set($prefix, $paths) { @@ -214,6 +193,8 @@ class ClassLoader * @param array|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException + * + * @return void */ public function setPsr4($prefix, $paths) { @@ -233,6 +214,8 @@ class ClassLoader * Turns on searching the include path for class files. * * @param bool $useIncludePath + * + * @return void */ public function setUseIncludePath($useIncludePath) { @@ -255,6 +238,8 @@ class ClassLoader * that have not been registered with the class map. * * @param bool $classMapAuthoritative + * + * @return void */ public function setClassMapAuthoritative($classMapAuthoritative) { @@ -275,6 +260,8 @@ class ClassLoader * Registers this instance as an autoloader. * * @param bool $prepend Whether to prepend the autoloader or not + * + * @return void */ public function register($prepend = false) { @@ -283,6 +270,8 @@ class ClassLoader /** * Unregisters this instance as an autoloader. + * + * @return void */ public function unregister() { @@ -293,6 +282,7 @@ class ClassLoader * Loads the given class or interface. * * @param string $class The name of the class + * * @return bool|null True if loaded, null otherwise */ public function loadClass($class) @@ -341,7 +331,16 @@ class ClassLoader return $file; } - private function findFileWithExtension($class, $ext) + /** + * Finds a file that defines the specified class and has the specified + * extension. + * + * @param string $class + * @param string $ext + * + * @return string + */ + public function findFileWithExtension($class, $ext) { // PSR-4 lookup $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; @@ -402,12 +401,19 @@ class ClassLoader } } -/** - * Scope isolated include. - * - * Prevents access to $this/self from included files. - */ -function includeFile($file) -{ - include $file; +if (!function_exists('Composer\Autoload\includeFile')) { + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * + * @return void + */ + function includeFile($file) + { + include $file; + } } diff --git a/libraries/sql-parser/composer/autoload_psr4.php b/libraries/sql-parser/composer/autoload_psr4.php deleted file mode 100644 index 756ce5f0a8..0000000000 --- a/libraries/sql-parser/composer/autoload_psr4.php +++ /dev/null @@ -1,8 +0,0 @@ - array($vendorDir . '/src'), -); diff --git a/libraries/sql-parser/composer/autoload_real.php b/libraries/sql-parser/composer/autoload_real.php deleted file mode 100644 index 4972d8f566..0000000000 --- a/libraries/sql-parser/composer/autoload_real.php +++ /dev/null @@ -1,38 +0,0 @@ - $path) { - $loader->setPsr4($namespace, $path); - } - - $loader->register(true); - - return $loader; - } -} - -function composerRequire($file) -{ - require $file; -} diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index 63f4ca2780..d4b80e1f61 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -34,121 +34,111 @@ class ContextMySql50000 extends Context public static $KEYWORDS = array( 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, - 'ANY' => 1, 'AVG' => 1, 'BDB' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, - 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'ANY' => 1, 'BDB' => 1, 'BIT' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, + 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'FAST' => 1, - 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, 'HOUR' => 1, 'LAST' => 1, - 'LOGS' => 1, 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, - 'PAGE' => 1, 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, 'TYPE' => 1, - 'USER' => 1, 'VIEW' => 1, 'WEEK' => 1, 'WORK' => 1, 'X509' => 1, - 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, - 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'FIRST' => 1, 'FIXED' => 1, - 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, - 'LOCKS' => 1, 'MERGE' => 1, 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, - 'NCHAR' => 1, 'PHASE' => 1, 'POINT' => 1, 'QUERY' => 1, 'QUICK' => 1, - 'RAID0' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, - 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, - 'VALUE' => 1, + 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, 'LAST' => 1, 'LOGS' => 1, + 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1, + 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, 'TYPE' => 1, 'VIEW' => 1, + 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1, + 'CHAIN' => 1, 'CLOSE' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, + 'FOUND' => 1, 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, + 'MERGE' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'PHASE' => 1, + 'QUERY' => 1, 'QUICK' => 1, 'RAID0' => 1, 'RESET' => 1, 'RTREE' => 1, + 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, + 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1, 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, 'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, - 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'OFFSET' => 1, - 'RELOAD' => 1, 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, - 'SERIAL' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, - 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, - 'AGAINST' => 1, 'CHANGED' => 1, 'CHARSET' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, - 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, - 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, 'INDEXES' => 1, - 'INVOKER' => 1, 'MIGRATE' => 1, 'PARTIAL' => 1, 'POLYGON' => 1, 'PREPARE' => 1, - 'PROFILE' => 1, 'QUARTER' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, - 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'STRIPED' => 1, 'SUBJECT' => 1, - 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, - 'CASCADED' => 1, 'CHECKSUM' => 1, 'CONTAINS' => 1, 'DUMPFILE' => 1, - 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, - 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, - 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PROFILES' => 1, - 'ROLLBACK' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, - 'SWITCHES' => 1, 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'WARNINGS' => 1, - 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, - 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, - 'ISOLATION' => 1, 'PACK_KEYS' => 1, 'RAID_TYPE' => 1, 'REDUNDANT' => 1, - 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, - 'UNDEFINED' => 1, 'VARIABLES' => 1, + 'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'OFFSET' => 1, 'RELOAD' => 1, + 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, 'SERIAL' => 1, 'SIGNED' => 1, + 'SIMPLE' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STATUS' => 1, 'STRING' => 1, + 'TABLES' => 1, + 'AGAINST' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, + 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, + 'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INVOKER' => 1, + 'MIGRATE' => 1, 'PARTIAL' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'RECOVER' => 1, + 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, + 'STRIPED' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, + 'UPGRADE' => 1, 'USE_FRM' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1, + 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, + 'MAX_ROWS' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, + 'ONE_SHOT' => 1, 'PROFILES' => 1, 'ROLLBACK' => 1, 'SECURITY' => 1, + 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, 'TRIGGERS' => 1, + 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, + 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, + 'PACK_KEYS' => 1, 'RAID_TYPE' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, + 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, + 'VARIABLES' => 1, 'BERKELEYDB' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, - 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, - 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, - 'PRIVILEGES' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, - 'TABLESPACE' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1, + 'NDBCLUSTER' => 1, 'PRIVILEGES' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, + 'SQL_THREAD' => 1, 'TABLESPACE' => 1, 'FRAC_SECOND' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, - 'MICROSECOND' => 1, 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, 'REPLICATION' => 1, - 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, - 'DES_KEY_FILE' => 1, 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, - 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, - 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, - 'TIMESTAMPADD' => 1, + 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, 'REPLICATION' => 1, 'SQL_TSI_DAY' => 1, + 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'DES_KEY_FILE' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, + 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, + 'SQL_TSI_YEAR' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1, - 'SQL_TSI_MONTH' => 1, 'TIMESTAMPDIFF' => 1, + 'SQL_TSI_MONTH' => 1, 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RAID_CHUNKSIZE' => 1, 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'USER_RESOURCES' => 1, 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, - 'MASTER_SSL_CERT' => 1, 'MULTILINESTRING' => 1, 'SQL_TSI_QUARTER' => 1, + 'MASTER_SSL_CERT' => 1, 'SQL_TSI_QUARTER' => 1, 'MASTER_SERVER_ID' => 1, 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1, - 'GEOMETRYCOLLECTION' => 1, 'SQL_TSI_FRAC_SECOND' => 1, 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, 'MAX_CONNECTIONS_PER_HOUR' => 1, - 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, - 'TO' => 3, + 'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3, 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, - 'FOR' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, - 'USE' => 3, 'XOR' => 3, + 'FOR' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, 'USE' => 3, + 'XOR' => 3, 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, - 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, - 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, - 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3, + 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3, + 'WHEN' => 3, 'WITH' => 3, 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, - 'OUTER' => 3, 'PURGE' => 3, 'READS' => 3, 'RIGHT' => 3, 'RLIKE' => 3, - 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, - 'WHILE' => 3, 'WRITE' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'READS' => 3, 'RLIKE' => 3, 'TABLE' => 3, + 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, 'WHILE' => 3, + 'WRITE' => 3, 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, - 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'OPTION' => 3, - 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, 'REVOKE' => 3, - 'SCHEMA' => 3, 'SELECT' => 3, 'SONAME' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, - 'VALUES' => 3, - 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, - 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, - 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, - 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, - 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, - 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, - 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MODIFIES' => 3, - 'OPTIMIZE' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3, - 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'UTC_DATE' => 3, - 'UTC_TIME' => 3, 'ZEROFILL' => 3, - 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, - 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'OPTION' => 3, 'REGEXP' => 3, + 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3, 'SONAME' => 3, + 'UNLOCK' => 3, 'UPDATE' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3, + 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3, + 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3, + 'REQUIRE' => 3, 'SCHEMAS' => 3, 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3, + 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3, + 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, + 'TRAILING' => 3, 'UNSIGNED' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PRECISION' => 3, + 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, - 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, - 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, - 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'STRAIGHT_JOIN' => 3, + 'SQL_BIG_RESULT' => 3, 'DAY_MICROSECOND' => 3, 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, - 'CURRENT_TIMESTAMP' => 3, 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, @@ -162,19 +152,18 @@ class ContextMySql50000 extends Context 'GROUP BY' => 7, 'ORDER BY' => 7, 'XML' => 9, - 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ENUM' => 9, 'TEXT' => 9, 'ARRAY' => 9, 'BOOLEAN' => 9, 'DATETIME' => 9, 'MULTISET' => 9, - 'TIMESTAMP' => 9, 'INT' => 11, 'SET' => 11, - 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'BLOB' => 11, 'REAL' => 11, 'FLOAT' => 11, 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, - 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, - 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11, + 'TINYTEXT' => 11, 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, @@ -191,5 +180,91 @@ class ContextMySql50000 extends Context 'SPATIAL INDEX' => 21, 'FULLTEXT INDEX' => 21, + 'X' => 33, 'Y' => 33, + 'LN' => 33, 'PI' => 33, + 'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33, + 'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33, + 'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33, + 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33, + 'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33, + 'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33, + 'SHA1' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'TRIM' => 33, 'USER' => 33, + 'UUID' => 33, 'WEEK' => 33, + 'ASCII' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'FIELD' => 33, + 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, + 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, 'POINT' => 33, 'POWER' => 33, + 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, 'SPACE' => 33, + 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33, + 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, + 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, + 'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33, + 'ADDDATE' => 33, 'ADDTIME' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, + 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, + 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, 'ISEMPTY' => 33, + 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, + 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, + 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, + 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, + 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, + 'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33, + 'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33, + 'PASSWORD' => 33, 'POSITION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33, + 'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33, + 'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33, + 'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33, + 'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33, + 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, + 'SUBSTRING' => 33, + 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, + 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, + 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'WEEKOFYEAR' => 33, + 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, + 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33, + 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, + 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, + 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33, + 'TIME_TO_SEC' => 33, + 'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'GEOMETRYTYPE' => 33, + 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33, 'IS_FREE_LOCK' => 33, + 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33, 'MLINEFROMWKB' => 33, + 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33, 'OCTET_LENGTH' => 33, + 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33, 'POLYFROMTEXT' => 33, + 'RELEASE_LOCK' => 33, 'SESSION_USER' => 33, 'TIMESTAMPADD' => 33, + 'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'INTERIORRINGN' => 33, + 'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33, + 'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33, + 'TIMESTAMPDIFF' => 33, + 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'UNIX_TIMESTAMP' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, + 'SUBSTRING_INDEX' => 33, + 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33, + 'GEOMETRYCOLLECTION' => 33, + 'UNCOMPRESSED_LENGTH' => 33, + + 'IF' => 35, 'IN' => 35, + 'MOD' => 35, + 'LEFT' => 35, + 'RIGHT' => 35, + 'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35, + 'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35, + 'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35, + 'LOCALTIME' => 35, + 'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35, + 'UTC_TIMESTAMP' => 35, + 'LOCALTIMESTAMP' => 35, + 'CURRENT_TIMESTAMP' => 35, + + 'NOT IN' => 37, + 'PROCEDURE ANALYSE' => 37, + + 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'TIMESTAMP' => 41, + + 'CHAR' => 43, + 'INTERVAL' => 43, + ); } diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index 265979f8b2..c6db3d5e8e 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -34,134 +34,121 @@ class ContextMySql50100 extends Context public static $KEYWORDS = array( 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, - 'ANY' => 1, 'AVG' => 1, 'BDB' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, - 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'ANY' => 1, 'BDB' => 1, 'BIT' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, + 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'GOTO' => 1, 'HASH' => 1, - 'HELP' => 1, 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, - 'LOGS' => 1, 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, - 'PAGE' => 1, 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, - 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WEEK' => 1, - 'WORK' => 1, 'X509' => 1, - 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, - 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'EVENT' => 1, 'EVERY' => 1, - 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, - 'LABEL' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, - 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, - 'PHASE' => 1, 'POINT' => 1, 'QUERY' => 1, 'QUICK' => 1, 'RAID0' => 1, - 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, - 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1, + 'HELP' => 1, 'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, + 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1, + 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, 'THAN' => 1, + 'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1, + 'CHAIN' => 1, 'CLOSE' => 1, 'EVENT' => 1, 'EVERY' => 1, 'FIRST' => 1, + 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, 'LABEL' => 1, + 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1, + 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, 'PHASE' => 1, 'QUERY' => 1, + 'QUICK' => 1, 'RAID0' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, + 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, + 'UNTIL' => 1, 'VALUE' => 1, 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, 'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, - 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'OFFSET' => 1, - 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, - 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, - 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, - 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, - 'AGAINST' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'CHARSET' => 1, 'COLUMNS' => 1, - 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, - 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, - 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, - 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'POLYGON' => 1, - 'PREPARE' => 1, 'PROFILE' => 1, 'QUARTER' => 1, 'REBUILD' => 1, 'RECOVER' => 1, - 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, - 'STRIPED' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, - 'UPGRADE' => 1, 'USE_FRM' => 1, 'WRAPPER' => 1, - 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, - 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, - 'GEOMETRY' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, 'MAXVALUE' => 1, - 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, - 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PRESERVE' => 1, - 'PROFILES' => 1, 'REDOFILE' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, - 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, - 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, - 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, - 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, - 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, - 'RAID_TYPE' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, - 'SCHEDULER' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, - 'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1, + 'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'OFFSET' => 1, 'PARSER' => 1, + 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1, + 'ROLLUP' => 1, 'SERIAL' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, + 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, + 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, + 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, + 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, 'INDEXES' => 1, + 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, + 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'PREPARE' => 1, 'PROFILE' => 1, + 'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, + 'SESSION' => 1, 'STORAGE' => 1, 'STRIPED' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, + 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, + 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, + 'LANGUAGE' => 1, 'MAXVALUE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, + 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, + 'PRESERVE' => 1, 'PROFILES' => 1, 'REDOFILE' => 1, 'ROLLBACK' => 1, + 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, + 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, + 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, + 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, 'RAID_TYPE' => 1, + 'READ_ONLY' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, 'SCHEDULER' => 1, + 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, + 'UNINSTALL' => 1, 'VARIABLES' => 1, 'BERKELEYDB' => 1, 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, - 'CONNECTION' => 1, 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, - 'IDENTIFIED' => 1, 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, - 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PRIVILEGES' => 1, 'REORGANISE' => 1, - 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, - 'TABLESPACE' => 1, + 'CONNECTION' => 1, 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, + 'MASTER_SSL' => 1, 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PRIVILEGES' => 1, + 'REORGANISE' => 1, 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, + 'SQL_THREAD' => 1, 'TABLESPACE' => 1, 'EXTENT_SIZE' => 1, 'FRAC_SECOND' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, - 'MASTER_USER' => 1, 'MICROSECOND' => 1, 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, - 'REPLICATION' => 1, 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'MASTER_USER' => 1, 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, 'REPLICATION' => 1, + 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, 'CONTRIBUTORS' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, - 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, 'PARTITIONING' => 1, - 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, - 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, - 'SUBPARTITION' => 1, 'TIMESTAMPADD' => 1, + 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, + 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, + 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'PAGE_CHECKSUM' => 1, 'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, - 'TIMESTAMPDIFF' => 1, 'TRANSACTIONAL' => 1, + 'TRANSACTIONAL' => 1, 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, 'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RAID_CHUNKSIZE' => 1, 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, 'AUTOEXTEND_SIZE' => 1, 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, - 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, 'MULTILINESTRING' => 1, - 'SQL_TSI_QUARTER' => 1, + 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, 'SQL_TSI_QUARTER' => 1, 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'UNDO_BUFFER_SIZE' => 1, 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1, - 'GEOMETRYCOLLECTION' => 1, 'SQL_TSI_FRAC_SECOND' => 1, 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, 'MAX_CONNECTIONS_PER_HOUR' => 1, - 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, - 'TO' => 3, + 'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3, 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, - 'FOR' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, - 'USE' => 3, 'XOR' => 3, + 'FOR' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, 'USE' => 3, + 'XOR' => 3, 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, - 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, - 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, - 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3, + 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3, + 'WHEN' => 3, 'WITH' => 3, 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, - 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, - 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, - 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, + 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, + 'WHILE' => 3, 'WRITE' => 3, 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, - 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, - 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, - 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, - 'VALUES' => 3, - 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, - 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, - 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, - 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, - 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, - 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, - 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MODIFIES' => 3, - 'OPTIMIZE' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3, - 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'UTC_DATE' => 3, - 'UTC_TIME' => 3, 'ZEROFILL' => 3, - 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, - 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3, + 'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3, + 'UNLOCK' => 3, 'UPDATE' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3, + 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3, + 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3, + 'REQUIRE' => 3, 'SCHEMAS' => 3, 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3, + 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3, + 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, + 'TRAILING' => 3, 'UNSIGNED' => 3, 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PRECISION' => 3, + 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, - 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, - 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, - 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'STRAIGHT_JOIN' => 3, + 'SQL_BIG_RESULT' => 3, 'DAY_MICROSECOND' => 3, 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, - 'CURRENT_TIMESTAMP' => 3, 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, @@ -176,19 +163,18 @@ class ContextMySql50100 extends Context 'GROUP BY' => 7, 'ORDER BY' => 7, 'XML' => 9, - 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ENUM' => 9, 'TEXT' => 9, 'ARRAY' => 9, 'BOOLEAN' => 9, 'DATETIME' => 9, 'MULTISET' => 9, - 'TIMESTAMP' => 9, 'INT' => 11, 'SET' => 11, - 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'BLOB' => 11, 'REAL' => 11, 'FLOAT' => 11, 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, - 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, - 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11, + 'TINYTEXT' => 11, 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, @@ -205,5 +191,102 @@ class ContextMySql50100 extends Context 'SPATIAL INDEX' => 21, 'FULLTEXT INDEX' => 21, + 'X' => 33, 'Y' => 33, + 'LN' => 33, 'PI' => 33, + 'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33, + 'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33, + 'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33, + 'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33, + 'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33, + 'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33, + 'SHA1' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'TRIM' => 33, 'USER' => 33, + 'UUID' => 33, 'WEEK' => 33, + 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, + 'CRC32' => 33, 'DECOD' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, + 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, + 'MONTH' => 33, 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, + 'RTRIM' => 33, 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, + 'UPPER' => 33, + 'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'ENCODE' => 33, 'EQUALS' => 33, + 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33, + 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, 'STDDEV' => 33, + 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33, + 'ADDDATE' => 33, 'ADDTIME' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, + 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, + 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, 'ISEMPTY' => 33, + 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, + 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, + 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, + 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, + 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, + 'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33, + 'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33, + 'PASSWORD' => 33, 'POSITION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33, + 'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33, + 'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33, + 'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33, + 'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33, + 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, + 'SUBSTRING' => 33, 'UPDATEXML' => 33, + 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, + 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, + 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, + 'WEEKOFYEAR' => 33, + 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, + 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33, + 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, + 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, + 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33, + 'TIME_TO_SEC' => 33, + 'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33, + 'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33, + 'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33, + 'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33, + 'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33, + 'POLYFROMTEXT' => 33, 'RELEASE_LOCK' => 33, 'SESSION_USER' => 33, + 'TIMESTAMPADD' => 33, + 'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'INTERIORRINGN' => 33, + 'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33, + 'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33, + 'TIMESTAMPDIFF' => 33, + 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, + 'UNIX_TIMESTAMP' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, + 'POLYGONFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, + 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, + 'NUMINTERIORRINGS' => 33, + 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, + 'GEOMETRYCOLLECTION' => 33, 'MULTIPOINTFROMTEXT' => 33, + 'MULTIPOLYGONFROMWKB' => 33, 'UNCOMPRESSED_LENGTH' => 33, + 'MULTIPOLYGONFROMTEXT' => 33, + 'MULTILINESTRINGFROMWKB' => 33, + 'MULTILINESTRINGFROMTEXT' => 33, + 'GEOMETRYCOLLECTIONFROMWKB' => 33, + 'GEOMETRYCOLLECTIONFROMTEXT' => 33, + + 'IF' => 35, 'IN' => 35, + 'MOD' => 35, + 'LEFT' => 35, + 'RIGHT' => 35, + 'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35, + 'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35, + 'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35, + 'LOCALTIME' => 35, + 'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35, + 'UTC_TIMESTAMP' => 35, + 'LOCALTIMESTAMP' => 35, + 'CURRENT_TIMESTAMP' => 35, + + 'NOT IN' => 37, + 'PROCEDURE ANALYSE' => 37, + + 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'TIMESTAMP' => 41, + + 'CHAR' => 43, + 'INTERVAL' => 43, + ); } diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index 3a5496a9ba..26aa40e0bc 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -34,137 +34,126 @@ class ContextMySql50500 extends Context public static $KEYWORDS = array( 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, - 'ANY' => 1, 'AVG' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, 'END' => 1, - 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'ANY' => 1, 'BIT' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1, + 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, - 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, - 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1, - 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1, - 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WEEK' => 1, - 'WORK' => 1, 'X509' => 1, - 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, - 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, - 'EVERY' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, - 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, - 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, - 'PHASE' => 1, 'POINT' => 1, 'PROXY' => 1, 'QUERY' => 1, 'QUICK' => 1, - 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, - 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, - 'VALUE' => 1, + 'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, 'MODE' => 1, + 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1, 'PORT' => 1, + 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1, 'THAN' => 1, + 'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1, + 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, 'EVERY' => 1, + 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, + 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1, + 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, 'PHASE' => 1, 'PROXY' => 1, + 'QUERY' => 1, 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, + 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, + 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1, 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, 'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, - 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'OFFSET' => 1, - 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, - 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, - 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, - 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, - 'AGAINST' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'CHARSET' => 1, 'COLUMNS' => 1, - 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, - 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'GENERAL' => 1, - 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, - 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, - 'POLYGON' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'QUARTER' => 1, 'REBUILD' => 1, - 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, - 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, - 'UPGRADE' => 1, 'USE_FRM' => 1, 'WRAPPER' => 1, - 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, - 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, - 'GEOMETRY' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, - 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, - 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, - 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, - 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, - 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, - 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, - 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, - 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, - 'READ_ONLY' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, - 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, - 'VARIABLES' => 1, + 'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'OFFSET' => 1, 'PARSER' => 1, + 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1, + 'ROLLUP' => 1, 'SERIAL' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, + 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, + 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, + 'COMPACT' => 1, 'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, + 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'GENERAL' => 1, 'HANDLER' => 1, + 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, + 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'PREPARE' => 1, + 'PROFILE' => 1, 'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, + 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, + 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, + 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, + 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, + 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, + 'PROFILES' => 1, 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, + 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, + 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, + 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, + 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, 'READ_ONLY' => 1, + 'REDUNDANT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, + 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1, 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, - 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, - 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, - 'PARTITIONS' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, 'REPEATABLE' => 1, - 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, 'TABLE_NAME' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1, + 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, + 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, + 'TABLE_NAME' => 1, 'COLUMN_NAME' => 1, 'CURSOR_NAME' => 1, 'EXTENT_SIZE' => 1, 'FRAC_SECOND' => 1, - 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MICROSECOND' => 1, - 'MYSQL_ERRNO' => 1, 'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, - 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MYSQL_ERRNO' => 1, + 'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1, + 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, 'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'CONTRIBUTORS' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, 'MESSAGE_TEXT' => 1, - 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, 'PARTITIONING' => 1, - 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, - 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, - 'SUBPARTITION' => 1, 'TIMESTAMPADD' => 1, + 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, + 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, + 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1, - 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, 'TIMESTAMPDIFF' => 1, + 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, 'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, 'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, - 'MULTILINESTRING' => 1, 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1, + 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1, 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'UNDO_BUFFER_SIZE' => 1, 'CONSTRAINT_SCHEMA' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1, - 'CONSTRAINT_CATALOG' => 1, 'GEOMETRYCOLLECTION' => 1, + 'CONSTRAINT_CATALOG' => 1, 'SQL_TSI_FRAC_SECOND' => 1, 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, 'MASTER_HEARTBEAT_PERIOD' => 1, 'MAX_CONNECTIONS_PER_HOUR' => 1, - 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, - 'TO' => 3, + 'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3, 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, - 'FOR' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, - 'USE' => 3, 'XOR' => 3, + 'FOR' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, 'USE' => 3, + 'XOR' => 3, 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, - 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, - 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, - 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3, + 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3, + 'WHEN' => 3, 'WITH' => 3, 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, - 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, - 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, - 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, + 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, + 'WHILE' => 3, 'WRITE' => 3, 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, - 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, - 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, - 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'SIGNAL' => 3, 'UNLOCK' => 3, - 'UPDATE' => 3, 'VALUES' => 3, - 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, - 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, - 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, - 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, - 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, - 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, - 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, - 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, - 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, - 'UNSIGNED' => 3, 'UTC_DATE' => 3, 'UTC_TIME' => 3, 'ZEROFILL' => 3, - 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, - 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3, + 'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3, + 'SIGNAL' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3, + 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3, + 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3, + 'REQUIRE' => 3, 'SCHEMAS' => 3, 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3, + 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, 'MODIFIES' => 3, + 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, + 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, + 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PRECISION' => 3, + 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, - 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, - 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, - 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'STRAIGHT_JOIN' => 3, + 'SQL_BIG_RESULT' => 3, 'DAY_MICROSECOND' => 3, 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, - 'CURRENT_TIMESTAMP' => 3, 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, @@ -179,19 +168,18 @@ class ContextMySql50500 extends Context 'GROUP BY' => 7, 'ORDER BY' => 7, 'XML' => 9, - 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ENUM' => 9, 'TEXT' => 9, 'ARRAY' => 9, 'BOOLEAN' => 9, 'DATETIME' => 9, 'MULTISET' => 9, - 'TIMESTAMP' => 9, 'INT' => 11, 'SET' => 11, - 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'BLOB' => 11, 'REAL' => 11, 'FLOAT' => 11, 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, - 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, - 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11, + 'TINYTEXT' => 11, 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, @@ -208,5 +196,101 @@ class ContextMySql50500 extends Context 'SPATIAL INDEX' => 21, 'FULLTEXT INDEX' => 21, + 'X' => 33, 'Y' => 33, + 'LN' => 33, 'PI' => 33, + 'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33, + 'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33, + 'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33, + 'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33, + 'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33, + 'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33, + 'SHA1' => 33, 'SHA2' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'TRIM' => 33, + 'USER' => 33, 'UUID' => 33, 'WEEK' => 33, + 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, + 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, + 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, + 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, + 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33, + 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, + 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, + 'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33, + 'ADDDATE' => 33, 'ADDTIME' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, + 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, + 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, 'ISEMPTY' => 33, + 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, + 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, + 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, + 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, + 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, + 'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33, + 'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33, + 'PASSWORD' => 33, 'POSITION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33, + 'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33, + 'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33, + 'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33, + 'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33, + 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, + 'SUBSTRING' => 33, 'UPDATEXML' => 33, + 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, + 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, + 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, + 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, + 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, + 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33, + 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, + 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, + 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33, + 'TIME_TO_SEC' => 33, + 'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33, + 'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33, + 'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33, + 'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33, + 'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33, + 'POLYFROMTEXT' => 33, 'RELEASE_LOCK' => 33, 'SESSION_USER' => 33, + 'TIMESTAMPADD' => 33, + 'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'INTERIORRINGN' => 33, + 'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33, + 'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33, + 'TIMESTAMPDIFF' => 33, + 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, + 'UNIX_TIMESTAMP' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, + 'POLYGONFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, + 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, + 'NUMINTERIORRINGS' => 33, + 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, + 'GEOMETRYCOLLECTION' => 33, 'MULTIPOINTFROMTEXT' => 33, + 'MULTIPOLYGONFROMWKB' => 33, 'UNCOMPRESSED_LENGTH' => 33, + 'MULTIPOLYGONFROMTEXT' => 33, + 'MULTILINESTRINGFROMWKB' => 33, + 'MULTILINESTRINGFROMTEXT' => 33, + 'GEOMETRYCOLLECTIONFROMWKB' => 33, + 'GEOMETRYCOLLECTIONFROMTEXT' => 33, + + 'IF' => 35, 'IN' => 35, + 'MOD' => 35, + 'LEFT' => 35, + 'RIGHT' => 35, + 'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35, + 'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35, + 'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35, + 'LOCALTIME' => 35, + 'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35, + 'UTC_TIMESTAMP' => 35, + 'LOCALTIMESTAMP' => 35, + 'CURRENT_TIMESTAMP' => 35, + + 'NOT IN' => 37, + 'PROCEDURE ANALYSE' => 37, + + 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'TIMESTAMP' => 41, + + 'CHAR' => 43, + 'INTERVAL' => 43, + ); } diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index d9fcf715cd..39521ef196 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -34,148 +34,132 @@ class ContextMySql50600 extends Context public static $KEYWORDS = array( 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, - 'ANY' => 1, 'AVG' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, 'END' => 1, - 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, + 'ANY' => 1, 'BIT' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1, + 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, - 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, - 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, - 'PAGE' => 1, 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, - 'STOP' => 1, 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, - 'WEEK' => 1, 'WORK' => 1, 'X509' => 1, - 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, - 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, - 'EVERY' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, - 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, - 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, - 'PHASE' => 1, 'POINT' => 1, 'PROXY' => 1, 'QUERY' => 1, 'QUICK' => 1, - 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, - 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, - 'VALUE' => 1, + 'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, 'MODE' => 1, + 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, 'PAGE' => 1, + 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1, + 'THAN' => 1, 'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1, + 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, 'EVERY' => 1, + 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, + 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1, + 'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, 'PHASE' => 1, 'PROXY' => 1, + 'QUERY' => 1, 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, + 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, + 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1, 'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, 'EVENTS' => 1, 'EXPIRE' => 1, 'EXPORT' => 1, 'FAULTS' => 1, 'FIELDS' => 1, - 'FORMAT' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'ISSUER' => 1, - 'LEAVES' => 1, 'MASTER' => 1, 'MEDIUM' => 1, 'MEMORY' => 1, 'MINUTE' => 1, - 'MODIFY' => 1, 'NUMBER' => 1, 'OFFSET' => 1, 'PARSER' => 1, 'PLUGIN' => 1, - 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, - 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, - 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, - 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, - 'AGAINST' => 1, 'ANALYSE' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'CHARSET' => 1, - 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'CURRENT' => 1, - 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, - 'EXECUTE' => 1, 'GENERAL' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1, - 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1, - 'PARTIAL' => 1, 'PLUGINS' => 1, 'POLYGON' => 1, 'PREPARE' => 1, 'PROFILE' => 1, - 'QUARTER' => 1, 'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, - 'REVERSE' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, - 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, - 'WRAPPER' => 1, - 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, - 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXCHANGE' => 1, 'EXTENDED' => 1, - 'FUNCTION' => 1, 'GEOMETRY' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, - 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, - 'ONE_SHOT' => 1, 'PASSWORD' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, - 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, - 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, - 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, - 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, - 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, - 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, - 'REDUNDANT' => 1, 'ROW_COUNT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, - 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, - 'VARIABLES' => 1, + 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'ISSUER' => 1, 'LEAVES' => 1, + 'MASTER' => 1, 'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'NUMBER' => 1, + 'OFFSET' => 1, 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, + 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, 'SERIAL' => 1, 'SERVER' => 1, + 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, + 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'AGAINST' => 1, 'ANALYSE' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, + 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'CURRENT' => 1, 'DEFINER' => 1, + 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, + 'GENERAL' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, + 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, + 'PLUGINS' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'REBUILD' => 1, 'RECOVER' => 1, + 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, + 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, + 'USE_FRM' => 1, 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, + 'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, + 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, + 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, + 'PROFILES' => 1, 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, + 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, + 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, + 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, + 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1, + 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, + 'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1, 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, - 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, - 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, - 'PARTITIONS' => 1, 'PLUGIN_DIR' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, - 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, - 'TABLE_NAME' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1, + 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PLUGIN_DIR' => 1, 'PRIVILEGES' => 1, + 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, + 'TABLESPACE' => 1, 'TABLE_NAME' => 1, 'COLUMN_NAME' => 1, 'CURSOR_NAME' => 1, 'DIAGNOSTICS' => 1, 'EXTENT_SIZE' => 1, - 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MICROSECOND' => 1, - 'MYSQL_ERRNO' => 1, 'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, - 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, + 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MYSQL_ERRNO' => 1, + 'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1, + 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, 'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'CONTRIBUTORS' => 1, 'DEFAULT_AUTH' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, - 'MASTER_DELAY' => 1, 'MESSAGE_TEXT' => 1, 'MULTIPOLYGON' => 1, - 'OLD_PASSWORD' => 1, 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, - 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, - 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, - 'TIMESTAMPADD' => 1, + 'MASTER_DELAY' => 1, 'MESSAGE_TEXT' => 1, 'PARTITIONING' => 1, + 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, + 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, + 'SUBPARTITION' => 1, 'COLUMN_FORMAT' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, - 'TIMESTAMPDIFF' => 1, 'WEIGHT_STRING' => 1, 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, 'MASTER_LOG_POS' => 1, 'MASTER_SSL_CRL' => 1, 'MASTER_SSL_KEY' => 1, 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, 'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, - 'MULTILINESTRING' => 1, 'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, - 'SUBCLASS_ORIGIN' => 1, + 'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1, 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'SQL_BEFORE_GTIDS' => 1, 'STATS_PERSISTENT' => 1, 'UNDO_BUFFER_SIZE' => 1, 'CONSTRAINT_SCHEMA' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'RETURNED_SQLSTATE' => 1, 'SQL_BUFFER_RESULT' => 1, 'STATS_AUTO_RECALC' => 1, - 'CONSTRAINT_CATALOG' => 1, 'GEOMETRYCOLLECTION' => 1, 'MASTER_RETRY_COUNT' => 1, - 'MASTER_SSL_CRLPATH' => 1, 'SQL_AFTER_MTS_GAPS' => 1, 'STATS_SAMPLE_PAGES' => 1, + 'CONSTRAINT_CATALOG' => 1, 'MASTER_RETRY_COUNT' => 1, 'MASTER_SSL_CRLPATH' => 1, + 'SQL_AFTER_MTS_GAPS' => 1, 'STATS_SAMPLE_PAGES' => 1, 'MASTER_AUTO_POSITION' => 1, 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1, 'MASTER_HEARTBEAT_PERIOD' => 1, 'MAX_CONNECTIONS_PER_HOUR' => 1, - 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, - 'TO' => 3, + 'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3, 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, - 'FOR' => 3, 'GET' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, - 'SSL' => 3, 'USE' => 3, 'XOR' => 3, + 'FOR' => 3, 'GET' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, + 'USE' => 3, 'XOR' => 3, 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, - 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, - 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, - 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3, + 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3, + 'WHEN' => 3, 'WITH' => 3, 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, - 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, - 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, - 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, + 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, + 'WHILE' => 3, 'WRITE' => 3, 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, - 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, - 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, - 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'SIGNAL' => 3, 'UNLOCK' => 3, - 'UPDATE' => 3, 'VALUES' => 3, - 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, - 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, - 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, - 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, - 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, - 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, - 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, - 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, - 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, - 'UNSIGNED' => 3, 'UTC_DATE' => 3, 'UTC_TIME' => 3, 'ZEROFILL' => 3, - 'CONDITION' => 3, 'DATABASES' => 3, 'LOCALTIME' => 3, 'MIDDLEINT' => 3, - 'PARTITION' => 3, 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, - 'SEPARATOR' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3, + 'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3, + 'SIGNAL' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3, + 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3, + 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3, + 'REQUIRE' => 3, 'SCHEMAS' => 3, 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3, + 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, 'MODIFIES' => 3, + 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, + 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, + 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PARTITION' => 3, + 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3, 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, 'MASTER_BIND' => 3, - 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, - 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, - 'IO_AFTER_GTIDS' => 3, 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'STRAIGHT_JOIN' => 3, + 'IO_AFTER_GTIDS' => 3, 'SQL_BIG_RESULT' => 3, 'DAY_MICROSECOND' => 3, 'IO_BEFORE_GTIDS' => 3, 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, - 'CURRENT_TIMESTAMP' => 3, 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, @@ -190,19 +174,18 @@ class ContextMySql50600 extends Context 'GROUP BY' => 7, 'ORDER BY' => 7, 'XML' => 9, - 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ENUM' => 9, 'TEXT' => 9, 'ARRAY' => 9, 'BOOLEAN' => 9, 'DATETIME' => 9, 'MULTISET' => 9, - 'TIMESTAMP' => 9, 'INT' => 11, 'SET' => 11, - 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'BLOB' => 11, 'REAL' => 11, 'FLOAT' => 11, 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, - 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, - 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11, + 'TINYTEXT' => 11, 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, @@ -219,5 +202,126 @@ class ContextMySql50600 extends Context 'SPATIAL INDEX' => 21, 'FULLTEXT INDEX' => 21, + 'X' => 33, 'Y' => 33, + 'LN' => 33, 'PI' => 33, + 'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33, + 'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33, + 'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33, + 'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33, + 'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33, + 'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33, + 'SHA1' => 33, 'SHA2' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'ST_X' => 33, + 'ST_Y' => 33, 'TRIM' => 33, 'USER' => 33, 'UUID' => 33, 'WEEK' => 33, + 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, + 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, + 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, + 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, + 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'ASTEXT' => 33, 'BIT_OR' => 33, 'BUFFER' => 33, 'CONCAT' => 33, 'DECODE' => 33, + 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, + 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, + 'SECOND' => 33, 'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33, + 'ADDDATE' => 33, 'ADDTIME' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, + 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, + 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, 'ISEMPTY' => 33, + 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, + 'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, 'SUBDATE' => 33, + 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, 'VAR_POP' => 33, + 'VERSION' => 33, 'WEEKDAY' => 33, + 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, + 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, + 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, + 'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33, + 'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33, + 'PASSWORD' => 33, 'POSITION' => 33, 'ST_ASWKB' => 33, 'ST_ASWKT' => 33, + 'ST_UNION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33, 'VARIANCE' => 33, + 'VAR_SAMP' => 33, 'YEARWEEK' => 33, + 'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33, + 'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33, + 'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33, + 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, + 'ST_ASTEXT' => 33, 'ST_BUFFER' => 33, 'ST_EQUALS' => 33, 'ST_POINTN' => 33, + 'ST_WITHIN' => 33, 'SUBSTRING' => 33, 'TO_BASE64' => 33, 'UPDATEXML' => 33, + 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INET6_ATON' => 33, 'INET6_NTOA' => 33, + 'INTERSECTS' => 33, 'LINESTRING' => 33, 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, + 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, 'STDDEV_POP' => 33, + 'ST_CROSSES' => 33, 'ST_ISEMPTY' => 33, 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, + 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, + 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, + 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'FROM_BASE64' => 33, + 'GEOMFROMWKB' => 33, 'GTID_SUBSET' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, + 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, + 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, + 'ST_ASBINARY' => 33, 'ST_CENTROID' => 33, 'ST_CONTAINS' => 33, 'ST_DISJOINT' => 33, + 'ST_DISTANCE' => 33, 'ST_ENDPOINT' => 33, 'ST_ENVELOPE' => 33, 'ST_ISCLOSED' => 33, + 'ST_ISSIMPLE' => 33, 'ST_OVERLAPS' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33, + 'TIME_TO_SEC' => 33, + 'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33, + 'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33, + 'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33, + 'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33, + 'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33, + 'POLYFROMTEXT' => 33, 'RANDOM_BYTES' => 33, 'RELEASE_LOCK' => 33, + 'SESSION_USER' => 33, 'ST_DIMENSION' => 33, 'ST_GEOMETRYN' => 33, + 'ST_NUMPOINTS' => 33, 'TIMESTAMPADD' => 33, + 'CONNECTION_ID' => 33, 'CREATE_DIGEST' => 33, 'FROM_UNIXTIME' => 33, + 'GTID_SUBTRACT' => 33, 'INTERIORRINGN' => 33, 'MBRINTERSECTS' => 33, + 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33, 'MPOLYFROMTEXT' => 33, + 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33, 'ST_DIFFERENCE' => 33, + 'ST_INTERSECTS' => 33, 'ST_STARTPOINT' => 33, 'TIMESTAMPDIFF' => 33, + 'WEIGHT_STRING' => 33, + 'IS_IPV4_COMPAT' => 33, 'IS_IPV4_MAPPED' => 33, 'LAST_INSERT_ID' => 33, + 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'ST_GEOMFROMWKB' => 33, + 'ST_LINEFROMWKB' => 33, 'ST_POLYFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33, + 'ASYMMETRIC_SIGN' => 33, 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, + 'MULTILINESTRING' => 33, 'POLYGONFROMTEXT' => 33, 'ST_EXTERIORRING' => 33, + 'ST_GEOMETRYTYPE' => 33, 'ST_GEOMFROMTEXT' => 33, 'ST_INTERSECTION' => 33, + 'ST_LINEFROMTEXT' => 33, 'ST_POINTFROMWKB' => 33, 'ST_POLYFROMTEXT' => 33, + 'SUBSTRING_INDEX' => 33, + 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, + 'NUMINTERIORRINGS' => 33, 'ST_INTERIORRINGN' => 33, 'ST_NUMGEOMETRIES' => 33, + 'ST_POINTFROMTEXT' => 33, 'ST_SYMDIFFERENCE' => 33, + 'ASYMMETRIC_DERIVE' => 33, 'ASYMMETRIC_VERIFY' => 33, 'LINESTRINGFROMWKB' => 33, + 'MULTIPOINTFROMWKB' => 33, 'ST_POLYGONFROMWKB' => 33, + 'ASYMMETRIC_DECRYPT' => 33, 'ASYMMETRIC_ENCRYPT' => 33, 'GEOMETRYCOLLECTION' => 33, + 'MULTIPOINTFROMTEXT' => 33, 'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, + 'ST_POLYGONFROMTEXT' => 33, + 'MULTIPOLYGONFROMWKB' => 33, 'ST_GEOMCOLLFROMTEXT' => 33, 'ST_GEOMETRYFROMTEXT' => 33, + 'ST_NUMINTERIORRINGS' => 33, 'UNCOMPRESSED_LENGTH' => 33, + 'CREATE_DH_PARAMETERS' => 33, 'MULTIPOLYGONFROMTEXT' => 33, + 'ST_LINESTRINGFROMWKB' => 33, + 'MULTILINESTRINGFROMWKB' => 33, + 'MULTILINESTRINGFROMTEXT' => 33, + 'CREATE_ASYMMETRIC_PUB_KEY' => 33, 'GEOMETRYCOLLECTIONFROMWKB' => 33, + 'CREATE_ASYMMETRIC_PRIV_KEY' => 33, 'GEOMETRYCOLLECTIONFROMTEXT' => 33, + 'VALIDATE_PASSWORD_STRENGTH' => 33, + 'SQL_THREAD_WAIT_AFTER_GTIDS' => 33, + 'ST_GEOMETRYCOLLECTIONFROMWKB' => 33, + 'ST_GEOMETRYCOLLECTIONFROMTEXT' => 33, + 'WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS' => 33, + + 'IF' => 35, 'IN' => 35, + 'MOD' => 35, + 'LEFT' => 35, + 'RIGHT' => 35, + 'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35, + 'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35, + 'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35, + 'LOCALTIME' => 35, + 'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35, + 'UTC_TIMESTAMP' => 35, + 'LOCALTIMESTAMP' => 35, + 'CURRENT_TIMESTAMP' => 35, + + 'NOT IN' => 37, + 'PROCEDURE ANALYSE' => 37, + + 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'TIMESTAMP' => 41, + + 'CHAR' => 43, + 'INTERVAL' => 43, + ); } diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 808de0df49..99dae9e02e 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -34,95 +34,86 @@ class ContextMySql50700 extends Context public static $KEYWORDS = array( 'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1, - 'ANY' => 1, 'AVG' => 1, 'BIT' => 1, 'CPU' => 1, 'DAY' => 1, 'END' => 1, - 'IPC' => 1, 'NDB' => 1, 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'XID' => 1, + 'ANY' => 1, 'BIT' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1, + 'NEW' => 1, 'ONE' => 1, 'ROW' => 1, 'XID' => 1, 'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1, 'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, - 'HOST' => 1, 'HOUR' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, - 'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, - 'PAGE' => 1, 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, - 'STOP' => 1, 'THAN' => 1, 'TYPE' => 1, 'USER' => 1, 'VIEW' => 1, 'WAIT' => 1, - 'WEEK' => 1, 'WORK' => 1, 'X509' => 1, - 'AFTER' => 1, 'ASCII' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, - 'CACHE' => 1, 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, - 'EVERY' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, - 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, - 'MONTH' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'NEVER' => 1, - 'OWNER' => 1, 'PHASE' => 1, 'POINT' => 1, 'PROXY' => 1, 'QUERY' => 1, - 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1, - 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1, - 'UNTIL' => 1, 'VALUE' => 1, + 'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, 'MODE' => 1, + 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, 'PAGE' => 1, + 'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1, + 'THAN' => 1, 'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1, + 'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1, + 'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, 'EVERY' => 1, + 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, + 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1, + 'NAMES' => 1, 'NCHAR' => 1, 'NEVER' => 1, 'OWNER' => 1, 'PHASE' => 1, + 'PROXY' => 1, 'QUERY' => 1, 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, + 'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, + 'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1, 'ACTION' => 1, 'ALWAYS' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1, 'EVENTS' => 1, 'EXPIRE' => 1, 'EXPORT' => 1, 'FAULTS' => 1, - 'FIELDS' => 1, 'FILTER' => 1, 'FORMAT' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, - 'IMPORT' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, 'MEDIUM' => 1, - 'MEMORY' => 1, 'MINUTE' => 1, 'MODIFY' => 1, 'NUMBER' => 1, 'OFFSET' => 1, - 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, - 'RESUME' => 1, 'ROLLUP' => 1, 'SECOND' => 1, 'SERIAL' => 1, 'SERVER' => 1, - 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, - 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1, + 'FIELDS' => 1, 'FILTER' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, + 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, 'MEDIUM' => 1, 'MEMORY' => 1, + 'MODIFY' => 1, 'NUMBER' => 1, 'OFFSET' => 1, 'PARSER' => 1, 'PLUGIN' => 1, + 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, + 'SERIAL' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, + 'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, + 'STRING' => 1, 'TABLES' => 1, 'ACCOUNT' => 1, 'AGAINST' => 1, 'ANALYSE' => 1, 'CHANGED' => 1, 'CHANNEL' => 1, - 'CHARSET' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, - 'CURRENT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, - 'ENGINES' => 1, 'EXECUTE' => 1, 'FOLLOWS' => 1, 'GENERAL' => 1, 'HANDLER' => 1, - 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, - 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'POLYGON' => 1, - 'PREPARE' => 1, 'PROFILE' => 1, 'QUARTER' => 1, 'REBUILD' => 1, 'RECOVER' => 1, - 'RESTORE' => 1, 'RETURNS' => 1, 'REVERSE' => 1, 'ROUTINE' => 1, 'SESSION' => 1, - 'STACKED' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, - 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WITHOUT' => 1, 'WRAPPER' => 1, - 'CASCADED' => 1, 'CHECKSUM' => 1, 'COALESCE' => 1, 'CONTAINS' => 1, - 'DATAFILE' => 1, 'DUMPFILE' => 1, 'EXCHANGE' => 1, 'EXTENDED' => 1, - 'FUNCTION' => 1, 'GEOMETRY' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, - 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, - 'PASSWORD' => 1, 'PRECEDES' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, - 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, - 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, - 'TRIGGERS' => 1, 'TRUNCATE' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, - 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COLLATION' => 1, 'COMMITTED' => 1, - 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, - 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, - 'REDUNDANT' => 1, 'ROW_COUNT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, - 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, - 'VARIABLES' => 1, + 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'CURRENT' => 1, + 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, + 'EXECUTE' => 1, 'FOLLOWS' => 1, 'GENERAL' => 1, 'HANDLER' => 1, 'INDEXES' => 1, + 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, + 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'PREPARE' => 1, 'PROFILE' => 1, + 'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, + 'SESSION' => 1, 'STACKED' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, + 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WITHOUT' => 1, + 'WRAPPER' => 1, + 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, + 'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, + 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, + 'NATIONAL' => 1, 'NVARCHAR' => 1, 'PRECEDES' => 1, 'PRESERVE' => 1, + 'PROFILES' => 1, 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, + 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, + 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, + 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, + 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1, + 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, + 'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1, 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1, - 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'GET_FORMAT' => 1, 'IDENTIFIED' => 1, - 'LINESTRING' => 1, 'MASTER_SSL' => 1, 'MULTIPOINT' => 1, 'NDBCLUSTER' => 1, - 'PARTITIONS' => 1, 'PLUGIN_DIR' => 1, 'PRIVILEGES' => 1, 'REORGANIZE' => 1, - 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1, - 'TABLE_NAME' => 1, 'VALIDATION' => 1, + 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1, + 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PLUGIN_DIR' => 1, 'PRIVILEGES' => 1, + 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, + 'TABLESPACE' => 1, 'TABLE_NAME' => 1, 'VALIDATION' => 1, 'COLUMN_NAME' => 1, 'COMPRESSION' => 1, 'CURSOR_NAME' => 1, 'DIAGNOSTICS' => 1, 'EXTENT_SIZE' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, - 'MICROSECOND' => 1, 'MYSQL_ERRNO' => 1, 'NONBLOCKING' => 1, 'PROCESSLIST' => 1, - 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, - 'UNCOMMITTED' => 1, + 'MYSQL_ERRNO' => 1, 'NONBLOCKING' => 1, 'PROCESSLIST' => 1, 'REPLICATION' => 1, + 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1, 'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'DEFAULT_AUTH' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, 'MASTER_DELAY' => 1, - 'MESSAGE_TEXT' => 1, 'MULTIPOLYGON' => 1, 'OLD_PASSWORD' => 1, - 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, - 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, - 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, 'TIMESTAMPADD' => 1, + 'MESSAGE_TEXT' => 1, 'PARTITIONING' => 1, 'RELAY_THREAD' => 1, + 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, + 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1, 'COLUMN_FORMAT' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1, - 'TIMESTAMPDIFF' => 1, 'WEIGHT_STRING' => 1, 'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1, 'MASTER_LOG_POS' => 1, 'MASTER_SSL_CRL' => 1, 'MASTER_SSL_KEY' => 1, 'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1, 'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1, 'FILE_BLOCK_SIZE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, - 'MASTER_SSL_CERT' => 1, 'MULTILINESTRING' => 1, 'PARSE_GCOL_EXPR' => 1, - 'REPLICATE_DO_DB' => 1, 'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, - 'SUBCLASS_ORIGIN' => 1, + 'MASTER_SSL_CERT' => 1, 'PARSE_GCOL_EXPR' => 1, 'REPLICATE_DO_DB' => 1, + 'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1, 'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'SQL_BEFORE_GTIDS' => 1, 'STATS_PERSISTENT' => 1, 'UNDO_BUFFER_SIZE' => 1, 'CONSTRAINT_SCHEMA' => 1, 'GROUP_REPLICATION' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'RETURNED_SQLSTATE' => 1, 'SQL_BUFFER_RESULT' => 1, 'STATS_AUTO_RECALC' => 1, - 'CONSTRAINT_CATALOG' => 1, 'GEOMETRYCOLLECTION' => 1, 'MASTER_RETRY_COUNT' => 1, - 'MASTER_SSL_CRLPATH' => 1, 'MAX_STATEMENT_TIME' => 1, 'REPLICATE_DO_TABLE' => 1, - 'SQL_AFTER_MTS_GAPS' => 1, 'STATS_SAMPLE_PAGES' => 1, + 'CONSTRAINT_CATALOG' => 1, 'MASTER_RETRY_COUNT' => 1, 'MASTER_SSL_CRLPATH' => 1, + 'MAX_STATEMENT_TIME' => 1, 'REPLICATE_DO_TABLE' => 1, 'SQL_AFTER_MTS_GAPS' => 1, + 'STATS_SAMPLE_PAGES' => 1, 'REPLICATE_IGNORE_DB' => 1, 'MASTER_AUTO_POSITION' => 1, 'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1, @@ -132,55 +123,51 @@ class ContextMySql50700 extends Context 'MAX_CONNECTIONS_PER_HOUR' => 1, 'REPLICATE_WILD_IGNORE_TABLE' => 1, - 'AS' => 3, 'BY' => 3, 'IF' => 3, 'IN' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, - 'TO' => 3, + 'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3, 'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3, - 'FOR' => 3, 'GET' => 3, 'MOD' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, - 'SSL' => 3, 'USE' => 3, 'XOR' => 3, + 'FOR' => 3, 'GET' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, + 'USE' => 3, 'XOR' => 3, 'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3, 'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3, 'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3, - 'KILL' => 3, 'LEFT' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, - 'LOOP' => 3, 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, - 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3, + 'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3, + 'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3, + 'WHEN' => 3, 'WITH' => 3, 'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3, 'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3, 'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'MATCH' => 3, 'ORDER' => 3, - 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RIGHT' => 3, - 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, - 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3, + 'OUTER' => 3, 'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, + 'TABLE' => 3, 'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, + 'WHILE' => 3, 'WRITE' => 3, 'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3, 'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3, - 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'INSERT' => 3, 'LINEAR' => 3, - 'OPTION' => 3, 'REGEXP' => 3, 'RENAME' => 3, 'REPEAT' => 3, 'RETURN' => 3, - 'REVOKE' => 3, 'SCHEMA' => 3, 'SELECT' => 3, 'SIGNAL' => 3, 'STORED' => 3, - 'UNLOCK' => 3, 'UPDATE' => 3, 'VALUES' => 3, - 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'CONVERT' => 3, - 'DECLARE' => 3, 'DEFAULT' => 3, 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, - 'FOREIGN' => 3, 'ITERATE' => 3, 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, - 'PRIMARY' => 3, 'RELEASE' => 3, 'REPLACE' => 3, 'REQUIRE' => 3, 'SCHEMAS' => 3, - 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, 'VIRTUAL' => 3, - 'CONTINUE' => 3, 'DATABASE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, - 'DISTINCT' => 3, 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, - 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, - 'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, - 'UNSIGNED' => 3, 'UTC_DATE' => 3, 'UTC_TIME' => 3, 'ZEROFILL' => 3, - 'CONDITION' => 3, 'DATABASES' => 3, 'GENERATED' => 3, 'LOCALTIME' => 3, - 'MIDDLEINT' => 3, 'PARTITION' => 3, 'PRECISION' => 3, 'PROCEDURE' => 3, - 'SENSITIVE' => 3, 'SEPARATOR' => 3, + 'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3, + 'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3, + 'SIGNAL' => 3, 'STORED' => 3, 'UNLOCK' => 3, 'UPDATE' => 3, + 'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3, + 'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3, + 'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3, + 'REQUIRE' => 3, 'SCHEMAS' => 3, 'SPATIAL' => 3, 'TRIGGER' => 3, 'VARYING' => 3, + 'VIRTUAL' => 3, + 'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3, + 'ENCLOSED' => 3, 'FULLTEXT' => 3, 'MAXVALUE' => 3, 'MODIFIES' => 3, + 'OPTIMIZE' => 3, 'RESIGNAL' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, + 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, + 'ZEROFILL' => 3, + 'CONDITION' => 3, 'DATABASES' => 3, 'GENERATED' => 3, 'MIDDLEINT' => 3, + 'PARTITION' => 3, 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, + 'SEPARATOR' => 3, 'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3, 'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3, 'MASTER_BIND' => 3, - 'CURRENT_DATE' => 3, 'CURRENT_TIME' => 3, 'CURRENT_USER' => 3, 'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3, 'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3, - 'STRAIGHT_JOIN' => 3, 'UTC_TIMESTAMP' => 3, - 'IO_AFTER_GTIDS' => 3, 'LOCALTIMESTAMP' => 3, 'SQL_BIG_RESULT' => 3, + 'STRAIGHT_JOIN' => 3, + 'IO_AFTER_GTIDS' => 3, 'SQL_BIG_RESULT' => 3, 'DAY_MICROSECOND' => 3, 'IO_BEFORE_GTIDS' => 3, 'OPTIMIZER_COSTS' => 3, 'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3, - 'CURRENT_TIMESTAMP' => 3, 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, @@ -195,19 +182,18 @@ class ContextMySql50700 extends Context 'GROUP BY' => 7, 'ORDER BY' => 7, 'XML' => 9, - 'DATE' => 9, 'ENUM' => 9, 'TEXT' => 9, 'TIME' => 9, 'YEAR' => 9, + 'ENUM' => 9, 'TEXT' => 9, 'ARRAY' => 9, 'BOOLEAN' => 9, 'DATETIME' => 9, 'MULTISET' => 9, - 'TIMESTAMP' => 9, 'INT' => 11, 'SET' => 11, - 'BLOB' => 11, 'CHAR' => 11, 'REAL' => 11, + 'BLOB' => 11, 'REAL' => 11, 'FLOAT' => 11, 'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11, 'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11, - 'INTERVAL' => 11, 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, - 'TINYBLOB' => 11, 'TINYTEXT' => 11, + 'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11, + 'TINYTEXT' => 11, 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, @@ -224,5 +210,130 @@ class ContextMySql50700 extends Context 'SPATIAL INDEX' => 21, 'FULLTEXT INDEX' => 21, + 'X' => 33, 'Y' => 33, + 'LN' => 33, 'PI' => 33, + 'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33, + 'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33, + 'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33, + 'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33, + 'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33, + 'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33, + 'SHA1' => 33, 'SHA2' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'ST_X' => 33, + 'ST_Y' => 33, 'TRIM' => 33, 'USER' => 33, 'UUID' => 33, 'WEEK' => 33, + 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, + 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, + 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, + 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, + 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'ASTEXT' => 33, 'BIT_OR' => 33, 'BUFFER' => 33, 'CONCAT' => 33, 'DECODE' => 33, + 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, + 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, + 'SECOND' => 33, 'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33, + 'ADDDATE' => 33, 'ADDTIME' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, + 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, + 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, 'ISEMPTY' => 33, + 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, + 'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, 'SUBDATE' => 33, + 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, 'VAR_POP' => 33, + 'VERSION' => 33, 'WEEKDAY' => 33, + 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, + 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, + 'DISJOINT' => 33, 'DISTANCE' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, + 'GET_LOCK' => 33, 'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, + 'MAKEDATE' => 33, 'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, + 'OVERLAPS' => 33, 'PASSWORD' => 33, 'POSITION' => 33, 'ST_ASWKB' => 33, + 'ST_ASWKT' => 33, 'ST_UNION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33, + 'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33, + 'ANY_VALUE' => 33, 'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, + 'CONCAT_WS' => 33, 'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, + 'FROM_DAYS' => 33, 'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, + 'LOAD_FILE' => 33, 'MBRCOVERS' => 33, 'MBREQUALS' => 33, 'MBRWITHIN' => 33, + 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, 'ST_ASTEXT' => 33, + 'ST_BUFFER' => 33, 'ST_EQUALS' => 33, 'ST_LENGTH' => 33, 'ST_POINTN' => 33, + 'ST_WITHIN' => 33, 'SUBSTRING' => 33, 'TO_BASE64' => 33, 'UPDATEXML' => 33, + 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'CONVEXHULL' => 33, 'DAYOFMONTH' => 33, + 'EXPORT_SET' => 33, 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INET6_ATON' => 33, + 'INET6_NTOA' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, 'MBRTOUCHES' => 33, + 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, + 'STDDEV_POP' => 33, 'ST_CROSSES' => 33, 'ST_GEOHASH' => 33, 'ST_ISEMPTY' => 33, + 'ST_ISVALID' => 33, 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, + 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, + 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, + 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'FROM_BASE64' => 33, + 'GEOMFROMWKB' => 33, 'GTID_SUBSET' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, + 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, + 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, + 'ST_ASBINARY' => 33, 'ST_CENTROID' => 33, 'ST_CONTAINS' => 33, 'ST_DISJOINT' => 33, + 'ST_DISTANCE' => 33, 'ST_ENDPOINT' => 33, 'ST_ENVELOPE' => 33, 'ST_ISCLOSED' => 33, + 'ST_ISSIMPLE' => 33, 'ST_OVERLAPS' => 33, 'ST_SIMPLIFY' => 33, 'ST_VALIDATE' => 33, + 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33, 'TIME_TO_SEC' => 33, + 'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33, + 'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33, + 'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33, + 'MBRCOVEREDBY' => 33, 'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, + 'MULTIPOLYGON' => 33, 'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, + 'POINTFROMWKB' => 33, 'POLYFROMTEXT' => 33, 'RANDOM_BYTES' => 33, + 'RELEASE_LOCK' => 33, 'SESSION_USER' => 33, 'ST_ASGEOJSON' => 33, + 'ST_DIMENSION' => 33, 'ST_GEOMETRYN' => 33, 'ST_NUMPOINTS' => 33, + 'TIMESTAMPADD' => 33, + 'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'GTID_SUBTRACT' => 33, + 'INTERIORRINGN' => 33, 'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, + 'MPOINTFROMWKB' => 33, 'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, + 'POINTFROMTEXT' => 33, 'ST_CONVEXHULL' => 33, 'ST_DIFFERENCE' => 33, + 'ST_INTERSECTS' => 33, 'ST_STARTPOINT' => 33, 'TIMESTAMPDIFF' => 33, + 'WEIGHT_STRING' => 33, + 'IS_IPV4_COMPAT' => 33, 'IS_IPV4_MAPPED' => 33, 'LAST_INSERT_ID' => 33, + 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'ST_GEOMFROMWKB' => 33, + 'ST_LINEFROMWKB' => 33, 'ST_POLYFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, + 'POLYGONFROMTEXT' => 33, 'ST_EXTERIORRING' => 33, 'ST_GEOMETRYTYPE' => 33, + 'ST_GEOMFROMTEXT' => 33, 'ST_INTERSECTION' => 33, 'ST_LINEFROMTEXT' => 33, + 'ST_MAKEENVELOPE' => 33, 'ST_MLINEFROMWKB' => 33, 'ST_MPOLYFROMWKB' => 33, + 'ST_POINTFROMWKB' => 33, 'ST_POLYFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, + 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, + 'NUMINTERIORRINGS' => 33, 'ST_INTERIORRINGN' => 33, 'ST_MLINEFROMTEXT' => 33, + 'ST_MPOINTFROMWKB' => 33, 'ST_MPOLYFROMTEXT' => 33, 'ST_NUMGEOMETRIES' => 33, + 'ST_POINTFROMTEXT' => 33, 'ST_SYMDIFFERENCE' => 33, + 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, 'RELEASE_ALL_LOCKS' => 33, + 'ST_LATFROMGEOHASH' => 33, 'ST_MPOINTFROMTEXT' => 33, 'ST_POLYGONFROMWKB' => 33, + 'GEOMETRYCOLLECTION' => 33, 'MULTIPOINTFROMTEXT' => 33, 'ST_BUFFER_STRATEGY' => 33, + 'ST_DISTANCE_SPHERE' => 33, 'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, + 'ST_GEOMFROMGEOJSON' => 33, 'ST_LONGFROMGEOHASH' => 33, 'ST_POLYGONFROMTEXT' => 33, + 'MULTIPOLYGONFROMWKB' => 33, 'ST_GEOMCOLLFROMTEXT' => 33, 'ST_GEOMETRYFROMTEXT' => 33, + 'ST_NUMINTERIORRINGS' => 33, 'ST_POINTFROMGEOHASH' => 33, 'UNCOMPRESSED_LENGTH' => 33, + 'MULTIPOLYGONFROMTEXT' => 33, 'ST_LINESTRINGFROMWKB' => 33, + 'ST_MULTIPOINTFROMWKB' => 33, + 'ST_MULTIPOINTFROMTEXT' => 33, + 'MULTILINESTRINGFROMWKB' => 33, 'ST_MULTIPOLYGONFROMWKB' => 33, + 'MULTILINESTRINGFROMTEXT' => 33, 'ST_MULTIPOLYGONFROMTEXT' => 33, + 'GEOMETRYCOLLECTIONFROMWKB' => 33, 'ST_MULTILINESTRINGFROMWKB' => 33, + 'GEOMETRYCOLLECTIONFROMTEXT' => 33, 'ST_MULTILINESTRINGFROMTEXT' => 33, + 'VALIDATE_PASSWORD_STRENGTH' => 33, 'WAIT_FOR_EXECUTED_GTID_SET' => 33, + 'ST_GEOMETRYCOLLECTIONFROMWKB' => 33, + 'ST_GEOMETRYCOLLECTIONFROMTEXT' => 33, + 'WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS' => 33, + + 'IF' => 35, 'IN' => 35, + 'MOD' => 35, + 'LEFT' => 35, + 'RIGHT' => 35, + 'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35, + 'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35, + 'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35, + 'LOCALTIME' => 35, + 'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35, + 'UTC_TIMESTAMP' => 35, + 'LOCALTIMESTAMP' => 35, + 'CURRENT_TIMESTAMP' => 35, + + 'NOT IN' => 37, + 'PROCEDURE ANALYSE' => 37, + + 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'TIMESTAMP' => 41, + + 'CHAR' => 43, + 'INTERVAL' => 43, + ); } diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index 4adbba5a73..a45c0fe482 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -54,6 +54,20 @@ class FieldFragment extends Fragment */ public $alias; + /** + * The name of the function. + * + * @var string + */ + public $function; + + /** + * The type of subquery. + * + * @var string + */ + public $subquery; + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -89,6 +103,16 @@ class FieldFragment extends Fragment */ $brackets = 0; + /** + * Keeps track of the previous token. + * Possible values: + * string, if function was previously found; + * true, if open bracket was previously found; + * null, in any other case. + * @var string|bool + */ + $prev = null; + for (; $list->idx < $list->count; ++$list->idx) { /** @@ -121,12 +145,26 @@ class FieldFragment extends Fragment continue; } break; + } else if ($prev === true) { + if ((empty($ret->subquery) && (!empty(Parser::$STATEMENT_PARSERS[$token->value])))) { + // A `(` was previously found and this keyword is the + // beginning of a statement, so this is a subquery. + $ret->subquery = $token->value; + } } } if ($token->type === Token::TYPE_OPERATOR) { if ($token->value === '(') { ++$brackets; + // We don't check to see if `$prev` is `true` (open bracke + // was found before) because the brackets count is one (the + // only bracket we found is this one). + if (($brackets === 1) && (empty($ret->function)) && ($prev !== null) && ($prev !== true)) { + // A function name was previously found and now an open + // bracket, so this is a function call. + $ret->function = $prev; + } $isExpr = true; } elseif ($token->value === ')') { --$brackets; @@ -150,15 +188,24 @@ class FieldFragment extends Fragment } if ($alias) { + // An alias is expected (the keyword `AS` was previously found). $ret->alias = $token->value; $alias = 0; } else { if (!$isExpr) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '.')) { + // Found a `.` which means we expect a column name and + // the column name we parsed is actually the table name + // and the table name is actually a database name. + if ((!empty($ret->database)) || ($period)) { + $parser->error('Unexpected dot.', $token); + } $ret->database = $ret->table; $ret->table = $ret->column; $period = true; } else { + // We found the name of a column (or table if column + // field should be skipped; used to parse table names). if (!empty($options['skipColumn'])) { $ret->table = $token->value; } else { @@ -167,6 +214,8 @@ class FieldFragment extends Fragment $period = false; } } else { + // Parsing aliases without `AS` keyword. + // Example: SELECT 'foo' `bar` if ($brackets === 0) { if (($token->type === Token::TYPE_NONE) || ($token->type === Token::TYPE_STRING) || (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_BACKTICK)) @@ -178,12 +227,24 @@ class FieldFragment extends Fragment $ret->expr .= $token->token; } + + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_FUNCTION)) { + $prev = strtoupper($token->value); + } else if (($token->type === Token::TYPE_OPERATOR) || ($token->value === '(')) { + $prev = true; + } else { + $prev = null; + } + } if ($alias === 2) { $parser->error('Alias was expected.'); } + // Whitespaces might be added at the end. + $ret->expr = trim($ret->expr); + if (empty($ret->expr)) { return null; } diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index 9cf634c427..f5c9592b06 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -20,11 +20,18 @@ class IntoKeyword extends Fragment { /** - * The name of the table. + * Type of target (OUTFILE or SYMBOL). * * @var string */ - public $table; + public $type; + + /** + * The name of the table or file. + * + * @var string + */ + public $name; /** * The name of the columns. @@ -49,11 +56,12 @@ class IntoKeyword extends Fragment * * Below are the states of the parser. * - * 0 ------------------------[ ( ]------------------------> 1 + * 0 -----------------------[ name ]----------------------> 1 + * 0 ---------------------[ OUTFILE ]---------------------> 2 * - * 1 --------------------[ field name ]-------------------> 2 + * 1 ------------------------[ ( ]------------------------> -1 * - * 2 ------------------------[ , ]------------------------> 1 + * 2 ---------------------[ filename ]--------------------> 1 * * @var int */ @@ -77,19 +85,31 @@ class IntoKeyword extends Fragment continue; } - // No keyword is expected. if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { + if (($state === 0) && ($token->value === 'OUTFILE')) { + $ret->type = 'OUTFILE'; + $state = 2; + continue; + } + + // No other keyword is expected. break; } - if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $ret->fields = ArrayFragment::parse($parser, $list)->values; + if ($state === 0) { + $ret->name = $token->value; + $state = 1; + } else if ($state === 1) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + $ret->fields = ArrayFragment::parse($parser, $list)->values; + ++$list->idx; + } + break; + } else if ($state === 2) { + $ret->name = $token->value; ++$list->idx; break; - } else { - $ret->table = $token->value; } - } --$list->idx; diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Fragments/KeyFragment.php index 11f4caf015..e1ac67908d 100644 --- a/libraries/sql-parser/src/Fragments/KeyFragment.php +++ b/libraries/sql-parser/src/Fragments/KeyFragment.php @@ -54,6 +54,13 @@ class KeyFragment extends Fragment */ public $type; + /** + * The options of this key. + * + * @var OptionsFragment + */ + public $options; + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index 6e12b444d0..1e4ae4f3ef 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -31,7 +31,7 @@ class LimitKeyword extends Fragment * * @var int */ - public $row_count; + public $rowCount; /** * @param Parser $parser The parser that serves as context. diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index dfb4fc98fb..dbd3676f4e 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -139,4 +139,21 @@ class OptionsFragment extends Fragment } return false; } + + /** + * Merges the specified options with these ones. Values with same ID will be + * replaced. + * + * @param array|OptionsFragment $options + * + * @return void + */ + public function merge($options) + { + if (is_array($options)) { + $this->options = array_merge_recursive($this->options, $options); + } else if ($options instanceof OptionsFragment) { + $this->options = array_merge_recursive($this->options, $options->options); + } + } } diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index a5fe233563..ba0a1440a0 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -23,11 +23,28 @@ class Parser */ public static $STATEMENT_PARSERS = array( + 'EXPLAIN' => 'SqlParser\\Statements\\ExplainStatement', + + // 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\\ChecsumStatement', + 'OPTIMIZE' => 'SqlParser\\Statements\\OptimizeStatement', + 'REPAIR' => 'SqlParser\\Statements\\RepairStatement', + 'RESTORE' => 'SqlParser\\Statements\\RestoreStatement', + + // Database Administration Statements + // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-server-administration.html + 'SET' => '', + 'SHOW' => 'SqlParser\\Statements\\ShowStatement', + // Data Definition Statements. // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-data-definition.html - 'ALTER' => '', + 'ALTER' => 'SqlParser\\Statements\\AlterStatement', 'CREATE' => 'SqlParser\\Statements\\CreateStatement', - 'DROP' => '', + 'DROP' => 'SqlParser\\Statements\\DropStatement', 'RENAME' => 'SqlParser\\Statements\\RenameStatement', 'TRUNCATE' => '', @@ -56,10 +73,26 @@ class Parser */ public static $KEYWORD_PARSERS = array( + 'ANALYZE' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), + 'BACKUP' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), 'CALL' => array( 'class' => 'SqlParser\\Fragments\\CallKeyword', 'field' => 'call', ), + 'CHECK' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), + 'CHECKSUM' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), 'FROM' => array( 'class' => 'SqlParser\\Fragments\\FromKeyword', 'field' => 'from', @@ -84,6 +117,10 @@ class Parser 'class' => 'SqlParser\\Fragments\\LimitKeyword', 'field' => 'limit', ), + 'OPTIMIZE' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), 'ORDER BY' => array( 'class' => 'SqlParser\\Fragments\\OrderKeyword', 'field' => 'order', @@ -92,10 +129,22 @@ class Parser 'class' => 'SqlParser\\Fragments\\ArrayFragment', 'field' => 'partition', ), + 'PROCEDURE' => array( + 'class' => 'SqlParser\\Fragments\\CallKeyword', + 'field' => 'procedure', + ), 'RENAME' => array( 'class' => 'SqlParser\\Fragments\\RenameKeyword', 'field' => 'renames', ), + 'REPAIR' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), + 'RESTORE' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'tables', + ), 'SET' => array( 'class' => 'SqlParser\\Fragments\\SetKeyword', 'field' => 'set', @@ -188,17 +237,15 @@ class Parser */ public function parse() { - $tokens = &$this->list->tokens; - $count = &$this->list->count; - $last = &$this->list->idx; + $list = &$this->list; - for (; $last < $count; ++$last) { + for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. * @var Token */ - $token = $tokens[$last]; + $token = $list->tokens[$list->idx]; // Statements can start with keywords only. // Comments, whitespaces, etc. are ignored. @@ -212,7 +259,7 @@ class Parser 'Unrecognized statement type "' . $token->value . '".', $token ); - // TODO: Skip to first delimiter. + $list->getNextOfType(Token::TYPE_DELIMITER); continue; } diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 0e57bfd45e..0fa1fc2668 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -5,15 +5,21 @@ namespace SqlParser; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; -use SqlParser\Fragments\CallKeyword; use SqlParser\Fragments\CreateDefFragment; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\FieldDefFragment; -use SqlParser\Fragments\FromKeyword; use SqlParser\Fragments\OptionsFragment; use SqlParser\Fragments\ParamDefFragment; -use SqlParser\Fragments\RenameKeyword; -use SqlParser\Fragments\SelectKeyword; +use SqlParser\Statements\AlterStatement; +use SqlParser\Statements\BackupStatement; +use SqlParser\Statements\CheckStatement; +use SqlParser\Statements\ChecksumStatement; +use SqlParser\Statements\CreateStatement; +use SqlParser\Statements\ExplainStatement; +use SqlParser\Statements\RenameStatement; +use SqlParser\Statements\RepairStatement; +use SqlParser\Statements\RestoreStatement; +use SqlParser\Statements\ShowStatement; /** * Abstract statement definition. @@ -50,9 +56,8 @@ abstract class Statement */ public function parse(Parser $parser, TokensList $list) { - /** - * Whether otpions were parsed or not. + * Whether options were parsed or not. * For statements that do not have any options this is set to `true` by * default. * @var bool @@ -115,15 +120,15 @@ abstract class Statement continue; } - // Special cases. - if ($token->value === 'CREATE') { + // Special cases: before parsing this keyword. + if ($this instanceof CreateStatement) { ++$list->idx; $this->name = CreateDefFragment::parse($parser, $list); if ($this->options->has('TABLE')) { ++$list->idx; $this->fields = FieldDefFragment::parse($parser, $list); ++$list->idx; - $this->tableOptions = OptionsFragment::parse( + $this->entityOptions = OptionsFragment::parse( $parser, $list, CreateDefFragment::$TABLE_OPTIONS @@ -149,7 +154,7 @@ abstract class Statement } } ++$list->idx; - $this->funcOptions = OptionsFragment::parse( + $this->entityOptions = OptionsFragment::parse( $parser, $list, CreateDefFragment::$FUNC_OPTIONS @@ -167,14 +172,50 @@ abstract class Statement } $class = null; // The statement has been processed here. } - } else if ($token->value === 'RENAME') { + } else if ($this instanceof RenameStatement) { $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); } + // Parsing this keyword. if ($class !== null) { ++$list->idx; // Skipping keyword. $this->$field = $class::parse($parser, $list, array()); } + + // Special cases: after parsing this keyword. + if (($this instanceof BackupStatement) + || ($this instanceof CheckStatement) + || ($this instanceof ChecksumStatement) + || ($this instanceof RepairStatement) + || ($this instanceof RestoreStatement) + ) { + + // The statements mentioned above follow this template: + // `STMT` + // + // First of all, because static::$OPTIONS is set for all of the + // statements above, is going to be parsed first. + // + // There is a parser specified in `Parser::$KEYWORD_PARSERS` + // which parses . + // + // Finally, we pares here and that's all. + ++$list->idx; + $this->options->merge( + OptionsFragment::parse( + $parser, + $list, + static::$OPTIONS + ) + ); + } else if (($this instanceof AlterStatement) + || ($this instanceof ExplainStatement) + || ($this instanceof ShowStatement) + ) { + // TODO: Implement the statements above. + $list->getNextOfType(Token::TYPE_DELIMITER); + ++$list->idx; + } } $this->last = --$list->idx; // Go back to last used token. diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php new file mode 100644 index 0000000000..47d34bba12 --- /dev/null +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -0,0 +1,48 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class AlterStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'DATABASE' => 1, + 'EVENT' => 1, + 'FUNCTION' => 1, + 'INDEX' => 1, + 'LOGFILE' => 1, + 'PROCEDURE' => 1, + 'SCHEMA' => 1, + 'SERVER' => 1, + 'TABLE' => 1, + 'TABLESPACE' => 1, + 'TRIGGER' => 1, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + +} diff --git a/libraries/sql-parser/src/Statements/AnalyzeStatement.php b/libraries/sql-parser/src/Statements/AnalyzeStatement.php new file mode 100644 index 0000000000..abe872c38d --- /dev/null +++ b/libraries/sql-parser/src/Statements/AnalyzeStatement.php @@ -0,0 +1,50 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class AnalyzeStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'NO_WRITE_TO_BINLOG' => 2, + 'LOCAL' => 3, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Analyzed tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/BackupStatement.php b/libraries/sql-parser/src/Statements/BackupStatement.php new file mode 100644 index 0000000000..bca4be7e8e --- /dev/null +++ b/libraries/sql-parser/src/Statements/BackupStatement.php @@ -0,0 +1,51 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class BackupStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'NO_WRITE_TO_BINLOG' => 2, + 'LOCAL' => 3, + + 'TO' => array(4, 'var'), + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Backup tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/CheckStatement.php b/libraries/sql-parser/src/Statements/CheckStatement.php new file mode 100644 index 0000000000..fa54591e8f --- /dev/null +++ b/libraries/sql-parser/src/Statements/CheckStatement.php @@ -0,0 +1,53 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class CheckStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'FOR UPGRADE' => 2, + 'QUICK' => 3, + 'FAST' => 4, + 'MEDIUM' => 5, + 'EXTENDED' => 6, + 'CHANGED' => 7, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Checked tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/ChecsumStatement.php b/libraries/sql-parser/src/Statements/ChecsumStatement.php new file mode 100644 index 0000000000..ff879c224d --- /dev/null +++ b/libraries/sql-parser/src/Statements/ChecsumStatement.php @@ -0,0 +1,49 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ChecksumStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'QUICK' => 2, + 'EXTENDED' => 3, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Checked tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index edb87ea7fc..69e3f7f6fa 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -57,20 +57,14 @@ class CreateStatement extends Statement public $options; /** - * The parameters of this routine. - * - * @var ParamDefFragment[] - */ - public $parameters; - - /** - * The options of the table. + * The options of the entity (table, procedure, function, etc.). * * @var OptionsFragment * * @see CreateDefFragment::$TABLE_OPTIONS + * @see CreateDefFragment::$FUNC_OPTIONS */ - public $tableOptions; + public $entityOptions; /** * Field created by this statement. @@ -79,6 +73,20 @@ class CreateStatement extends Statement */ public $fields; + /** + * The return data type of this routine. + * + * @var DataTypeFragment + */ + public $return; + + /** + * The parameters of this routine. + * + * @var ParamDefFragment[] + */ + public $parameters; + /** * The body of this function or procedure. * diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php new file mode 100644 index 0000000000..00d15912b7 --- /dev/null +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -0,0 +1,57 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class DropStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'DATABASE' => 1, + 'EVENT' => 1, + 'FUNCTION' => 1, + 'INDEX' => 1, + 'LOGFILE' => 1, + 'PROCEDURE' => 1, + 'SCHEMA' => 1, + 'SERVER' => 1, + 'TABLE' => 1, + 'TABLESPACE' => 1, + 'TRIGGER' => 1, + + 'TEMPORARY' => 2, + 'IF EXISTS' => 3, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Dropped elements. + * + * @var FromKeyworrd[] + */ + public $name; +} diff --git a/libraries/sql-parser/src/Statements/ExplainStatement.php b/libraries/sql-parser/src/Statements/ExplainStatement.php new file mode 100644 index 0000000000..19834131bc --- /dev/null +++ b/libraries/sql-parser/src/Statements/ExplainStatement.php @@ -0,0 +1,19 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ExplainStatement extends Statement +{ + +} diff --git a/libraries/sql-parser/src/Statements/OptimizeStatement.php b/libraries/sql-parser/src/Statements/OptimizeStatement.php new file mode 100644 index 0000000000..cb90f08293 --- /dev/null +++ b/libraries/sql-parser/src/Statements/OptimizeStatement.php @@ -0,0 +1,50 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class OptimizeStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'NO_WRITE_TO_BINLOG' => 2, + 'LOCAL' => 3, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Optimized tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/RepairStatement.php b/libraries/sql-parser/src/Statements/RepairStatement.php new file mode 100644 index 0000000000..a3f1afe833 --- /dev/null +++ b/libraries/sql-parser/src/Statements/RepairStatement.php @@ -0,0 +1,55 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class RepairStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'NO_WRITE_TO_BINLOG' => 2, + 'LOCAL' => 3, + + 'QUICK' => 4, + 'EXTENDED' => 5, + 'USE_FRM' => 6, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Repaired tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/RestoreStatement.php b/libraries/sql-parser/src/Statements/RestoreStatement.php new file mode 100644 index 0000000000..e8c46f8c5c --- /dev/null +++ b/libraries/sql-parser/src/Statements/RestoreStatement.php @@ -0,0 +1,48 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class RestoreStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + + 'TABLE' => 1, + + 'FROM' => array(2, 'var'), + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + + /** + * Restored tables. + * + * @var FieldFragment[] + */ + public $tables; +} diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 50ce28148d..d8c9baaa5d 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -126,6 +126,20 @@ class SelectStatement extends Statement */ public $limit; + /** + * Procedure that should process the data in the result set. + * + * @var CallKeyword + */ + public $procedure; + + /** + * Destination of this result set. + * + * @var IntoKeyword + */ + public $into; + /** * Joins. * diff --git a/libraries/sql-parser/src/Statements/ShowStatement.php b/libraries/sql-parser/src/Statements/ShowStatement.php new file mode 100644 index 0000000000..962a7a3edd --- /dev/null +++ b/libraries/sql-parser/src/Statements/ShowStatement.php @@ -0,0 +1,76 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class ShowStatement extends Statement +{ + + /** + * Options of this statement. + * + * @var array + */ + public static $OPTIONS = array( + 'CREATE' => 1, + 'AUTHORS' => 2, + 'BINARY' => 2, + 'BINLOG' => 2, + 'CHARACTER' => 2, + 'CODE' => 2, + 'COLLATION' => 2, + 'COLUMNS' => 2, + 'CONTRIBUTORS' => 2, + 'DATABASE' => 2, + 'DATABASES' => 2, + 'ENGINE' => 2, + 'ENGINES' => 2, + 'ERRORS' => 2, + 'EVENT' => 2, + 'EVENTS' => 2, + 'FUNCTION' => 2, + 'GRANTS' => 2, + 'HOSTS' => 2, + 'INDEX' => 2, + 'INNODB' => 2, + 'LOGS' => 2, + 'MASTER' => 2, + 'OPEN' => 2, + 'PLUGINS' => 2, + 'PRIVILEGES' => 2, + 'PROCEDURE' => 2, + 'PROCESSLIST' => 2, + 'PROFILE' => 2, + 'PROFILES' => 2, + 'SCHEDULER' => 2, + 'SET' => 2, + 'SLAVE' => 2, + 'STATUS' => 2, + 'TABLE' => 2, + 'TABLES' => 2, + 'TRIGGER' => 2, + 'TRIGGERS' => 2, + 'VARIABLES' => 2, + 'VIEW' => 2, + 'WARNINGS' => 2, + ); + + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; +} diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index 867976c2bc..160efcda3d 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -120,6 +120,7 @@ class Token const FLAG_KEYWORD_COMPOSED = 4; const FLAG_KEYWORD_DATA_TYPE = 8; const FLAG_KEYWORD_KEY = 16; + const FLAG_KEYWORD_FUNCTION = 32; // Numbers related flags. const FLAG_NUMBER_HEX = 1; diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 4332ae0642..55ae33b7c1 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -3,6 +3,7 @@ namespace SqlParser\Utils; use SqlParser\Statement; +use SqlParser\Statements\SelectStatement; /** * Miscellaneous utilities. @@ -19,12 +20,12 @@ class Misc /** * Gets a list of all aliases and their original names. * - * @param Statement $tree The tree that was generated after parsing. - * @param string $database The name of the database. + * @param SelectStatement $tree The tree that was generated after parsing. + * @param string $database The name of the database. * * @return array */ - public static function getAliases(Statement $tree, $database) + public static function getAliases($tree, $database) { if ((empty($tree->from)) || (empty($tree->expr))) { return array(); diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php new file mode 100644 index 0000000000..0bd56d865c --- /dev/null +++ b/libraries/sql-parser/src/Utils/Query.php @@ -0,0 +1,131 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class Query +{ + + /** + * Functions that set the flag `is_func`. + * + * @var array + */ + public static $FUNCTIONS = array( + 'SUM','AVG','STD','STDDEV','MIN','MAX','BIT_OR','BIT_AND' + ); + + /** + * Gets an array with flags this statement has. + * + * @param Statement $statement + * + * @return array + */ + public static function getFlags($statement) + { + $flags = array(); + // TODO: 'union', 'join', 'offset' + + if (($statement instanceof AlterStatement) + || ($statement instanceof CreateStatement) + ) { + $flags['reload'] = true; + } else if ($statement instanceof AnalyzeStatement) { + $flags['is_maint'] = true; + $flags['is_analyze'] = true; + } else if ($statement instanceof CallStatement) { + $flags['is_procedure'] = true; + } else if (($statement instanceof CheckStatement) + || ($statement instanceof ChecksumStatement) + || ($statement instanceof OptimizeStatement) + || ($statement instanceof RepairStatement) + ) { + $flags['is_maint'] = true; + } else if ($statement instanceof DeleteStatement) { + $flags['is_delete'] = true; + $flags['is_affected'] = true; + } else if ($statement instanceof DropStatement) { + $flags['reload'] = true; + + if (($statement->options->has('DATABASE') + || ($statement->options->has('SCHEMA'))) + ) { + $flags['drop_database'] = true; + } + } else if ($statement instanceof ExplainStatement) { + $flags['is_explain'] = true; + } else if ($statement instanceof InsertStatement) { + $flags['is_affected'] = true; + $flags['is_insert'] = true; + } else if ($statement instanceof ReplaceStatement) { + $flags['is_affected'] = true; + $flags['is_replace'] = true; + } else if ($statement instanceof SelectStatement) { + + if (!empty($statement->from)) { + $flags['select_from'] = true; + } + + if ($statement->options->has('DISTINCT')) { + $flags['distinct'] = true; + } + + if ((!empty($statement->group)) || (!empty($statement->having))) { + $flags['is_group'] = true; + } + + if ((!empty($statement->into)) + && ($statement->into->type === 'OUTFILE') + ) { + $flags['is_export'] = true; + } + + foreach ($statement->expr as $expr) { + if (!empty($expr->function)) { + if ($expr->function === 'COUNT') { + $flags['is_count'] = true; + } else if (in_array($expr->function, static::$FUNCTIONS)) { + $flags['is_func'] = true; + } + } + if (!empty($expr->subquery)) { + $flags['is_subquery'] = true; + } + } + } else if ($statement instanceof ShowStatement) { + $flags['is_show'] = true; + } else if ($statement instanceof UpdateStatement) { + $flags['is_affected'] = true; + } + + return $flags; + } + +} diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 740ace371a..76d3d71f28 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -7,6 +7,7 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; +use SqlParser\Statements\CreateStatement; /** * Routine utilities. @@ -89,11 +90,11 @@ class Routine /** * Gets the parameters of a routine from the parse tree. * - * @param Statement $tree The tree that was generated after parsing. + * @param CreateStatement $tree The tree that was generated after parsing. * * @return array */ - public static function getParameters(Statement $tree) + public static function getParameters($tree) { $retval = array( 'num' => 0, diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index 7be3eac5b9..6bc83a501f 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -7,6 +7,7 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; +use SqlParser\Statements\CreateStatement; /** * Table utilities. @@ -20,7 +21,14 @@ use SqlParser\Fragments\ParamDefFragment; class Table { - public static function getForeignKeys(Statement $tree) + /** + * Gets the foreign keys of the table. + * + * @param CreateStatement $tree + * + * @return array + */ + public static function getForeignKeys($tree) { if ((empty($tree->fields)) || (!$tree->options->has('TABLE'))) { return array(); @@ -63,7 +71,14 @@ class Table return $ret; } - public static function getFields(Statement $tree) + /** + * Gets fields of the table. + * + * @param CreateStatement $tree + * + * @return array + */ + public static function getFields($tree) { if ((empty($tree->fields)) || (!$tree->options->has('TABLE'))) { return array(); diff --git a/tbl_structure.php b/tbl_structure.php index 094356c355..99c59d558f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -200,7 +200,13 @@ $show_create_table = $GLOBALS['dbi']->fetchValue( 0, 1 ); $parser = new SqlParser\Parser($show_create_table); -$create_table_fields = SqlParser\Utils\Table::getFields($parser->statements[0]); + +/** + * @var CreateStatement $stmt + */ +$stmt = $parser->statements[0]; + +$create_table_fields = SqlParser\Utils\Table::getFields($stmt); /** * prepare table infos From 9910f280a75dd00540c71c9e193e9d725a9d216d Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 26 Jun 2015 01:49:20 +0300 Subject: [PATCH 24/57] Started replacing parse_analyze.inc.php. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/parse_analyze.inc.php | 160 +++++------------- libraries/sql-parser/autoload.php | 2 +- .../src/Contexts/ContextMySql50000.php | 1 - .../src/Contexts/ContextMySql50100.php | 1 - .../src/Contexts/ContextMySql50500.php | 1 - .../src/Contexts/ContextMySql50600.php | 1 - .../src/Contexts/ContextMySql50700.php | 1 - libraries/sql-parser/src/Utils/Query.php | 88 +++++++++- 8 files changed, 119 insertions(+), 136 deletions(-) diff --git a/libraries/parse_analyze.inc.php b/libraries/parse_analyze.inc.php index a9ce1d8a83..c4c3904002 100644 --- a/libraries/parse_analyze.inc.php +++ b/libraries/parse_analyze.inc.php @@ -9,136 +9,54 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ $GLOBALS['unparsed_sql'] = $sql_query; -$parsed_sql = PMA_SQP_parse($sql_query); -$analyzed_sql = PMA_SQP_analyze($parsed_sql); -// for bug 780516: now that we use case insensitive preg_match -// or flags from the analyser, do not put back the reformatted query -// into $sql_query, to make this kind of query work without -// capitalizing keywords: -// -// CREATE TABLE SG_Persons ( -// id int(10) unsigned NOT NULL auto_increment, -// first varchar(64) NOT NULL default '', -// PRIMARY KEY (`id`) -// ) +// Get details about the SQL query. +$analyzed_sql_results = SqlParser\Utils\Query::getAll($sql_query); -// Fills some variables from the analysed SQL -// A table has to be created, renamed, dropped: -// the navigation panel should be reloaded -$reload = isset($analyzed_sql[0]['queryflags']['reload']); +// Adding data fetched from the old parser and analyzer. +// TODO: Finish replacing all calls to `PMA_SQP_*`. +$analyzed_sql_results['parsed_sql'] = PMA_SQP_parse($sql_query); +$analyzed_sql_results['analyzed_sql'] = PMA_SQP_analyze($analyzed_sql_results['parsed_sql']); -// check for drop database -$drop_database = isset($analyzed_sql[0]['queryflags']['drop_database']); +// TODO: Refactor this as well. +extract($analyzed_sql_results); -// for the presence of EXPLAIN -$is_explain = isset($analyzed_sql[0]['queryflags']['is_explain']); +// If the targeted table (and database) are different than the ones that is +// currently browsed, edit `$db` and `$table` to match them so other elements +// (page headers, links, navigation panel) can be updated properly. +if (!empty($analyzed_sql_results['tables'])) { -// for the presence of DELETE -$is_delete = isset($analyzed_sql[0]['queryflags']['is_delete']); + // Previous table and database name is stored to check if it changed. + $prevDb = $db; + $prevTable = $table; -// for the presence of UPDATE, DELETE or INSERT|LOAD DATA|REPLACE -$is_affected = isset($analyzed_sql[0]['queryflags']['is_affected']); + if (count($analyzed_sql_results['tables']) > 1) { -// for the presence of REPLACE -$is_replace = isset($analyzed_sql[0]['queryflags']['is_replace']); - -// for the presence of INSERT -$is_insert = isset($analyzed_sql[0]['queryflags']['is_insert']); - -// for the presence of CHECK|ANALYZE|REPAIR|OPTIMIZE|CHECKSUM TABLE -$is_maint = isset($analyzed_sql[0]['queryflags']['is_maint']); - -// for the presence of SHOW -$is_show = isset($analyzed_sql[0]['queryflags']['is_show']); - -// for the presence of PROCEDURE ANALYSE -$is_analyse = isset($analyzed_sql[0]['queryflags']['is_analyse']); - -// for the presence of INTO OUTFILE -$is_export = isset($analyzed_sql[0]['queryflags']['is_export']); - -// for the presence of GROUP BY|HAVING|SELECT DISTINCT -$is_group = isset($analyzed_sql[0]['queryflags']['is_group']); - -// for the presence of SUM|AVG|STD|STDDEV|MIN|MAX|BIT_OR|BIT_AND -$is_func = isset($analyzed_sql[0]['queryflags']['is_func']); - -// for the presence of SELECT COUNT -$is_count = isset($analyzed_sql[0]['queryflags']['is_count']); - -// check for a real SELECT ... FROM -$is_select = isset($analyzed_sql[0]['queryflags']['select_from']); - -// the query contains a subquery -$is_subquery = isset($analyzed_sql[0]['queryflags']['is_subquery']); - -// check for CALL -// Since multiple query execution is anyway handled, -// ignore the WHERE clause of the first sql statement -// which might contain a phrase like 'call ' -if (isset($analyzed_sql[0]['queryflags']['is_procedure']) - && empty($analyzed_sql[0]['where_clause']) -) { - $is_procedure = true; -} else { - $is_procedure = false; -} - -// aggregates all the results into one array -$analyzed_sql_results = array( - "parsed_sql" => $parsed_sql, - "analyzed_sql" => $analyzed_sql, - "reload" => $reload, - "drop_database" => $drop_database, - "is_explain" => $is_explain, - "is_delete" => $is_delete, - "is_affected" => $is_affected, - "is_replace" => $is_replace, - "is_insert" => $is_insert, - "is_maint" => $is_maint, - "is_show" => $is_show, - "is_analyse" => $is_analyse, - "is_export" => $is_export, - "is_group" => $is_group, - "is_func" => $is_func, - "is_count" => $is_count, - "is_select" => $is_select, - "is_procedure" => $is_procedure, - "is_subquery" => $is_subquery -); - - -// If the query is a Select, extract the db and table names and modify -// $db and $table, to have correct page headers, links and left frame. -// db and table name may be enclosed with backquotes, db is optional, -// query may contain aliases. - -/** - * @todo if there are more than one table name in the Select: - * - do not extract the first table name - * - do not show a table name in the page header - * - do not display the sub-pages links) - */ -if ($is_select) { - $prev_db = $db; - if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name'])) { - $table = $analyzed_sql[0]['table_ref'][0]['table_true_name']; - } - if (isset($analyzed_sql[0]['table_ref'][0]['db']) - && /*overload*/mb_strlen($analyzed_sql[0]['table_ref'][0]['db']) - ) { - $db = $analyzed_sql[0]['table_ref'][0]['db']; + /** + * @todo if there are more than one table name in the Select: + * - do not extract the first table name + * - do not show a table name in the page header + * - do not display the sub-pages links) + */ + $table = ''; } else { - $db = $prev_db; + $table = $analyzed_sql_results['tables'][0][0]; + if (!empty($analyzed_sql_results['tables'][0][1])) { + $db = $analyzed_sql_results['tables'][0][1]; + } } - // Don't change reload, if we already decided to reload in import - if (empty($reload) && empty($GLOBALS['is_ajax_request'])) { - $reload = ($db == $prev_db) ? 0 : 1; + + // There is no point checking if a reload is required if we already decided + // to reload. Also, no reload is required for AJAX requests. + if ((empty($reload)) && (empty($GLOBALS['is_ajax_request']))) { + // NOTE: Tables are case-insensitive. + $reload = ((strcasecmp($db, $prevDb) == 0) + || (strcasecmp($table, $prevTable)) == 0) ? false : true; } + + // Updating the array as well. + $analyzed_sql_results['reload'] = $reload; } -?> + +return $analyzed_sql_results; diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php index 882015deaf..e0718830ce 100644 --- a/libraries/sql-parser/autoload.php +++ b/libraries/sql-parser/autoload.php @@ -7,7 +7,7 @@ */ if (!class_exists('Composer\\Autoload\\ClassLoader')) { - include_once 'composer/ClassLoader.php'; + include_once './libraries/sql-parser/composer/ClassLoader.php'; } use Composer\Autoload\ClassLoader; diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index d4b80e1f61..eedb59cb71 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -258,7 +258,6 @@ class ContextMySql50000 extends Context 'CURRENT_TIMESTAMP' => 35, 'NOT IN' => 37, - 'PROCEDURE ANALYSE' => 37, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index c6db3d5e8e..5f70976478 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -280,7 +280,6 @@ class ContextMySql50100 extends Context 'CURRENT_TIMESTAMP' => 35, 'NOT IN' => 37, - 'PROCEDURE ANALYSE' => 37, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index 26aa40e0bc..db53f5e841 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -284,7 +284,6 @@ class ContextMySql50500 extends Context 'CURRENT_TIMESTAMP' => 35, 'NOT IN' => 37, - 'PROCEDURE ANALYSE' => 37, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index 39521ef196..48fd6b2060 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -315,7 +315,6 @@ class ContextMySql50600 extends Context 'CURRENT_TIMESTAMP' => 35, 'NOT IN' => 37, - 'PROCEDURE ANALYSE' => 37, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 99dae9e02e..ac55a6c96a 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -327,7 +327,6 @@ class ContextMySql50700 extends Context 'CURRENT_TIMESTAMP' => 35, 'NOT IN' => 37, - 'PROCEDURE ANALYSE' => 37, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index 0bd56d865c..c3083441ea 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -2,10 +2,11 @@ namespace SqlParser\Utils; +use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Statements\AlterStatement; use SqlParser\Statements\AnalyzeStatement; -use SqlParser\Statement\CallStatement; +use SqlParser\Statements\CallStatement; use SqlParser\Statements\CheckStatement; use SqlParser\Statements\ChecksumStatement; use SqlParser\Statements\CreateStatement; @@ -45,29 +46,54 @@ class Query * Gets an array with flags this statement has. * * @param Statement $statement + * @param bool $all If `false`, false values will not be included. * * @return array */ - public static function getFlags($statement) + public static function getFlags($statement, $all = false) { $flags = array(); - // TODO: 'union', 'join', 'offset' + if ($all) { + $flags = array( + 'distinct' => false, + 'drop_database' => false, + 'is_affected' => false, + 'is_analyse' => false, + 'is_count' => false, + 'is_delete' => false, + 'is_explain' => false, + 'is_export' => false, + 'is_func' => false, + 'is_group' => false, + 'is_insert' => false, + 'is_maint' => false, + 'is_procedure' => false, + 'is_replace' => false, + 'is_select' => false, + 'is_show' => false, + 'is_subquery' => false, + 'join' => false, + 'offset' => false, + 'reload' => false, + 'select_from' => false, + 'union' => false + ); + } + // TODO: 'union', 'join', 'offset' if (($statement instanceof AlterStatement) || ($statement instanceof CreateStatement) ) { $flags['reload'] = true; - } else if ($statement instanceof AnalyzeStatement) { - $flags['is_maint'] = true; - $flags['is_analyze'] = true; - } else if ($statement instanceof CallStatement) { - $flags['is_procedure'] = true; - } else if (($statement instanceof CheckStatement) + } else if (($statement instanceof AnalyzeStatement) + || ($statement instanceof CheckStatement) || ($statement instanceof ChecksumStatement) || ($statement instanceof OptimizeStatement) || ($statement instanceof RepairStatement) ) { $flags['is_maint'] = true; + } else if ($statement instanceof CallStatement) { + $flags['is_procedure'] = true; } else if ($statement instanceof DeleteStatement) { $flags['is_delete'] = true; $flags['is_affected'] = true; @@ -88,6 +114,7 @@ class Query $flags['is_affected'] = true; $flags['is_replace'] = true; } else if ($statement instanceof SelectStatement) { + $flags['is_select'] = true; if (!empty($statement->from)) { $flags['select_from'] = true; @@ -119,6 +146,12 @@ class Query $flags['is_subquery'] = true; } } + + if ((!empty($statement->procedure)) + && ($statement->procedure->name === 'ANALYSE') + ) { + $flags['is_analyse'] = true; + } } else if ($statement instanceof ShowStatement) { $flags['is_show'] = true; } else if ($statement instanceof UpdateStatement) { @@ -128,4 +161,41 @@ class Query return $flags; } + /** + * Parses a query and gets all information about it. + * + * @param string $query + * + * @return array + */ + public static function getAll($query) + { + $parser = new Parser($query); + + if (!isset($parser->statements[0])) { + return array(); + } + + $statement = $parser->statements[0]; + + $ret = static::getFlags($statement, true); + + $ret['parser'] = $parser; + $ret['statement'] = $statement; + + if ($statement instanceof SelectStatement) { + $ret['tables'] = array(); + foreach ($statement->expr as $expr) { + if (!empty($expr->table)) { + $ret['tables'][] = array( + $expr->table, + !empty($expr->database) ? $expr->database : null + ); + } + } + } + + return $ret; + } + } From 3449e6810b5adb52621058d6901ce15532698355 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 26 Jun 2015 12:28:09 +0300 Subject: [PATCH 25/57] Updated sql-parser library. Signed-off-by: Dan Ungureanu --- .../src/Fragments/FieldFragment.php | 2 +- libraries/sql-parser/src/Statement.php | 143 +++++------------- .../src/Statements/AlterStatement.php | 13 +- .../src/Statements/AnalyzeStatement.php | 9 -- .../src/Statements/BackupStatement.php | 20 +-- .../src/Statements/CheckStatement.php | 13 +- .../src/Statements/ChecsumStatement.php | 13 +- .../src/Statements/CreateStatement.php | 79 ++++++++-- .../src/Statements/DeleteStatement.php | 9 -- .../src/Statements/DropStatement.php | 9 -- .../src/Statements/ExplainStatement.php | 4 +- .../src/Statements/InsertStatement.php | 9 -- .../src/Statements/MaintenanceStatement.php | 59 ++++++++ .../Statements/NotImplementedStatement.php | 38 +++++ .../src/Statements/OptimizeStatement.php | 9 -- .../src/Statements/RenameStatement.php | 20 +++ .../src/Statements/RepairStatement.php | 13 +- .../src/Statements/ReplaceStatement.php | 9 -- .../src/Statements/RestoreStatement.php | 13 +- .../src/Statements/SelectStatement.php | 9 -- .../src/Statements/ShowStatement.php | 13 +- .../src/Statements/UpdateStatement.php | 9 -- 22 files changed, 244 insertions(+), 271 deletions(-) create mode 100644 libraries/sql-parser/src/Statements/MaintenanceStatement.php create mode 100644 libraries/sql-parser/src/Statements/NotImplementedStatement.php diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index a45c0fe482..4a0c2cab07 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -57,7 +57,7 @@ class FieldFragment extends Fragment /** * The name of the function. * - * @var string + * @var mixed */ public $function; diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 0fa1fc2668..1b7e590dce 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -5,21 +5,7 @@ namespace SqlParser; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; -use SqlParser\Fragments\CreateDefFragment; -use SqlParser\Fragments\DataTypeFragment; -use SqlParser\Fragments\FieldDefFragment; use SqlParser\Fragments\OptionsFragment; -use SqlParser\Fragments\ParamDefFragment; -use SqlParser\Statements\AlterStatement; -use SqlParser\Statements\BackupStatement; -use SqlParser\Statements\CheckStatement; -use SqlParser\Statements\ChecksumStatement; -use SqlParser\Statements\CreateStatement; -use SqlParser\Statements\ExplainStatement; -use SqlParser\Statements\RenameStatement; -use SqlParser\Statements\RepairStatement; -use SqlParser\Statements\RestoreStatement; -use SqlParser\Statements\ShowStatement; /** * Abstract statement definition. @@ -32,6 +18,15 @@ use SqlParser\Statements\ShowStatement; abstract class Statement { + /** + * The options of this query. + * + * @var OptionsFragment + * + * @see static::$OPTIONS + */ + public $options; + /** * The index of the first token used in this statement. * @@ -120,61 +115,7 @@ abstract class Statement continue; } - // Special cases: before parsing this keyword. - if ($this instanceof CreateStatement) { - ++$list->idx; - $this->name = CreateDefFragment::parse($parser, $list); - if ($this->options->has('TABLE')) { - ++$list->idx; - $this->fields = FieldDefFragment::parse($parser, $list); - ++$list->idx; - $this->entityOptions = OptionsFragment::parse( - $parser, - $list, - CreateDefFragment::$TABLE_OPTIONS - ); - } elseif (($this->options->has('PROCEDURE')) - || ($this->options->has('FUNCTION')) - ) { - ++$list->idx; - $this->parameters = ParamDefFragment::parse($parser, $list); - if ($this->options->has('FUNCTION')) { - $token = $list->getNextOfType(Token::TYPE_KEYWORD); - if ($token->value !== 'RETURNS') { - $parser->error( - '\'RETURNS\' keyword was expected.', - $token - ); - } else { - ++$list->idx; - $this->return = DataTypeFragment::parse( - $parser, - $list - ); - } - } - ++$list->idx; - $this->entityOptions = OptionsFragment::parse( - $parser, - $list, - CreateDefFragment::$FUNC_OPTIONS - ); - ++$list->idx; - $this->body = array(); - for (; $list->idx < $list->count; ++$list->idx) { - $token = $list->tokens[$list->idx]; - $this->body[] = $token; - if (($token->type === Token::TYPE_KEYWORD) - && ($token->value === 'END') - ) { - break; - } - } - $class = null; // The statement has been processed here. - } - } else if ($this instanceof RenameStatement) { - $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); - } + $this->before($parser, $list, $token); // Parsing this keyword. if ($class !== null) { @@ -182,42 +123,38 @@ abstract class Statement $this->$field = $class::parse($parser, $list, array()); } - // Special cases: after parsing this keyword. - if (($this instanceof BackupStatement) - || ($this instanceof CheckStatement) - || ($this instanceof ChecksumStatement) - || ($this instanceof RepairStatement) - || ($this instanceof RestoreStatement) - ) { - - // The statements mentioned above follow this template: - // `STMT` - // - // First of all, because static::$OPTIONS is set for all of the - // statements above, is going to be parsed first. - // - // There is a parser specified in `Parser::$KEYWORD_PARSERS` - // which parses . - // - // Finally, we pares here and that's all. - ++$list->idx; - $this->options->merge( - OptionsFragment::parse( - $parser, - $list, - static::$OPTIONS - ) - ); - } else if (($this instanceof AlterStatement) - || ($this instanceof ExplainStatement) - || ($this instanceof ShowStatement) - ) { - // TODO: Implement the statements above. - $list->getNextOfType(Token::TYPE_DELIMITER); - ++$list->idx; - } + $this->after($parser, $list, $token); } $this->last = --$list->idx; // Go back to last used token. } + + /** + * Function called before the token was processed. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return void + */ + public function before(Parser $parser, TokensList $list, Token $token) + { + + } + + /** + * Function called after the token was processed. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return + */ + public function after(Parser $parser, TokensList $list, Token $token) + { + + } + } diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index 47d34bba12..4cc29cdefa 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\NotImplementedStatement; /** * `ALTER` statement. @@ -13,7 +13,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class AlterStatement extends Statement +class AlterStatement extends NotImplementedStatement { /** @@ -36,13 +36,4 @@ class AlterStatement extends Statement 'TRIGGER' => 1, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - } diff --git a/libraries/sql-parser/src/Statements/AnalyzeStatement.php b/libraries/sql-parser/src/Statements/AnalyzeStatement.php index abe872c38d..78783f2a54 100644 --- a/libraries/sql-parser/src/Statements/AnalyzeStatement.php +++ b/libraries/sql-parser/src/Statements/AnalyzeStatement.php @@ -32,15 +32,6 @@ class AnalyzeStatement extends Statement 'LOCAL' => 3, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Analyzed tables. * diff --git a/libraries/sql-parser/src/Statements/BackupStatement.php b/libraries/sql-parser/src/Statements/BackupStatement.php index bca4be7e8e..cc2e07e256 100644 --- a/libraries/sql-parser/src/Statements/BackupStatement.php +++ b/libraries/sql-parser/src/Statements/BackupStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\MaintenanceStatement; /** * `BACKUP` statement. @@ -15,7 +15,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class BackupStatement extends Statement +class BackupStatement extends MaintenanceStatement { /** @@ -32,20 +32,4 @@ class BackupStatement extends Statement 'TO' => array(4, 'var'), ); - - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - - /** - * Backup tables. - * - * @var FieldFragment[] - */ - public $tables; } diff --git a/libraries/sql-parser/src/Statements/CheckStatement.php b/libraries/sql-parser/src/Statements/CheckStatement.php index fa54591e8f..4619613c2f 100644 --- a/libraries/sql-parser/src/Statements/CheckStatement.php +++ b/libraries/sql-parser/src/Statements/CheckStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\MaintenanceStatement; /** * `CHECK` statement. @@ -15,7 +15,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class CheckStatement extends Statement +class CheckStatement extends MaintenanceStatement { /** @@ -35,15 +35,6 @@ class CheckStatement extends Statement 'CHANGED' => 7, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Checked tables. * diff --git a/libraries/sql-parser/src/Statements/ChecsumStatement.php b/libraries/sql-parser/src/Statements/ChecsumStatement.php index ff879c224d..36426d2afc 100644 --- a/libraries/sql-parser/src/Statements/ChecsumStatement.php +++ b/libraries/sql-parser/src/Statements/ChecsumStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\MaintenanceStatement; /** * `CHECKSUM` statement. @@ -15,7 +15,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ChecksumStatement extends Statement +class ChecksumStatement extends MaintenanceStatement { /** @@ -31,15 +31,6 @@ class ChecksumStatement extends Statement 'EXTENDED' => 3, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Checked tables. * diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 69e3f7f6fa..b5d56fef3f 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -2,7 +2,15 @@ namespace SqlParser\Statements; +use SqlParser\Parser; use SqlParser\Statement; +use sqlParser\Token; +use SqlParser\TokensList; +use SqlParser\Fragments\CreateDefFragment; +use SqlParser\Fragments\DataTypeFragment; +use SqlParser\Fragments\FieldDefFragment; +use SqlParser\Fragments\OptionsFragment; +use SqlParser\Fragments\ParamDefFragment; /** * `CREATE` statement. @@ -47,15 +55,6 @@ class CreateStatement extends Statement */ public $name; - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * The options of the entity (table, procedure, function, etc.). * @@ -93,4 +92,66 @@ class CreateStatement extends Statement * @var Token[] */ public $body; + + /** + * Parsing the `CREATE` statement. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return void + */ + public function before(Parser $parser, TokensList $list, Token $token) + { + ++$list->idx; + $this->name = CreateDefFragment::parse($parser, $list); + if ($this->options->has('TABLE')) { + ++$list->idx; + $this->fields = FieldDefFragment::parse($parser, $list); + ++$list->idx; + $this->entityOptions = OptionsFragment::parse( + $parser, + $list, + CreateDefFragment::$TABLE_OPTIONS + ); + } elseif (($this->options->has('PROCEDURE')) + || ($this->options->has('FUNCTION')) + ) { + ++$list->idx; + $this->parameters = ParamDefFragment::parse($parser, $list); + if ($this->options->has('FUNCTION')) { + $token = $list->getNextOfType(Token::TYPE_KEYWORD); + if ($token->value !== 'RETURNS') { + $parser->error( + '\'RETURNS\' keyword was expected.', + $token + ); + } else { + ++$list->idx; + $this->return = DataTypeFragment::parse( + $parser, + $list + ); + } + } + ++$list->idx; + $this->entityOptions = OptionsFragment::parse( + $parser, + $list, + CreateDefFragment::$FUNC_OPTIONS + ); + ++$list->idx; + $this->body = array(); + for (; $list->idx < $list->count; ++$list->idx) { + $token = $list->tokens[$list->idx]; + $this->body[] = $token; + if (($token->type === Token::TYPE_KEYWORD) + && ($token->value === 'END') + ) { + break; + } + } + } + } } diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php index 0e88fedefb..e7f3a69f75 100644 --- a/libraries/sql-parser/src/Statements/DeleteStatement.php +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -33,15 +33,6 @@ class DeleteStatement extends Statement 'IGNORE' => 3, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Tables used as sources for this statement. * diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php index 00d15912b7..de96de728b 100644 --- a/libraries/sql-parser/src/Statements/DropStatement.php +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -39,15 +39,6 @@ class DropStatement extends Statement 'IF EXISTS' => 3, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Dropped elements. * diff --git a/libraries/sql-parser/src/Statements/ExplainStatement.php b/libraries/sql-parser/src/Statements/ExplainStatement.php index 19834131bc..8670b08c1f 100644 --- a/libraries/sql-parser/src/Statements/ExplainStatement.php +++ b/libraries/sql-parser/src/Statements/ExplainStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\NotImplementedStatement; /** * `EXPLAIN` statement. @@ -13,7 +13,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ExplainStatement extends Statement +class ExplainStatement extends NotImplementedStatement { } diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php index db88b42beb..c80e194966 100644 --- a/libraries/sql-parser/src/Statements/InsertStatement.php +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -58,15 +58,6 @@ class InsertStatement extends Statement 'IGNORE' => 4, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Tables used as target for this statement. * diff --git a/libraries/sql-parser/src/Statements/MaintenanceStatement.php b/libraries/sql-parser/src/Statements/MaintenanceStatement.php new file mode 100644 index 0000000000..b26e1c0509 --- /dev/null +++ b/libraries/sql-parser/src/Statements/MaintenanceStatement.php @@ -0,0 +1,59 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class MaintenanceStatement extends Statement +{ + + /** + * Tables maintained. + * + * @var FieldFragment[] + */ + public $tables; + + /** + * Parses the additional options fragment at the end. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return + */ + public function after(Parser $parser, TokensList $list, Token $token) + { + // [some options] is going to be parsed first. + // + // There is a parser specified in `Parser::$KEYWORD_PARSERS` + // which parses the name of the tables. + // + // Finally, we parse here [some more options] and that's all. + ++$list->idx; + $this->options->merge( + OptionsFragment::parse( + $parser, + $list, + static::$OPTIONS + ) + ); + } +} diff --git a/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/libraries/sql-parser/src/Statements/NotImplementedStatement.php new file mode 100644 index 0000000000..9f9f61cd09 --- /dev/null +++ b/libraries/sql-parser/src/Statements/NotImplementedStatement.php @@ -0,0 +1,38 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class NotImplementedStatement extends Statement +{ + + /** + * Jump to the end of the delimiter. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return + */ + public function before(Parser $parser, TokensList $list, Token $token) + { + $list->getNextOfType(Token::TYPE_DELIMITER); + --$list->idx; + } +} diff --git a/libraries/sql-parser/src/Statements/OptimizeStatement.php b/libraries/sql-parser/src/Statements/OptimizeStatement.php index cb90f08293..0b7b38aa3d 100644 --- a/libraries/sql-parser/src/Statements/OptimizeStatement.php +++ b/libraries/sql-parser/src/Statements/OptimizeStatement.php @@ -32,15 +32,6 @@ class OptimizeStatement extends Statement 'LOCAL' => 3, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Optimized tables. * diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php index 88607ea713..0f5a1c7f8d 100644 --- a/libraries/sql-parser/src/Statements/RenameStatement.php +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -2,7 +2,10 @@ namespace SqlParser\Statements; +use SqlParser\Parser; use SqlParser\Statement; +use sqlParser\Token; +use SqlParser\TokensList; /** * `RENAME` statement. @@ -25,4 +28,21 @@ class RenameStatement extends Statement * @var RenameKeyword[] */ public $renames; + + /** + * Skips the `TABLE` keyword after `RENAME`. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return void + */ + public function before(Parser $parser, TokensList $list, Token $token) + { + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'RENAME')) { + // Checking if it is the beginning of the query. + $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); + } + } } diff --git a/libraries/sql-parser/src/Statements/RepairStatement.php b/libraries/sql-parser/src/Statements/RepairStatement.php index a3f1afe833..d4053ee375 100644 --- a/libraries/sql-parser/src/Statements/RepairStatement.php +++ b/libraries/sql-parser/src/Statements/RepairStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\MaintenanceStatement; /** * `REPAIR` statement. @@ -17,7 +17,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class RepairStatement extends Statement +class RepairStatement extends MaintenanceStatement { /** @@ -37,15 +37,6 @@ class RepairStatement extends Statement 'USE_FRM' => 6, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Repaired tables. * diff --git a/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index 577f72c4fd..0411f45807 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -36,15 +36,6 @@ class ReplaceStatement extends Statement 'DELAYED' => 1, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Tables used as target for this statement. * diff --git a/libraries/sql-parser/src/Statements/RestoreStatement.php b/libraries/sql-parser/src/Statements/RestoreStatement.php index e8c46f8c5c..89e2ed5222 100644 --- a/libraries/sql-parser/src/Statements/RestoreStatement.php +++ b/libraries/sql-parser/src/Statements/RestoreStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\MaintenanceStatement; /** * `RESTORE` statement. @@ -15,7 +15,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class RestoreStatement extends Statement +class RestoreStatement extends MaintenanceStatement { /** @@ -30,15 +30,6 @@ class RestoreStatement extends Statement 'FROM' => array(2, 'var'), ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Restored tables. * diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index d8c9baaa5d..4b9584f58d 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -61,15 +61,6 @@ class SelectStatement extends Statement 'SQL_CALC_FOUND_ROWS' => 9, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Expressions that are being selected by this statement. * diff --git a/libraries/sql-parser/src/Statements/ShowStatement.php b/libraries/sql-parser/src/Statements/ShowStatement.php index 962a7a3edd..57a411055d 100644 --- a/libraries/sql-parser/src/Statements/ShowStatement.php +++ b/libraries/sql-parser/src/Statements/ShowStatement.php @@ -2,7 +2,7 @@ namespace SqlParser\Statements; -use SqlParser\Statement; +use SqlParser\Statements\NotImplementedStatement; /** * `SHOW` statement. @@ -13,7 +13,7 @@ use SqlParser\Statement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ShowStatement extends Statement +class ShowStatement extends NotImplementedStatement { /** @@ -64,13 +64,4 @@ class ShowStatement extends Statement 'VIEW' => 2, 'WARNINGS' => 2, ); - - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; } diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php index 8dcc6f090c..39a0f1c227 100644 --- a/libraries/sql-parser/src/Statements/UpdateStatement.php +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -38,15 +38,6 @@ class UpdateStatement extends Statement 'IGNORE' => 2, ); - /** - * The options of this query. - * - * @var OptionsFragment - * - * @see static::$OPTIONS - */ - public $options; - /** * Tables used as sources for this statement. * From 707ffe666d267613811a463cd344fa6432b9e9f0 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 26 Jun 2015 14:25:53 +0300 Subject: [PATCH 26/57] Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Context.php | 10 +++++- .../src/Contexts/ContextMySql50000.php | 5 +-- .../src/Contexts/ContextMySql50100.php | 5 +-- .../src/Contexts/ContextMySql50500.php | 5 +-- .../src/Contexts/ContextMySql50600.php | 5 +-- .../src/Contexts/ContextMySql50700.php | 5 +-- .../src/Exceptions/LexerException.php | 6 ++++ .../src/Exceptions/ParserException.php | 6 ++++ libraries/sql-parser/src/Fragment.php | 9 ++++++ .../src/Fragments/ArrayFragment.php | 6 ++++ .../sql-parser/src/Fragments/CallKeyword.php | 6 ++++ .../src/Fragments/CreateDefFragment.php | 6 ++++ .../src/Fragments/DataTypeFragment.php | 6 ++++ .../src/Fragments/FieldDefFragment.php | 8 +++++ .../src/Fragments/FieldFragment.php | 6 ++++ .../sql-parser/src/Fragments/FromKeyword.php | 6 ++++ .../sql-parser/src/Fragments/IntoKeyword.php | 6 ++++ .../sql-parser/src/Fragments/JoinKeyword.php | 6 ++++ .../sql-parser/src/Fragments/KeyFragment.php | 6 ++++ .../sql-parser/src/Fragments/LimitKeyword.php | 6 ++++ .../src/Fragments/OptionsFragment.php | 10 ++++-- .../sql-parser/src/Fragments/OrderKeyword.php | 6 ++++ .../src/Fragments/ParamDefFragment.php | 6 ++++ .../src/Fragments/ReferencesKeyword.php | 6 ++++ .../src/Fragments/RenameKeyword.php | 6 ++++ .../src/Fragments/SelectKeyword.php | 6 ++++ .../sql-parser/src/Fragments/SetKeyword.php | 6 ++++ .../src/Fragments/ValuesKeyword.php | 6 ++++ .../sql-parser/src/Fragments/WhereKeyword.php | 6 ++++ libraries/sql-parser/src/Lexer.php | 9 ++++++ libraries/sql-parser/src/Parser.php | 9 ++++++ libraries/sql-parser/src/Statement.php | 22 +++++++++---- .../src/Statements/AlterStatement.php | 6 ++++ .../src/Statements/AnalyzeStatement.php | 6 ++++ .../src/Statements/BackupStatement.php | 6 ++++ .../src/Statements/CallStatement.php | 6 ++++ .../src/Statements/CheckStatement.php | 6 ++++ .../src/Statements/ChecsumStatement.php | 6 ++++ .../src/Statements/CreateStatement.php | 14 +++++--- .../src/Statements/DeleteStatement.php | 6 ++++ .../src/Statements/DropStatement.php | 6 ++++ .../src/Statements/ExplainStatement.php | 6 ++++ .../src/Statements/InsertStatement.php | 6 ++++ .../src/Statements/MaintenanceStatement.php | 18 +++++++---- .../Statements/NotImplementedStatement.php | 16 +++++++--- .../src/Statements/OptimizeStatement.php | 6 ++++ .../src/Statements/RenameStatement.php | 14 +++++--- .../src/Statements/RepairStatement.php | 6 ++++ .../src/Statements/ReplaceStatement.php | 6 ++++ .../src/Statements/RestoreStatement.php | 6 ++++ .../src/Statements/SelectStatement.php | 6 ++++ .../src/Statements/ShowStatement.php | 6 ++++ .../src/Statements/UpdateStatement.php | 6 ++++ libraries/sql-parser/src/Token.php | 7 ++++ libraries/sql-parser/src/TokensList.php | 5 +++ libraries/sql-parser/src/UtfString.php | 12 +++++++ libraries/sql-parser/src/Utils/Misc.php | 32 +++++++++++-------- libraries/sql-parser/src/Utils/Query.php | 12 +++++-- libraries/sql-parser/src/Utils/Routine.php | 14 +++++--- libraries/sql-parser/src/Utils/Table.php | 22 ++++++++----- 60 files changed, 423 insertions(+), 67 deletions(-) diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index cbe666df57..699d800b87 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -1,9 +1,17 @@ from)) || (empty($tree->expr))) { + if ((empty($statement->from)) || (empty($statement->expr))) { return array(); } @@ -35,28 +41,28 @@ class Misc $tables = array(); - if ((!empty($tree->join->expr->table)) - && (!empty($tree->join->expr->alias)) + if ((!empty($statement->join->expr->table)) + && (!empty($statement->join->expr->alias)) ) { - $thisDb = empty($tree->join->expr->database) ? - $database : $tree->join->expr->database; + $thisDb = empty($statement->join->expr->database) ? + $database : $statement->join->expr->database; $retval = array( $thisDb => array( 'alias' => null, 'tables' => array( - $tree->join->expr->table => array( - 'alias' => $tree->join->expr->alias, + $statement->join->expr->table => array( + 'alias' => $statement->join->expr->alias, 'columns' => array(), ), ), ), ); - $tables[$thisDb][$tree->join->expr->alias] = $tree->join->expr->table; + $tables[$thisDb][$statement->join->expr->alias] = $statement->join->expr->table; } - foreach ($tree->from as $expr) { + foreach ($statement->from as $expr) { if (empty($expr->table)) { continue; } @@ -83,7 +89,7 @@ class Misc $tables[$thisDb][$expr->alias] = $expr->table; } - foreach ($tree->expr as $expr) { + foreach ($statement->expr as $expr) { if ((empty($expr->column)) || (empty($expr->alias))) { continue; } diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index c3083441ea..b1a95b155c 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -1,5 +1,11 @@ 0, @@ -106,9 +112,9 @@ class Routine 'opts' => array(), ); - if (!empty($tree->parameters)) { + if (!empty($statement->parameters)) { $idx = 0; - foreach ($tree->parameters as $param) { + foreach ($statement->parameters as $param) { $retval['dir'][$idx] = $param->inOut; $retval['name'][$idx] = $param->name; $retval['type'][$idx] = $param->type->name; diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index 6bc83a501f..95b685001c 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -1,5 +1,11 @@ fields)) || (!$tree->options->has('TABLE'))) { + if ((empty($statement->fields)) || (!$statement->options->has('TABLE'))) { return array(); } $ret = array(); - foreach ($tree->fields as $field) { + foreach ($statement->fields as $field) { if ((empty($field->key)) || ($field->key->type !== 'FOREIGN KEY')) { continue; @@ -74,19 +80,19 @@ class Table /** * Gets fields of the table. * - * @param CreateStatement $tree + * @param CreateStatement $statement The statement to be processed. * * @return array */ - public static function getFields($tree) + public static function getFields($statement) { - if ((empty($tree->fields)) || (!$tree->options->has('TABLE'))) { + if ((empty($statement->fields)) || (!$statement->options->has('TABLE'))) { return array(); } $ret = array(); - foreach ($tree->fields as $field) { + foreach ($statement->fields as $field) { // Skipping keys. if (empty($field->type)) { From c1399cd58ad1fd4d0f7263229e4fd5fbfd1889fe Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 26 Jun 2015 15:06:31 +0300 Subject: [PATCH 27/57] Removed leftovers from old sql-parser version. Signed-off-by: Dan Ungureanu --- .../src/Contexts/Context_MySQL50000.php | 172 --------------- .../src/Contexts/Context_MySQL50100.php | 186 ---------------- .../src/Contexts/Context_MySQL50500.php | 190 ---------------- .../src/Contexts/Context_MySQL50600.php | 199 ----------------- .../src/Contexts/Context_MySQL50700.php | 208 ------------------ 5 files changed, 955 deletions(-) delete mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50000.php delete mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50100.php delete mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50500.php delete mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50600.php delete mode 100644 libraries/sql-parser/src/Contexts/Context_MySQL50700.php diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50000.php b/libraries/sql-parser/src/Contexts/Context_MySQL50000.php deleted file mode 100644 index 830399e719..0000000000 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50000.php +++ /dev/null @@ -1,172 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class Context_MySQL50000 extends Context -{ - - public static $KEYWORDS = array( - - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, - 'ON' => 1, 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, - 'DIV' => 1, 'FOR' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, - 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, - 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, - 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, - 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, - 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, - 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, - 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, - 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, - 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, - 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, - 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, - 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, - 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'READS' => 1, - 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, 'UNION' => 1, - 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, 'WHILE' => 1, - 'WRITE' => 1, - 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, - 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, - 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, - 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, - 'INSERT' => 1, 'OPTION' => 1, 'REGEXP' => 1, 'RENAME' => 1, - 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, 'SCHEMA' => 1, - 'SELECT' => 1, 'SONAME' => 1, 'UNIQUE' => 1, 'UNLOCK' => 1, - 'UPDATE' => 1, 'VALUES' => 1, - 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, - 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, - 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, - 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, - 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, - 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, - 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, - 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, - 'LONGTEXT' => 1, 'MODIFIES' => 1, 'OPTIMIZE' => 1, - 'RESTRICT' => 1, 'SMALLINT' => 1, 'SPECIFIC' => 1, - 'SQLSTATE' => 1, 'STARTING' => 1, 'TINYBLOB' => 1, - 'TINYTEXT' => 1, 'TRAILING' => 1, 'UNSIGNED' => 1, - 'UTC_DATE' => 1, 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, - 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, - 'PRECISION' => 1, 'PROCEDURE' => 1, 'SENSITIVE' => 1, - 'SEPARATOR' => 1, 'VARBINARY' => 1, - 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, 'DAY_MINUTE' => 1, - 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, 'MEDIUMTEXT' => 1, - 'OPTIONALLY' => 1, 'REFERENCES' => 1, 'SQLWARNING' => 1, - 'TERMINATED' => 1, 'YEAR_MONTH' => 1, - 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, - 'INSENSITIVE' => 1, - 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, - 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, - 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, - 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, - 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, - 'DAY_MICROSECOND' => 1, - 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, - 'CURRENT_TIMESTAMP' => 1, - 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, - 'SECOND_MICROSECOND' => 1, - 'SQL_CALC_FOUND_ROWS' => 1, - - 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, - 'ANY' => 2, 'AVG' => 2, 'BDB' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, - 'END' => 2, 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, - 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, - 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, 'HASH' => 2, 'HELP' => 2, - 'HOUR' => 2, 'LAST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, - 'NONE' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PREV' => 2, 'ROWS' => 2, 'SOME' => 2, - 'STOP' => 2, 'TEXT' => 2, 'TIME' => 2, 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, - 'WEEK' => 2, 'WORK' => 2, 'X509' => 2, 'YEAR' => 2, - 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, - 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'FIRST' => 2, 'FIXED' => 2, - 'FLUSH' => 2, 'FOUND' => 2, 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, - 'LOCKS' => 2, 'MERGE' => 2, 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, - 'NCHAR' => 2, 'PHASE' => 2, 'POINT' => 2, 'QUERY' => 2, 'QUICK' => 2, - 'RAID0' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, - 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, - 'VALUE' => 2, - 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, - 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, - 'EVENTS' => 2, 'FAULTS' => 2, 'FIELDS' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, - 'IMPORT' => 2, 'INNODB' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, - 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'OFFSET' => 2, - 'RELOAD' => 2, 'REPAIR' => 2, 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, - 'SERIAL' => 2, 'SIGNED' => 2, 'SIMPLE' => 2, 'SOUNDS' => 2, 'SOURCE' => 2, - 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, - 'AGAINST' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, 'CHARSET' => 2, 'COLUMNS' => 2, - 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, - 'DISCARD' => 2, 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, 'HANDLER' => 2, - 'INDEXES' => 2, 'INVOKER' => 2, 'MIGRATE' => 2, 'PARTIAL' => 2, 'POLYGON' => 2, - 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'RECOVER' => 2, 'RESTORE' => 2, - 'RETURNS' => 2, 'ROUTINE' => 2, 'SESSION' => 2, 'STORAGE' => 2, 'STRIPED' => 2, - 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, - 'USE_FRM' => 2, - 'CASCADED' => 2, 'CHECKSUM' => 2, 'CONTAINS' => 2, 'DATETIME' => 2, - 'DUMPFILE' => 2, 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, - 'INNOBASE' => 2, 'LANGUAGE' => 2, 'MAX_ROWS' => 2, 'MIN_ROWS' => 2, - 'NATIONAL' => 2, 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, - 'PROFILES' => 2, 'ROLLBACK' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, - 'SNAPSHOT' => 2, 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, - 'WARNINGS' => 2, - 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, - 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, - 'ISOLATION' => 2, 'PACK_KEYS' => 2, 'RAID_TYPE' => 2, 'REDUNDANT' => 2, - 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, 'TEMPORARY' => 2, 'TEMPTABLE' => 2, - 'TIMESTAMP' => 2, 'UNDEFINED' => 2, 'VARIABLES' => 2, - 'BERKELEYDB' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, - 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, - 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, - 'PRIVILEGES' => 2, 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, - 'TABLESPACE' => 2, - 'FRAC_SECOND' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, - 'MICROSECOND' => 2, 'PROCESSLIST' => 2, 'RAID_CHUNKS' => 2, 'REPLICATION' => 2, - 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, - 'DES_KEY_FILE' => 2, 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, - 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, - 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, - 'TIMESTAMPADD' => 2, - 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, 'RELAY_LOG_POS' => 2, - 'SQL_TSI_MONTH' => 2, 'TIMESTAMPDIFF' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'MASTER_LOG_POS' => 2, - 'MASTER_SSL_KEY' => 2, 'RAID_CHUNKSIZE' => 2, 'RELAY_LOG_FILE' => 2, - 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, 'USER_RESOURCES' => 2, - 'DELAY_KEY_WRITE' => 2, 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, - 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, 'SQL_TSI_QUARTER' => 2, - 'MASTER_SERVER_ID' => 2, - 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'SQL_BUFFER_RESULT' => 2, - 'GEOMETRYCOLLECTION' => 2, - 'SQL_TSI_FRAC_SECOND' => 2, - 'MASTER_CONNECT_RETRY' => 2, 'MAX_QUERIES_PER_HOUR' => 2, - 'MAX_UPDATES_PER_HOUR' => 2, 'MAX_USER_CONNECTIONS' => 2, - 'MAX_CONNECTIONS_PER_HOUR' => 2, - - 'NOT NULL' => 4, - 'INDEX KEY' => 4, - 'UNIQUE KEY' => 4, - 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, - 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, - 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, - 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, - 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, - 'DEFAULT CHARACTER SET' => 4, - - ); -} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50100.php b/libraries/sql-parser/src/Contexts/Context_MySQL50100.php deleted file mode 100644 index f70ecef978..0000000000 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50100.php +++ /dev/null @@ -1,186 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class Context_MySQL50100 extends Context -{ - - public static $KEYWORDS = array( - - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, - 'ON' => 1, 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, - 'DIV' => 1, 'FOR' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, - 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, - 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, - 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, - 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, - 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, - 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, - 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, - 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, - 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, - 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, - 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, - 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, - 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, - 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, - 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, - 'WHILE' => 1, 'WRITE' => 1, - 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, - 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, - 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, - 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, - 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, - 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, - 'SCHEMA' => 1, 'SELECT' => 1, 'UNIQUE' => 1, 'UNLOCK' => 1, - 'UPDATE' => 1, 'VALUES' => 1, - 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, - 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, - 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, - 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, - 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, - 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, - 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, - 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, - 'LONGTEXT' => 1, 'MODIFIES' => 1, 'OPTIMIZE' => 1, - 'RESTRICT' => 1, 'SMALLINT' => 1, 'SPECIFIC' => 1, - 'SQLSTATE' => 1, 'STARTING' => 1, 'TINYBLOB' => 1, - 'TINYTEXT' => 1, 'TRAILING' => 1, 'UNSIGNED' => 1, - 'UTC_DATE' => 1, 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, - 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, - 'PRECISION' => 1, 'PROCEDURE' => 1, 'SENSITIVE' => 1, - 'SEPARATOR' => 1, 'VARBINARY' => 1, - 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, - 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, - 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, - 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, - 'YEAR_MONTH' => 1, - 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, - 'INSENSITIVE' => 1, - 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, - 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, - 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, - 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, - 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, - 'DAY_MICROSECOND' => 1, - 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, - 'CURRENT_TIMESTAMP' => 1, - 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, - 'SECOND_MICROSECOND' => 1, - 'SQL_CALC_FOUND_ROWS' => 1, - 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, - - 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, - 'ANY' => 2, 'AVG' => 2, 'BDB' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, - 'END' => 2, 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, - 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, - 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, - 'GOTO' => 2, 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, - 'LESS' => 2, 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, - 'NONE' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, - 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, 'TYPE' => 2, - 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, 'X509' => 2, - 'YEAR' => 2, - 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, - 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'EVENT' => 2, 'EVERY' => 2, - 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, 'HOSTS' => 2, - 'LABEL' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, - 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'OWNER' => 2, - 'PHASE' => 2, 'POINT' => 2, 'QUERY' => 2, 'QUICK' => 2, 'RAID0' => 2, - 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, 'START' => 2, - 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, 'VALUE' => 2, - 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, - 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, - 'EVENTS' => 2, 'FAULTS' => 2, 'FIELDS' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, - 'IMPORT' => 2, 'INNODB' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, - 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'OFFSET' => 2, - 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, - 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, - 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, - 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, - 'AGAINST' => 2, 'AUTHORS' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, 'CHARSET' => 2, - 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, 'DEFINER' => 2, - 'DISABLE' => 2, 'DISCARD' => 2, 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, - 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, - 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, - 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, - 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'ROUTINE' => 2, 'SESSION' => 2, - 'STORAGE' => 2, 'STRIPED' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, - 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WRAPPER' => 2, - 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, - 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXTENDED' => 2, - 'FUNCTION' => 2, 'GEOMETRY' => 2, 'INNOBASE' => 2, 'LANGUAGE' => 2, - 'MAXVALUE' => 2, 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, - 'NATIONAL' => 2, 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, - 'PRESERVE' => 2, 'PROFILES' => 2, 'REDOFILE' => 2, 'ROLLBACK' => 2, - 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, - 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, - 'WARNINGS' => 2, - 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, - 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, - 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'PARTITION' => 2, - 'RAID_TYPE' => 2, 'READ_ONLY' => 2, 'REDUNDANT' => 2, 'SAVEPOINT' => 2, - 'SCHEDULER' => 2, 'SQL_CACHE' => 2, 'TEMPORARY' => 2, 'TEMPTABLE' => 2, - 'TIMESTAMP' => 2, 'UNDEFINED' => 2, 'UNINSTALL' => 2, 'VARIABLES' => 2, - 'BERKELEYDB' => 2, 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, - 'CONNECTION' => 2, 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, - 'IDENTIFIED' => 2, 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, - 'NDBCLUSTER' => 2, 'PARTITIONS' => 2, 'PRIVILEGES' => 2, 'REORGANISE' => 2, - 'REORGANIZE' => 2, 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, - 'TABLESPACE' => 2, - 'EXTENT_SIZE' => 2, 'FRAC_SECOND' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, - 'MASTER_USER' => 2, 'MICROSECOND' => 2, 'PROCESSLIST' => 2, 'RAID_CHUNKS' => 2, - 'REPLICATION' => 2, 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, - 'CONTRIBUTORS' => 2, 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, - 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, 'PARTITIONING' => 2, - 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, - 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, - 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, - 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, 'PAGE_CHECKSUM' => 2, - 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, - 'TIMESTAMPDIFF' => 2, 'TRANSACTIONAL' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, - 'MASTER_LOG_POS' => 2, 'MASTER_SSL_KEY' => 2, 'RAID_CHUNKSIZE' => 2, - 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, - 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, - 'AUTOEXTEND_SIZE' => 2, 'DELAY_KEY_WRITE' => 2, 'MASTER_LOG_FILE' => 2, - 'MASTER_PASSWORD' => 2, 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, - 'SQL_TSI_QUARTER' => 2, - 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'UNDO_BUFFER_SIZE' => 2, - 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'SQL_BUFFER_RESULT' => 2, - 'GEOMETRYCOLLECTION' => 2, - 'SQL_TSI_FRAC_SECOND' => 2, - 'MASTER_CONNECT_RETRY' => 2, 'MAX_QUERIES_PER_HOUR' => 2, - 'MAX_UPDATES_PER_HOUR' => 2, 'MAX_USER_CONNECTIONS' => 2, - 'MAX_CONNECTIONS_PER_HOUR' => 2, - - 'NOT NULL' => 4, - 'INDEX KEY' => 4, - 'UNIQUE KEY' => 4, - 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, - 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, - 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, - 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, - 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, - 'DEFAULT CHARACTER SET' => 4, - - ); -} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50500.php b/libraries/sql-parser/src/Contexts/Context_MySQL50500.php deleted file mode 100644 index 6febe72e3c..0000000000 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50500.php +++ /dev/null @@ -1,190 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class Context_MySQL50500 extends Context -{ - - public static $KEYWORDS = array( - - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, - 'ON' => 1, 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, - 'DIV' => 1, 'FOR' => 1, 'INT' => 1, 'KEY' => 1, 'MOD' => 1, - 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, 'SSL' => 1, - 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, - 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, - 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, - 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, - 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, - 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, - 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, - 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, - 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, - 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, - 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, - 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, - 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, - 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, - 'WHILE' => 1, 'WRITE' => 1, - 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, - 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, - 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, - 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, - 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, - 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, - 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'UNIQUE' => 1, - 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, - 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, - 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, - 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, - 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, - 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, - 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, - 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, - 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, - 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, - 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, - 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, - 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, - 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, - 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, - 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, - 'PRECISION' => 1, 'PROCEDURE' => 1, 'SENSITIVE' => 1, - 'SEPARATOR' => 1, 'VARBINARY' => 1, - 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, - 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, - 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, - 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, - 'YEAR_MONTH' => 1, - 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, - 'INSENSITIVE' => 1, - 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, - 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, - 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, - 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, - 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, - 'DAY_MICROSECOND' => 1, - 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, - 'CURRENT_TIMESTAMP' => 1, - 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, - 'SECOND_MICROSECOND' => 1, - 'SQL_CALC_FOUND_ROWS' => 1, - 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, - - 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, - 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, - 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XML' => 2, - 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, - 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, - 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, - 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, - 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, 'SLOW' => 2, - 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, 'TYPE' => 2, - 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, 'X509' => 2, - 'YEAR' => 2, - 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, - 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, - 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, - 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, - 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'OWNER' => 2, - 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, 'QUICK' => 2, - 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, - 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, - 'VALUE' => 2, - 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, - 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, - 'EVENTS' => 2, 'FAULTS' => 2, 'FIELDS' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, - 'IMPORT' => 2, 'INNODB' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, - 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'OFFSET' => 2, - 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, - 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, - 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, - 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, - 'AGAINST' => 2, 'AUTHORS' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, 'CHARSET' => 2, - 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, 'DEFINER' => 2, - 'DISABLE' => 2, 'DISCARD' => 2, 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, - 'GENERAL' => 2, 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, - 'LOGFILE' => 2, 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, - 'PLUGINS' => 2, 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, - 'REBUILD' => 2, 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'ROUTINE' => 2, - 'SESSION' => 2, 'STORAGE' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, - 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WRAPPER' => 2, - 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, - 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXTENDED' => 2, - 'FUNCTION' => 2, 'GEOMETRY' => 2, 'INNOBASE' => 2, 'LANGUAGE' => 2, - 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, - 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, 'PRESERVE' => 2, - 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, - 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, - 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, - 'WARNINGS' => 2, - 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, - 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, - 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'PARTITION' => 2, - 'READ_ONLY' => 2, 'REDUNDANT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, - 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, - 'UNINSTALL' => 2, 'VARIABLES' => 2, - 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, - 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, - 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, - 'PARTITIONS' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, 'REPEATABLE' => 2, - 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, 'TABLE_NAME' => 2, - 'COLUMN_NAME' => 2, 'CURSOR_NAME' => 2, 'EXTENT_SIZE' => 2, 'FRAC_SECOND' => 2, - 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, 'MICROSECOND' => 2, - 'MYSQL_ERRNO' => 2, 'PROCESSLIST' => 2, 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, - 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, - 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'CONTRIBUTORS' => 2, - 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, 'MESSAGE_TEXT' => 2, - 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, 'PARTITIONING' => 2, - 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, - 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, - 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, - 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, 'RELAY_LOG_POS' => 2, - 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, 'TIMESTAMPDIFF' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, - 'MASTER_LOG_POS' => 2, 'MASTER_SSL_KEY' => 2, 'RELAY_LOG_FILE' => 2, - 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, 'TABLE_CHECKSUM' => 2, - 'USER_RESOURCES' => 2, - 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, - 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, 'MASTER_SSL_CERT' => 2, - 'MULTILINESTRING' => 2, 'SQL_TSI_QUARTER' => 2, 'SUBCLASS_ORIGIN' => 2, - 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'UNDO_BUFFER_SIZE' => 2, - 'CONSTRAINT_SCHEMA' => 2, 'IGNORE_SERVER_IDS' => 2, 'MASTER_SSL_CAPATH' => 2, - 'MASTER_SSL_CIPHER' => 2, 'SQL_BUFFER_RESULT' => 2, - 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, - 'SQL_TSI_FRAC_SECOND' => 2, - 'MASTER_CONNECT_RETRY' => 2, 'MAX_QUERIES_PER_HOUR' => 2, - 'MAX_UPDATES_PER_HOUR' => 2, 'MAX_USER_CONNECTIONS' => 2, - 'MASTER_HEARTBEAT_PERIOD' => 2, - 'MAX_CONNECTIONS_PER_HOUR' => 2, - - 'NOT NULL' => 4, - 'INDEX KEY' => 4, - 'UNIQUE KEY' => 4, - 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, - 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, - 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, - 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, - 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, - 'DEFAULT CHARACTER SET' => 4, - - ); -} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50600.php b/libraries/sql-parser/src/Contexts/Context_MySQL50600.php deleted file mode 100644 index dfd114ace1..0000000000 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50600.php +++ /dev/null @@ -1,199 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class Context_MySQL50600 extends Context -{ - - public static $KEYWORDS = array( - - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, - 'ON' => 1, 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, - 'DIV' => 1, 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, - 'MOD' => 1, 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, - 'SSL' => 1, 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, - 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, - 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, - 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, - 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, - 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, - 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, - 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, - 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, - 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, - 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, - 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, - 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, - 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, - 'WHILE' => 1, 'WRITE' => 1, - 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, - 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, - 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, - 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, - 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, - 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, - 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'UNIQUE' => 1, - 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, - 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, - 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, - 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, - 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, - 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, - 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, - 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, - 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, - 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, - 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, - 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, - 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, - 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, - 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, - 'LOCALTIME' => 1, 'MEDIUMINT' => 1, 'MIDDLEINT' => 1, - 'PARTITION' => 1, 'PRECISION' => 1, 'PROCEDURE' => 1, - 'SENSITIVE' => 1, 'SEPARATOR' => 1, 'VARBINARY' => 1, - 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, - 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, - 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, - 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, - 'YEAR_MONTH' => 1, - 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, - 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, - 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, - 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, - 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, - 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, - 'IO_AFTER_GTIDS' => 1, 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, - 'DAY_MICROSECOND' => 1, 'IO_BEFORE_GTIDS' => 1, - 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, - 'CURRENT_TIMESTAMP' => 1, - 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, - 'SECOND_MICROSECOND' => 1, - 'SQL_CALC_FOUND_ROWS' => 1, - 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, - - 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, - 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, - 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XML' => 2, - 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, - 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, - 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, - 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, - 'ONLY' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, - 'SLOW' => 2, 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, - 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, - 'X509' => 2, 'YEAR' => 2, - 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, - 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, - 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, - 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, - 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'OWNER' => 2, - 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, 'QUICK' => 2, - 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, 'SLAVE' => 2, - 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, 'UNTIL' => 2, - 'VALUE' => 2, - 'ACTION' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, 'CLIENT' => 2, - 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, 'ESCAPE' => 2, - 'EVENTS' => 2, 'EXPIRE' => 2, 'EXPORT' => 2, 'FAULTS' => 2, 'FIELDS' => 2, - 'FORMAT' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, 'IMPORT' => 2, 'ISSUER' => 2, - 'LEAVES' => 2, 'MASTER' => 2, 'MEDIUM' => 2, 'MEMORY' => 2, 'MINUTE' => 2, - 'MODIFY' => 2, 'NUMBER' => 2, 'OFFSET' => 2, 'PARSER' => 2, 'PLUGIN' => 2, - 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, 'RESUME' => 2, 'ROLLUP' => 2, - 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, 'SIGNED' => 2, 'SIMPLE' => 2, - 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, 'SOURCE' => 2, 'STARTS' => 2, - 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, - 'AGAINST' => 2, 'ANALYSE' => 2, 'AUTHORS' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, - 'CHARSET' => 2, 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, 'CONTEXT' => 2, - 'CURRENT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, 'DISCARD' => 2, 'DYNAMIC' => 2, - 'ENGINES' => 2, 'EXECUTE' => 2, 'GENERAL' => 2, 'HANDLER' => 2, 'INDEXES' => 2, - 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, 'MIGRATE' => 2, 'NO_WAIT' => 2, - 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, 'POLYGON' => 2, 'PREPARE' => 2, - 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, 'RECOVER' => 2, 'RESTORE' => 2, - 'RETURNS' => 2, 'REVERSE' => 2, 'ROUTINE' => 2, 'SESSION' => 2, 'STORAGE' => 2, - 'SUBJECT' => 2, 'SUSPEND' => 2, 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, - 'USE_FRM' => 2, 'WRAPPER' => 2, - 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, - 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXCHANGE' => 2, - 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, 'LANGUAGE' => 2, - 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, - 'NVARCHAR' => 2, 'ONE_SHOT' => 2, 'PASSWORD' => 2, 'PRESERVE' => 2, - 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, - 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, - 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, - 'WARNINGS' => 2, - 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, - 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, - 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'READ_ONLY' => 2, - 'REDUNDANT' => 2, 'ROW_COUNT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, - 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, - 'UNINSTALL' => 2, 'VARIABLES' => 2, - 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, - 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, - 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, - 'PARTITIONS' => 2, 'PLUGIN_DIR' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, - 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, - 'TABLE_NAME' => 2, - 'COLUMN_NAME' => 2, 'CURSOR_NAME' => 2, 'DIAGNOSTICS' => 2, 'EXTENT_SIZE' => 2, - 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, 'MICROSECOND' => 2, - 'MYSQL_ERRNO' => 2, 'PROCESSLIST' => 2, 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, - 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, 'UNCOMMITTED' => 2, - 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'CONTRIBUTORS' => 2, - 'DEFAULT_AUTH' => 2, 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, - 'MASTER_DELAY' => 2, 'MESSAGE_TEXT' => 2, 'MULTIPOLYGON' => 2, - 'OLD_PASSWORD' => 2, 'PARTITIONING' => 2, 'RELAY_THREAD' => 2, - 'SERIALIZABLE' => 2, 'SQL_NO_CACHE' => 2, 'SQL_TSI_HOUR' => 2, - 'SQL_TSI_WEEK' => 2, 'SQL_TSI_YEAR' => 2, 'SUBPARTITION' => 2, - 'TIMESTAMPADD' => 2, - 'COLUMN_FORMAT' => 2, 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, - 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, - 'TIMESTAMPDIFF' => 2, 'WEIGHT_STRING' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, - 'MASTER_LOG_POS' => 2, 'MASTER_SSL_CRL' => 2, 'MASTER_SSL_KEY' => 2, - 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, - 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, - 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, - 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, 'MASTER_SSL_CERT' => 2, - 'MULTILINESTRING' => 2, 'SQL_AFTER_GTIDS' => 2, 'SQL_TSI_QUARTER' => 2, - 'SUBCLASS_ORIGIN' => 2, - 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'SQL_BEFORE_GTIDS' => 2, - 'STATS_PERSISTENT' => 2, 'UNDO_BUFFER_SIZE' => 2, - 'CONSTRAINT_SCHEMA' => 2, 'IGNORE_SERVER_IDS' => 2, 'MASTER_SSL_CAPATH' => 2, - 'MASTER_SSL_CIPHER' => 2, 'RETURNED_SQLSTATE' => 2, 'SQL_BUFFER_RESULT' => 2, - 'STATS_AUTO_RECALC' => 2, - 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, 'MASTER_RETRY_COUNT' => 2, - 'MASTER_SSL_CRLPATH' => 2, 'SQL_AFTER_MTS_GAPS' => 2, 'STATS_SAMPLE_PAGES' => 2, - 'MASTER_AUTO_POSITION' => 2, 'MASTER_CONNECT_RETRY' => 2, - 'MAX_QUERIES_PER_HOUR' => 2, 'MAX_UPDATES_PER_HOUR' => 2, - 'MAX_USER_CONNECTIONS' => 2, - 'MASTER_HEARTBEAT_PERIOD' => 2, - 'MAX_CONNECTIONS_PER_HOUR' => 2, - - 'NOT NULL' => 4, - 'INDEX KEY' => 4, - 'UNIQUE KEY' => 4, - 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, - 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, - 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, - 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, - 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, - 'DEFAULT CHARACTER SET' => 4, - - ); -} diff --git a/libraries/sql-parser/src/Contexts/Context_MySQL50700.php b/libraries/sql-parser/src/Contexts/Context_MySQL50700.php deleted file mode 100644 index b795b2d6e7..0000000000 --- a/libraries/sql-parser/src/Contexts/Context_MySQL50700.php +++ /dev/null @@ -1,208 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class Context_MySQL50700 extends Context -{ - - public static $KEYWORDS = array( - - 'AS' => 1, 'BY' => 1, 'IF' => 1, 'IN' => 1, 'IS' => 1, - 'ON' => 1, 'OR' => 1, 'TO' => 1, - 'ADD' => 1, 'ALL' => 1, 'AND' => 1, 'ASC' => 1, 'DEC' => 1, - 'DIV' => 1, 'FOR' => 1, 'GET' => 1, 'INT' => 1, 'KEY' => 1, - 'MOD' => 1, 'NOT' => 1, 'OUT' => 1, 'SET' => 1, 'SQL' => 1, - 'SSL' => 1, 'USE' => 1, 'XOR' => 1, - 'BLOB' => 1, 'BOTH' => 1, 'CALL' => 1, 'CASE' => 1, - 'CHAR' => 1, 'DESC' => 1, 'DROP' => 1, 'DUAL' => 1, - 'EACH' => 1, 'ELSE' => 1, 'EXIT' => 1, 'FROM' => 1, - 'INT1' => 1, 'INT2' => 1, 'INT3' => 1, 'INT4' => 1, - 'INT8' => 1, 'INTO' => 1, 'JOIN' => 1, 'KEYS' => 1, - 'KILL' => 1, 'LEFT' => 1, 'LIKE' => 1, 'LOAD' => 1, - 'LOCK' => 1, 'LONG' => 1, 'LOOP' => 1, 'NULL' => 1, - 'READ' => 1, 'REAL' => 1, 'SHOW' => 1, 'THEN' => 1, - 'TRUE' => 1, 'UNDO' => 1, 'WHEN' => 1, 'WITH' => 1, - 'ALTER' => 1, 'CHECK' => 1, 'CROSS' => 1, 'FALSE' => 1, - 'FETCH' => 1, 'FLOAT' => 1, 'FORCE' => 1, 'GRANT' => 1, - 'GROUP' => 1, 'INDEX' => 1, 'INNER' => 1, 'INOUT' => 1, - 'LEAVE' => 1, 'LIMIT' => 1, 'LINES' => 1, 'MATCH' => 1, - 'ORDER' => 1, 'OUTER' => 1, 'PURGE' => 1, 'RANGE' => 1, - 'READS' => 1, 'RIGHT' => 1, 'RLIKE' => 1, 'TABLE' => 1, - 'UNION' => 1, 'USAGE' => 1, 'USING' => 1, 'WHERE' => 1, - 'WHILE' => 1, 'WRITE' => 1, - 'BEFORE' => 1, 'BIGINT' => 1, 'BINARY' => 1, 'CHANGE' => 1, - 'COLUMN' => 1, 'CREATE' => 1, 'CURSOR' => 1, 'DELETE' => 1, - 'DOUBLE' => 1, 'ELSEIF' => 1, 'EXISTS' => 1, 'FLOAT4' => 1, - 'FLOAT8' => 1, 'HAVING' => 1, 'IGNORE' => 1, 'INFILE' => 1, - 'INSERT' => 1, 'LINEAR' => 1, 'OPTION' => 1, 'REGEXP' => 1, - 'RENAME' => 1, 'REPEAT' => 1, 'RETURN' => 1, 'REVOKE' => 1, - 'SCHEMA' => 1, 'SELECT' => 1, 'SIGNAL' => 1, 'STORED' => 1, - 'UNIQUE' => 1, 'UNLOCK' => 1, 'UPDATE' => 1, 'VALUES' => 1, - 'ANALYZE' => 1, 'BETWEEN' => 1, 'CASCADE' => 1, 'COLLATE' => 1, - 'CONVERT' => 1, 'DECIMAL' => 1, 'DECLARE' => 1, 'DEFAULT' => 1, - 'DELAYED' => 1, 'ESCAPED' => 1, 'EXPLAIN' => 1, 'FOREIGN' => 1, - 'INTEGER' => 1, 'ITERATE' => 1, 'LEADING' => 1, 'NATURAL' => 1, - 'NUMERIC' => 1, 'OUTFILE' => 1, 'PRIMARY' => 1, 'RELEASE' => 1, - 'REPLACE' => 1, 'REQUIRE' => 1, 'SCHEMAS' => 1, 'SPATIAL' => 1, - 'TINYINT' => 1, 'TRIGGER' => 1, 'VARCHAR' => 1, 'VARYING' => 1, - 'VIRTUAL' => 1, - 'CONTINUE' => 1, 'DATABASE' => 1, 'DAY_HOUR' => 1, - 'DESCRIBE' => 1, 'DISTINCT' => 1, 'ENCLOSED' => 1, - 'FULLTEXT' => 1, 'INTERVAL' => 1, 'LONGBLOB' => 1, - 'LONGTEXT' => 1, 'MAXVALUE' => 1, 'MODIFIES' => 1, - 'OPTIMIZE' => 1, 'RESIGNAL' => 1, 'RESTRICT' => 1, - 'SMALLINT' => 1, 'SPECIFIC' => 1, 'SQLSTATE' => 1, - 'STARTING' => 1, 'TINYBLOB' => 1, 'TINYTEXT' => 1, - 'TRAILING' => 1, 'UNSIGNED' => 1, 'UTC_DATE' => 1, - 'UTC_TIME' => 1, 'ZEROFILL' => 1, - 'CHARACTER' => 1, 'CONDITION' => 1, 'DATABASES' => 1, - 'GENERATED' => 1, 'LOCALTIME' => 1, 'MEDIUMINT' => 1, - 'MIDDLEINT' => 1, 'PARTITION' => 1, 'PRECISION' => 1, - 'PROCEDURE' => 1, 'SENSITIVE' => 1, 'SEPARATOR' => 1, - 'VARBINARY' => 1, - 'ACCESSIBLE' => 1, 'ASENSITIVE' => 1, 'CONSTRAINT' => 1, - 'DAY_MINUTE' => 1, 'DAY_SECOND' => 1, 'MEDIUMBLOB' => 1, - 'MEDIUMTEXT' => 1, 'OPTIONALLY' => 1, 'READ_WRITE' => 1, - 'REFERENCES' => 1, 'SQLWARNING' => 1, 'TERMINATED' => 1, - 'YEAR_MONTH' => 1, - 'DISTINCTROW' => 1, 'HOUR_MINUTE' => 1, 'HOUR_SECOND' => 1, - 'INSENSITIVE' => 1, 'MASTER_BIND' => 1, - 'CURRENT_DATE' => 1, 'CURRENT_TIME' => 1, 'CURRENT_USER' => 1, - 'LOW_PRIORITY' => 1, 'SQLEXCEPTION' => 1, 'VARCHARACTER' => 1, - 'DETERMINISTIC' => 1, 'HIGH_PRIORITY' => 1, 'MINUTE_SECOND' => 1, - 'STRAIGHT_JOIN' => 1, 'UTC_TIMESTAMP' => 1, - 'IO_AFTER_GTIDS' => 1, 'LOCALTIMESTAMP' => 1, 'SQL_BIG_RESULT' => 1, - 'DAY_MICROSECOND' => 1, 'IO_BEFORE_GTIDS' => 1, 'OPTIMIZER_COSTS' => 1, - 'HOUR_MICROSECOND' => 1, 'SQL_SMALL_RESULT' => 1, - 'CURRENT_TIMESTAMP' => 1, - 'MINUTE_MICROSECOND' => 1, 'NO_WRITE_TO_BINLOG' => 1, - 'SECOND_MICROSECOND' => 1, - 'SQL_CALC_FOUND_ROWS' => 1, - 'MASTER_SSL_VERIFY_SERVER_CERT' => 1, - - 'AT' => 2, 'DO' => 2, 'IO' => 2, 'NO' => 2, 'XA' => 2, - 'ANY' => 2, 'AVG' => 2, 'BIT' => 2, 'CPU' => 2, 'DAY' => 2, 'END' => 2, - 'IPC' => 2, 'NDB' => 2, 'NEW' => 2, 'ONE' => 2, 'ROW' => 2, 'XID' => 2, - 'XML' => 2, - 'BOOL' => 2, 'BYTE' => 2, 'CODE' => 2, 'CUBE' => 2, 'DATA' => 2, 'DATE' => 2, - 'DISK' => 2, 'ENDS' => 2, 'ENUM' => 2, 'FAST' => 2, 'FILE' => 2, 'FULL' => 2, - 'HASH' => 2, 'HELP' => 2, 'HOST' => 2, 'HOUR' => 2, 'LAST' => 2, 'LESS' => 2, - 'LIST' => 2, 'LOGS' => 2, 'MODE' => 2, 'NAME' => 2, 'NEXT' => 2, 'NONE' => 2, - 'ONLY' => 2, 'OPEN' => 2, 'PAGE' => 2, 'PORT' => 2, 'PREV' => 2, 'ROWS' => 2, - 'SLOW' => 2, 'SOME' => 2, 'STOP' => 2, 'TEXT' => 2, 'THAN' => 2, 'TIME' => 2, - 'TYPE' => 2, 'USER' => 2, 'VIEW' => 2, 'WAIT' => 2, 'WEEK' => 2, 'WORK' => 2, - 'X509' => 2, 'YEAR' => 2, - 'AFTER' => 2, 'ASCII' => 2, 'BEGIN' => 2, 'BLOCK' => 2, 'BTREE' => 2, - 'CACHE' => 2, 'CHAIN' => 2, 'CLOSE' => 2, 'ERROR' => 2, 'EVENT' => 2, - 'EVERY' => 2, 'FIRST' => 2, 'FIXED' => 2, 'FLUSH' => 2, 'FOUND' => 2, - 'HOSTS' => 2, 'LEVEL' => 2, 'LOCAL' => 2, 'LOCKS' => 2, 'MERGE' => 2, - 'MONTH' => 2, 'MUTEX' => 2, 'NAMES' => 2, 'NCHAR' => 2, 'NEVER' => 2, - 'OWNER' => 2, 'PHASE' => 2, 'POINT' => 2, 'PROXY' => 2, 'QUERY' => 2, - 'QUICK' => 2, 'RELAY' => 2, 'RESET' => 2, 'RTREE' => 2, 'SHARE' => 2, - 'SLAVE' => 2, 'START' => 2, 'SUPER' => 2, 'SWAPS' => 2, 'TYPES' => 2, - 'UNTIL' => 2, 'VALUE' => 2, - 'ACTION' => 2, 'ALWAYS' => 2, 'BACKUP' => 2, 'BINLOG' => 2, 'CIPHER' => 2, - 'CLIENT' => 2, 'COMMIT' => 2, 'ENABLE' => 2, 'ENGINE' => 2, 'ERRORS' => 2, - 'ESCAPE' => 2, 'EVENTS' => 2, 'EXPIRE' => 2, 'EXPORT' => 2, 'FAULTS' => 2, - 'FIELDS' => 2, 'FILTER' => 2, 'FORMAT' => 2, 'GLOBAL' => 2, 'GRANTS' => 2, - 'IMPORT' => 2, 'ISSUER' => 2, 'LEAVES' => 2, 'MASTER' => 2, 'MEDIUM' => 2, - 'MEMORY' => 2, 'MINUTE' => 2, 'MODIFY' => 2, 'NUMBER' => 2, 'OFFSET' => 2, - 'PARSER' => 2, 'PLUGIN' => 2, 'RELOAD' => 2, 'REMOVE' => 2, 'REPAIR' => 2, - 'RESUME' => 2, 'ROLLUP' => 2, 'SECOND' => 2, 'SERIAL' => 2, 'SERVER' => 2, - 'SIGNED' => 2, 'SIMPLE' => 2, 'SOCKET' => 2, 'SONAME' => 2, 'SOUNDS' => 2, - 'SOURCE' => 2, 'STARTS' => 2, 'STATUS' => 2, 'STRING' => 2, 'TABLES' => 2, - 'ACCOUNT' => 2, 'AGAINST' => 2, 'ANALYSE' => 2, 'BOOLEAN' => 2, 'CHANGED' => 2, - 'CHANNEL' => 2, 'CHARSET' => 2, 'COLUMNS' => 2, 'COMMENT' => 2, 'COMPACT' => 2, - 'CONTEXT' => 2, 'CURRENT' => 2, 'DEFINER' => 2, 'DISABLE' => 2, 'DISCARD' => 2, - 'DYNAMIC' => 2, 'ENGINES' => 2, 'EXECUTE' => 2, 'FOLLOWS' => 2, 'GENERAL' => 2, - 'HANDLER' => 2, 'INDEXES' => 2, 'INSTALL' => 2, 'INVOKER' => 2, 'LOGFILE' => 2, - 'MIGRATE' => 2, 'NO_WAIT' => 2, 'OPTIONS' => 2, 'PARTIAL' => 2, 'PLUGINS' => 2, - 'POLYGON' => 2, 'PREPARE' => 2, 'PROFILE' => 2, 'QUARTER' => 2, 'REBUILD' => 2, - 'RECOVER' => 2, 'RESTORE' => 2, 'RETURNS' => 2, 'REVERSE' => 2, 'ROUTINE' => 2, - 'SESSION' => 2, 'STACKED' => 2, 'STORAGE' => 2, 'SUBJECT' => 2, 'SUSPEND' => 2, - 'UNICODE' => 2, 'UNKNOWN' => 2, 'UPGRADE' => 2, 'USE_FRM' => 2, 'WITHOUT' => 2, - 'WRAPPER' => 2, - 'CASCADED' => 2, 'CHECKSUM' => 2, 'COALESCE' => 2, 'CONTAINS' => 2, - 'DATAFILE' => 2, 'DATETIME' => 2, 'DUMPFILE' => 2, 'EXCHANGE' => 2, - 'EXTENDED' => 2, 'FUNCTION' => 2, 'GEOMETRY' => 2, 'LANGUAGE' => 2, - 'MAX_ROWS' => 2, 'MAX_SIZE' => 2, 'MIN_ROWS' => 2, 'NATIONAL' => 2, - 'NVARCHAR' => 2, 'PASSWORD' => 2, 'PRECEDES' => 2, 'PRESERVE' => 2, - 'PROFILES' => 2, 'REDOFILE' => 2, 'RELAYLOG' => 2, 'ROLLBACK' => 2, - 'SCHEDULE' => 2, 'SECURITY' => 2, 'SHUTDOWN' => 2, 'SNAPSHOT' => 2, - 'SWITCHES' => 2, 'TRIGGERS' => 2, 'TRUNCATE' => 2, 'UNDOFILE' => 2, - 'WARNINGS' => 2, - 'AGGREGATE' => 2, 'ALGORITHM' => 2, 'COLLATION' => 2, 'COMMITTED' => 2, - 'DIRECTORY' => 2, 'DUPLICATE' => 2, 'EXPANSION' => 2, 'IO_THREAD' => 2, - 'ISOLATION' => 2, 'NODEGROUP' => 2, 'PACK_KEYS' => 2, 'READ_ONLY' => 2, - 'REDUNDANT' => 2, 'ROW_COUNT' => 2, 'SAVEPOINT' => 2, 'SQL_CACHE' => 2, - 'TEMPORARY' => 2, 'TEMPTABLE' => 2, 'TIMESTAMP' => 2, 'UNDEFINED' => 2, - 'UNINSTALL' => 2, 'VARIABLES' => 2, - 'COMPLETION' => 2, 'COMPRESSED' => 2, 'CONCURRENT' => 2, 'CONNECTION' => 2, - 'CONSISTENT' => 2, 'DEALLOCATE' => 2, 'GET_FORMAT' => 2, 'IDENTIFIED' => 2, - 'LINESTRING' => 2, 'MASTER_SSL' => 2, 'MULTIPOINT' => 2, 'NDBCLUSTER' => 2, - 'PARTITIONS' => 2, 'PLUGIN_DIR' => 2, 'PRIVILEGES' => 2, 'REORGANIZE' => 2, - 'REPEATABLE' => 2, 'ROW_FORMAT' => 2, 'SQL_THREAD' => 2, 'TABLESPACE' => 2, - 'TABLE_NAME' => 2, 'VALIDATION' => 2, - 'COLUMN_NAME' => 2, 'COMPRESSION' => 2, 'CURSOR_NAME' => 2, 'DIAGNOSTICS' => 2, - 'EXTENT_SIZE' => 2, 'MASTER_HOST' => 2, 'MASTER_PORT' => 2, 'MASTER_USER' => 2, - 'MICROSECOND' => 2, 'MYSQL_ERRNO' => 2, 'NONBLOCKING' => 2, 'PROCESSLIST' => 2, - 'REPLICATION' => 2, 'SCHEMA_NAME' => 2, 'SQL_TSI_DAY' => 2, 'TRANSACTION' => 2, - 'UNCOMMITTED' => 2, - 'CATALOG_NAME' => 2, 'CLASS_ORIGIN' => 2, 'DEFAULT_AUTH' => 2, - 'DES_KEY_FILE' => 2, 'INITIAL_SIZE' => 2, 'MASTER_DELAY' => 2, - 'MESSAGE_TEXT' => 2, 'MULTIPOLYGON' => 2, 'OLD_PASSWORD' => 2, - 'PARTITIONING' => 2, 'RELAY_THREAD' => 2, 'SERIALIZABLE' => 2, - 'SQL_NO_CACHE' => 2, 'SQL_TSI_HOUR' => 2, 'SQL_TSI_WEEK' => 2, - 'SQL_TSI_YEAR' => 2, 'SUBPARTITION' => 2, 'TIMESTAMPADD' => 2, - 'COLUMN_FORMAT' => 2, 'INSERT_METHOD' => 2, 'MASTER_SSL_CA' => 2, - 'RELAY_LOG_POS' => 2, 'SQL_TSI_MONTH' => 2, 'SUBPARTITIONS' => 2, - 'TIMESTAMPDIFF' => 2, 'WEIGHT_STRING' => 2, - 'AUTO_INCREMENT' => 2, 'AVG_ROW_LENGTH' => 2, 'KEY_BLOCK_SIZE' => 2, - 'MASTER_LOG_POS' => 2, 'MASTER_SSL_CRL' => 2, 'MASTER_SSL_KEY' => 2, - 'RELAY_LOG_FILE' => 2, 'SQL_TSI_MINUTE' => 2, 'SQL_TSI_SECOND' => 2, - 'TABLE_CHECKSUM' => 2, 'USER_RESOURCES' => 2, - 'AUTOEXTEND_SIZE' => 2, 'CONSTRAINT_NAME' => 2, 'DELAY_KEY_WRITE' => 2, - 'FILE_BLOCK_SIZE' => 2, 'MASTER_LOG_FILE' => 2, 'MASTER_PASSWORD' => 2, - 'MASTER_SSL_CERT' => 2, 'MULTILINESTRING' => 2, 'PARSE_GCOL_EXPR' => 2, - 'REPLICATE_DO_DB' => 2, 'SQL_AFTER_GTIDS' => 2, 'SQL_TSI_QUARTER' => 2, - 'SUBCLASS_ORIGIN' => 2, - 'MASTER_SERVER_ID' => 2, 'REDO_BUFFER_SIZE' => 2, 'SQL_BEFORE_GTIDS' => 2, - 'STATS_PERSISTENT' => 2, 'UNDO_BUFFER_SIZE' => 2, - 'CONSTRAINT_SCHEMA' => 2, 'GROUP_REPLICATION' => 2, 'IGNORE_SERVER_IDS' => 2, - 'MASTER_SSL_CAPATH' => 2, 'MASTER_SSL_CIPHER' => 2, 'RETURNED_SQLSTATE' => 2, - 'SQL_BUFFER_RESULT' => 2, 'STATS_AUTO_RECALC' => 2, - 'CONSTRAINT_CATALOG' => 2, 'GEOMETRYCOLLECTION' => 2, 'MASTER_RETRY_COUNT' => 2, - 'MASTER_SSL_CRLPATH' => 2, 'MAX_STATEMENT_TIME' => 2, 'REPLICATE_DO_TABLE' => 2, - 'SQL_AFTER_MTS_GAPS' => 2, 'STATS_SAMPLE_PAGES' => 2, - 'REPLICATE_IGNORE_DB' => 2, - 'MASTER_AUTO_POSITION' => 2, 'MASTER_CONNECT_RETRY' => 2, - 'MAX_QUERIES_PER_HOUR' => 2, 'MAX_UPDATES_PER_HOUR' => 2, - 'MAX_USER_CONNECTIONS' => 2, 'REPLICATE_REWRITE_DB' => 2, - 'REPLICATE_IGNORE_TABLE' => 2, - 'MASTER_HEARTBEAT_PERIOD' => 2, 'REPLICATE_WILD_DO_TABLE' => 2, - 'MAX_CONNECTIONS_PER_HOUR' => 2, - 'REPLICATE_WILD_IGNORE_TABLE' => 2, - - 'NOT NULL' => 4, - 'INDEX KEY' => 4, - 'UNIQUE KEY' => 4, - 'FOREIGN KEY' => 4, 'PRIMARY KEY' => 4, 'PRIMARY KEY' => 4, 'SPATIAL KEY' => 4, - 'FULLTEXT KEY' => 4, 'UNIQUE INDEX' => 4, - 'CHARACTER SET' => 4, 'IF NOT EXISTS' => 4, 'SPATIAL INDEX' => 4, - 'DATA DIRECTORY' => 4, 'FULLTEXT INDEX' => 4, - 'DEFAULT COLLATE' => 4, 'INDEX DIRECTORY' => 4, - 'DEFAULT CHARACTER SET' => 4, - - ); -} From ec750bec1caafe01bbab46da46a3ebd8490b940a Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 26 Jun 2015 15:20:48 +0300 Subject: [PATCH 28/57] Refactoring. Improved documentation. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/ClassLoader.php | 250 +++++++++++ libraries/sql-parser/autoload.php | 26 +- libraries/sql-parser/composer/ClassLoader.php | 419 ------------------ 3 files changed, 267 insertions(+), 428 deletions(-) create mode 100644 libraries/sql-parser/ClassLoader.php delete mode 100644 libraries/sql-parser/composer/ClassLoader.php diff --git a/libraries/sql-parser/ClassLoader.php b/libraries/sql-parser/ClassLoader.php new file mode 100644 index 0000000000..3ff2f69de3 --- /dev/null +++ b/libraries/sql-parser/ClassLoader.php @@ -0,0 +1,250 @@ + + * Jordi Boggiano + * + * @package SqlParser + * @subpackage Autoload + */ +namespace SqlParser\Autoload; + +/** + * ClassLoader implements a PSR-4 class loader, + * + * This class is loosely based on the Symfony UniversalClassLoader. + * This class is a stripped version of Composer's ClassLoader. + * + * @package SqlParser + * @subpackage Autoload + * @author Fabien Potencier + * @author Jordi Boggiano + */ +class ClassLoader +{ + public $prefixLengths = array(); + public $prefixDirs = array(); + public $fallbackDirs = array(); + + public $classMap = array(); + + public $classMapAuthoritative = false; + + /** + * @param array $classMap Class to filename map + * + * @return void + */ + public function addClassMap(array $classMap) + { + if (!empty($this->classMap)) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-0 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function add($prefix, $paths, $prepend = false) + { + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirs = array_merge( + (array) $paths, + $this->fallbackDirs + ); + } else { + $this->fallbackDirs = array_merge( + $this->fallbackDirs, + (array) $paths + ); + } + } elseif (!isset($this->prefixDirs[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengths[$prefix[0]][$prefix] = $length; + $this->prefixDirs[$prefix] = (array) $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirs[$prefix] = array_merge( + (array) $paths, + $this->prefixDirs[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirs[$prefix] = array_merge( + $this->prefixDirs[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirs = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengths[$prefix[0]][$prefix] = $length; + $this->prefixDirs[$prefix] = (array) $paths; + } + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + * + * @return void + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + } + + /** + * Unregisters this instance as an autoloader. + * + * @return void + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * + * @return bool|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + includeFile($file); + + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 + if ('\\' == $class[0]) { + $class = substr($class, 1); + } + + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative) { + return false; + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if ($file === null && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if ($file === null) { + // Remember that this class does not exist. + return $this->classMap[$class] = false; + } + + return $file; + } + + /** + * Finds a file that defines the specified class and has the specified + * extension. + * + * @param string $class The name of the class + * @param string $ext The extension of the file + * + * @return string|false The path if found, false otherwise + */ + public function findFileWithExtension($class, $ext) + { + $logicalPath = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengths[$first])) { + foreach ($this->prefixLengths[$first] as $prefix => $length) { + if (0 === strpos($class, $prefix)) { + foreach ($this->prefixDirs[$prefix] as $dir) { + if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPath, $length))) { + return $file; + } + } + } + } + } + + foreach ($this->fallbackDirs as $dir) { + if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPath)) { + return $file; + } + } + + return false; + } +} + +if (!function_exists('SqlParser\\Autoload\\includeFile')) { + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file The name of the file + * + * @return void + */ + function includeFile($file) + { + include $file; + } +} diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php index e0718830ce..85f0d6c986 100644 --- a/libraries/sql-parser/autoload.php +++ b/libraries/sql-parser/autoload.php @@ -4,20 +4,28 @@ * The autoloader used for loading sql-parser's components. * * This file is based on Composer's autoloader. + * + * (c) Nils Adermann + * Jordi Boggiano + * + * @package SqlParser + * @subpackage Autoload */ +namespace SqlParser\Autoload; -if (!class_exists('Composer\\Autoload\\ClassLoader')) { - include_once './libraries/sql-parser/composer/ClassLoader.php'; +if (!class_exists('SqlParser\\Autoload\\ClassLoader')) { + include_once './libraries/sql-parser/ClassLoader.php'; } -use Composer\Autoload\ClassLoader; +use SqlParser\Autoload\ClassLoader; /** - * Initializes Composer's autoloader. + * Initializes the autoloader. * - * @package SqlParser + * @package SqlParser + * @subpackage Autoload */ -class ComposerAutoloaderInit +class AutoloaderInit { /** @@ -43,7 +51,7 @@ class ComposerAutoloaderInit self::$loader = $loader = new ClassLoader(); foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); + $loader->set($namespace, $path); } $loader->register(true); @@ -52,8 +60,8 @@ class ComposerAutoloaderInit } } -// Initializing Composer's autoloader -return ComposerAutoloaderInit::getLoader( +// Initializing the autoloader. +return AutoloaderInit::getLoader( array( 'SqlParser\\' => array(dirname(__FILE__) . '/src'), ) diff --git a/libraries/sql-parser/composer/ClassLoader.php b/libraries/sql-parser/composer/ClassLoader.php deleted file mode 100644 index d2fd53f82d..0000000000 --- a/libraries/sql-parser/composer/ClassLoader.php +++ /dev/null @@ -1,419 +0,0 @@ - - * Jordi Boggiano - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Composer\Autoload; - -/** - * ClassLoader implements a PSR-0 class loader - * - * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md - * - * $loader = new \Composer\Autoload\ClassLoader(); - * - * // register classes with namespaces - * $loader->add('Symfony\Component', __DIR__.'/component'); - * $loader->add('Symfony', __DIR__.'/framework'); - * - * // activate the autoloader - * $loader->register(); - * - * // to enable searching the include path (eg. for PEAR packages) - * $loader->setUseIncludePath(true); - * - * In this example, if you try to use a class in the Symfony\Component - * namespace or one of its children (Symfony\Component\Console for instance), - * the autoloader will first look for the class under the component/ - * directory, and it will then fallback to the framework/ directory if not - * found before giving up. - * - * This class is loosely based on the Symfony UniversalClassLoader. - * - * @author Fabien Potencier - * @author Jordi Boggiano - */ -class ClassLoader -{ - // PSR-4 - public $prefixLengthsPsr4 = array(); - public $prefixDirsPsr4 = array(); - public $fallbackDirsPsr4 = array(); - - // PSR-0 - public $prefixesPsr0 = array(); - public $fallbackDirsPsr0 = array(); - - public $useIncludePath = false; - public $classMap = array(); - - public $classMapAuthoritative = false; - - /** - * @param array $classMap Class to filename map - * - * @return void - */ - public function addClassMap(array $classMap) - { - if (!empty($this->classMap)) { - $this->classMap = array_merge($this->classMap, $classMap); - } else { - $this->classMap = $classMap; - } - } - - /** - * Registers a set of PSR-0 directories for a given prefix, either - * appending or prepending to the ones previously set for this prefix. - * - * @param string $prefix The prefix - * @param array|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories - * - * @return void - */ - public function add($prefix, $paths, $prepend = false) - { - if (!$prefix) { - if ($prepend) { - $this->fallbackDirsPsr0 = array_merge( - (array) $paths, - $this->fallbackDirsPsr0 - ); - } else { - $this->fallbackDirsPsr0 = array_merge( - $this->fallbackDirsPsr0, - (array) $paths - ); - } - - return; - } - - $first = $prefix[0]; - if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; - - return; - } - if ($prepend) { - $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, - $this->prefixesPsr0[$first][$prefix] - ); - } else { - $this->prefixesPsr0[$first][$prefix] = array_merge( - $this->prefixesPsr0[$first][$prefix], - (array) $paths - ); - } - } - - /** - * Registers a set of PSR-4 directories for a given namespace, either - * appending or prepending to the ones previously set for this namespace. - * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-0 base directories - * @param bool $prepend Whether to prepend the directories - * - * @throws \InvalidArgumentException - * - * @return void - */ - public function addPsr4($prefix, $paths, $prepend = false) - { - if (!$prefix) { - // Register directories for the root namespace. - if ($prepend) { - $this->fallbackDirsPsr4 = array_merge( - (array) $paths, - $this->fallbackDirsPsr4 - ); - } else { - $this->fallbackDirsPsr4 = array_merge( - $this->fallbackDirsPsr4, - (array) $paths - ); - } - } elseif (!isset($this->prefixDirsPsr4[$prefix])) { - // Register directories for a new namespace. - $length = strlen($prefix); - if ('\\' !== $prefix[$length - 1]) { - throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); - } - $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; - } elseif ($prepend) { - // Prepend directories for an already registered namespace. - $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, - $this->prefixDirsPsr4[$prefix] - ); - } else { - // Append directories for an already registered namespace. - $this->prefixDirsPsr4[$prefix] = array_merge( - $this->prefixDirsPsr4[$prefix], - (array) $paths - ); - } - } - - /** - * Registers a set of PSR-0 directories for a given prefix, - * replacing any others previously set for this prefix. - * - * @param string $prefix The prefix - * @param array|string $paths The PSR-0 base directories - * - * @return void - */ - public function set($prefix, $paths) - { - if (!$prefix) { - $this->fallbackDirsPsr0 = (array) $paths; - } else { - $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; - } - } - - /** - * Registers a set of PSR-4 directories for a given namespace, - * replacing any others previously set for this namespace. - * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-4 base directories - * - * @throws \InvalidArgumentException - * - * @return void - */ - public function setPsr4($prefix, $paths) - { - if (!$prefix) { - $this->fallbackDirsPsr4 = (array) $paths; - } else { - $length = strlen($prefix); - if ('\\' !== $prefix[$length - 1]) { - throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); - } - $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; - } - } - - /** - * Turns on searching the include path for class files. - * - * @param bool $useIncludePath - * - * @return void - */ - public function setUseIncludePath($useIncludePath) - { - $this->useIncludePath = $useIncludePath; - } - - /** - * Can be used to check if the autoloader uses the include path to check - * for classes. - * - * @return bool - */ - public function getUseIncludePath() - { - return $this->useIncludePath; - } - - /** - * Turns off searching the prefix and fallback directories for classes - * that have not been registered with the class map. - * - * @param bool $classMapAuthoritative - * - * @return void - */ - public function setClassMapAuthoritative($classMapAuthoritative) - { - $this->classMapAuthoritative = $classMapAuthoritative; - } - - /** - * Should class lookup fail if not found in the current class map? - * - * @return bool - */ - public function isClassMapAuthoritative() - { - return $this->classMapAuthoritative; - } - - /** - * Registers this instance as an autoloader. - * - * @param bool $prepend Whether to prepend the autoloader or not - * - * @return void - */ - public function register($prepend = false) - { - spl_autoload_register(array($this, 'loadClass'), true, $prepend); - } - - /** - * Unregisters this instance as an autoloader. - * - * @return void - */ - public function unregister() - { - spl_autoload_unregister(array($this, 'loadClass')); - } - - /** - * Loads the given class or interface. - * - * @param string $class The name of the class - * - * @return bool|null True if loaded, null otherwise - */ - public function loadClass($class) - { - if ($file = $this->findFile($class)) { - includeFile($file); - - return true; - } - } - - /** - * Finds the path to the file where the class is defined. - * - * @param string $class The name of the class - * - * @return string|false The path if found, false otherwise - */ - public function findFile($class) - { - // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 - if ('\\' == $class[0]) { - $class = substr($class, 1); - } - - // class map lookup - if (isset($this->classMap[$class])) { - return $this->classMap[$class]; - } - if ($this->classMapAuthoritative) { - return false; - } - - $file = $this->findFileWithExtension($class, '.php'); - - // Search for Hack files if we are running on HHVM - if ($file === null && defined('HHVM_VERSION')) { - $file = $this->findFileWithExtension($class, '.hh'); - } - - if ($file === null) { - // Remember that this class does not exist. - return $this->classMap[$class] = false; - } - - return $file; - } - - /** - * Finds a file that defines the specified class and has the specified - * extension. - * - * @param string $class - * @param string $ext - * - * @return string - */ - public function findFileWithExtension($class, $ext) - { - // PSR-4 lookup - $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; - - $first = $class[0]; - if (isset($this->prefixLengthsPsr4[$first])) { - foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { - if (0 === strpos($class, $prefix)) { - foreach ($this->prefixDirsPsr4[$prefix] as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { - return $file; - } - } - } - } - } - - // PSR-4 fallback dirs - foreach ($this->fallbackDirsPsr4 as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { - return $file; - } - } - - // PSR-0 lookup - if (false !== $pos = strrpos($class, '\\')) { - // namespaced class name - $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) - . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); - } else { - // PEAR-like class name - $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; - } - - if (isset($this->prefixesPsr0[$first])) { - foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { - if (0 === strpos($class, $prefix)) { - foreach ($dirs as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { - return $file; - } - } - } - } - } - - // PSR-0 fallback dirs - foreach ($this->fallbackDirsPsr0 as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { - return $file; - } - } - - // PSR-0 include paths. - if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { - return $file; - } - } -} - -if (!function_exists('Composer\Autoload\includeFile')) { - - /** - * Scope isolated include. - * - * Prevents access to $this/self from included files. - * - * @param string $file - * - * @return void - */ - function includeFile($file) - { - include $file; - } -} From f7689d5c7ea50a06705441bbf520770e723b4ed5 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 27 Jun 2015 22:07:40 +0300 Subject: [PATCH 29/57] Replaced more of the old parser. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- db_qbe.php | 23 +- import.php | 22 +- libraries/mult_submits.inc.php | 22 +- libraries/sql-parser/src/Lexer.php | 14 +- libraries/sql-parser/src/Parser.php | 2 +- libraries/sql-parser/src/Statement.php | 4 +- .../src/Statements/SelectStatement.php | 14 + libraries/sql-parser/src/Utils/Query.php | 320 +++++++++++++++++- libraries/sql-parser/src/Utils/Routine.php | 4 +- libraries/sql.lib.php | 256 ++++++-------- libraries/structure.lib.php | 21 +- sql.php | 37 +- tbl_row_action.php | 21 +- tbl_select.php | 22 +- 14 files changed, 571 insertions(+), 211 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index 2d6b499106..b57fd31027 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -80,15 +80,30 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) { if (! preg_match('@^SELECT@i', $sql_query)) { $message_to_display = true; } else { - $goto = 'db_sql.php'; + $goto = 'db_sql.php'; // Parse and analyze the query include_once 'libraries/parse_analyze.inc.php'; PMA_executeQueryAndSendQueryResponse( - $analyzed_sql_results, false, $_REQUEST['db'], null, false, null, null, - false, null, null, null, $goto, $pmaThemeImage, null, null, null, - $sql_query, null, null + $analyzed_sql_results, // analyzed_sql_results + false, // is_gotofile + $_REQUEST['db'], // db + null, // table + false, // find_real_end + null, // sql_query_for_bookmark + null, // extra_data + null, // message_to_show + null, // message + null, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + null, // disp_query + null, // disp_message + null, // query_type + $sql_query, // sql_query + null, // selectedTables + null // complete_query ); } } diff --git a/import.php b/import.php index 0576cc8626..38d0d5c48d 100644 --- a/import.php +++ b/import.php @@ -745,10 +745,24 @@ if ($go_sql) { include 'libraries/parse_analyze.inc.php'; $html_output .= PMA_executeQueryAndGetQueryResponse( - $analyzed_sql_results, false, $db, $table, null, - $sql_query, null, $analyzed_sql_results['is_affected'], - null, null, null, $goto, $pmaThemeImage, - null, null, null, $sql_query, null, null + $analyzed_sql_results, // analyzed_sql_results + false, // is_gotofile + $db, // db + $table, // table + null, // find_real_end + $sql_query, // sql_query_for_bookmark + null, // extra_data + null, // message_to_show + null, // message + null, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + null, // disp_query + null, // disp_message + null, // query_type + $sql_query, // sql_query + null, // selectedTables + null // complete_query ); } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 6020c83b76..6500e0221c 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -244,15 +244,31 @@ if (!empty($submit_mult) && !empty($what)) { } if ($use_sql) { + /** * Parse and analyze the query */ include_once 'libraries/parse_analyze.inc.php'; PMA_executeQueryAndSendQueryResponse( - $analyzed_sql_results, false, $db, $table, null, null, null, - false, null, null, null, $goto, $pmaThemeImage, null, null, - $query_type, $sql_query, $selected, null + $analyzed_sql_results, // analyzed_sql_results + false, // is_gotofile + $db, // db + $table, // table + null, // find_real_end + null, // sql_query_for_bookmark + null, // extra_data + null, // message_to_show + null, // message + null, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + null, // disp_query + null, // disp_message + $query_type, // query_type + $sql_query, // sql_query + $selected, // selectedTables + null // complete_query ); } elseif (!$run_parts) { $GLOBALS['dbi']->selectDb($db); diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index d6814259d5..b91db8bf2a 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -100,7 +100,7 @@ class Lexer * * @var TokensList */ - public $tokens; + public $list; /** * Statements delimiter. @@ -164,7 +164,7 @@ class Lexer // context and compare again with `false`. // Another example is `parseComment`. - $tokens = new TokensList(); + $list = new TokensList(); $lastToken = null; for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) { @@ -203,7 +203,7 @@ class Lexer } $token->position = $lastIdx; - $tokens->tokens[$tokens->count++] = $token; + $list->tokens[$list->count++] = $token; // Handling delimiters. if (($token->type === Token::TYPE_NONE) && ($token->value === 'DELIMITER')) { @@ -217,7 +217,7 @@ class Lexer $pos = ++$this->last; if (($token = $this->parseWhitespace()) !== null) { $token->position = $pos; - $tokens->tokens[$tokens->count++] = $token; + $list->tokens[$list->count++] = $token; } // Preparing the token that holds the new delimiter. @@ -238,17 +238,17 @@ class Lexer $this->delimiterLen = strlen($this->delimiter); $token = new Token($this->delimiter, Token::TYPE_DELIMITER); $token->position = $pos; - $tokens->tokens[$tokens->count++] = $token; + $list->tokens[$list->count++] = $token; } $lastToken = $token; } // Adding a final delimite at the end to mark the ending. - $tokens->tokens[$tokens->count++] = new Token(null, Token::TYPE_DELIMITER); + $list->tokens[$list->count++] = new Token(null, Token::TYPE_DELIMITER); // Saving the tokens list. - $this->tokens = $tokens; + $this->list = $list; } /** diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index a2f7ef768d..0a876b7ab1 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -225,7 +225,7 @@ class Parser { if ((is_string($list)) || ($list instanceof UtfString)) { $lexer = new Lexer($list, $strict); - $this->list = $lexer->tokens; + $this->list = $lexer->list; } elseif ($list instanceof TokensList) { $this->list = $list; } diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index a813fff2db..74b2cc3a6a 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -59,6 +59,8 @@ abstract class Statement */ public function parse(Parser $parser, TokensList $list) { + $this->first = $list->idx; + /** * Whether options were parsed or not. * For statements that do not have any options this is set to `true` by @@ -134,7 +136,7 @@ abstract class Statement $this->after($parser, $list, $token); } - $this->last = --$list->idx; // Go back to last used token. + $this->last = $list->idx--; // Go back to last used token. } /** diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 8cdee820e5..0c4c354f19 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -67,6 +67,20 @@ class SelectStatement extends Statement 'SQL_CALC_FOUND_ROWS' => 9, ); + /** + * The sections of this statement, in order. + * + * Used by the query builder to arrange the clauses. + * + * @var array + */ + public static $SECTIONS = array( + 'SELECT' => 0, '%OPTIONS' => 1,'FROM' => 2, 'PARTITION' => 3, + 'WHERE' => 4, 'GROUP BY' => 5, 'HAVING' => 6, 'ORDER BY' => 7, + 'LIMIT' => 8, 'PROCEDURE' => 9, 'INTO' => 10, 'UNION' => 11, + 'JOIN' => 12, '%OPTIONS' => 13 + ); + /** * Expressions that are being selected by this statement. * diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index b1a95b155c..8cb9dfd4fd 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -10,6 +10,7 @@ namespace SqlParser\Utils; use SqlParser\Parser; use SqlParser\Statement; +use SqlParser\Token; use SqlParser\Statements\AlterStatement; use SqlParser\Statements\AnalyzeStatement; use SqlParser\Statements\CallStatement; @@ -61,49 +62,193 @@ class Query $flags = array(); if ($all) { $flags = array( + + /** + * select ... DISTINCT ... + */ 'distinct' => false, + + /** + * drop ... DATABASE ... + */ 'drop_database' => false, + + /** + * ... GROUP BY ... + */ + 'group' => false, + + /** + * ... HAVING ... + */ + 'having' => false, + + /** + * INSERT ... + * or + * REPLACE ... + * or + * DELETE ... + */ 'is_affected' => false, + + /** + * select ... PROCEDURE ANALYSE( ... ) ... + */ 'is_analyse' => false, + + /** + * select COUNT( ... ) ... + */ 'is_count' => false, - 'is_delete' => false, - 'is_explain' => false, + + /** + * DELETE ... + */ + 'is_delete' => false, // @deprecated; use `querytype` + + /** + * EXPLAIN ... + */ + 'is_explain' => false, // @deprecated; use `querytype` + + /** + * select ... INTO OUTFILE ... + */ 'is_export' => false, + + /** + * select FUNC( ... ) ... + */ 'is_func' => false, + + /** + * select ... GROUP BY ... + * or + * select ... HAVING ... + */ 'is_group' => false, + + /** + * INSERT ... + * or + * REPLACE ... + * or + * TODO: LOAD DATA ... + */ 'is_insert' => false, + + /** + * ANALYZE ... + * or + * CHECK ... + * or + * CHECKSUM ... + * or + * OPTIMIZE ... + * or + * REPAIR ... + */ 'is_maint' => false, + + /** + * CALL ... + */ 'is_procedure' => false, - 'is_replace' => false, - 'is_select' => false, - 'is_show' => false, + + /** + * REPLACE ... + */ + 'is_replace' => false, // @deprecated; use `querytype` + + /** + * SELECT ... + */ + 'is_select' => false, // @deprecated; use `querytype` + + /** + * SHOW ... + */ + 'is_show' => false, // @deprecated; use `querytype` + + /** + * Contains a subquery. + */ 'is_subquery' => false, + + /** + * ... JOIN ... + */ 'join' => false, + + /** + * ... LIMIT ... + */ + 'limit' => false, + + /** + * TODO + */ 'offset' => false, + + /** + * ... ORDER ... + */ + 'order' => false, + + /** + * The type of the query (which is usually the first keyword of + * the statement). + */ + 'querytype' => false, + + /** + * Whether a page reload is required. + */ 'reload' => false, + + /** + * SELECT ... FROM ... + */ 'select_from' => false, + + /** + * ... UNION ... + */ 'union' => false ); } - // TODO: 'union', 'join', 'offset' - if (($statement instanceof AlterStatement) - || ($statement instanceof CreateStatement) - ) { + if ($statement instanceof AlterStatement) { + $flags['querytype'] = 'ALTER'; $flags['reload'] = true; - } else if (($statement instanceof AnalyzeStatement) - || ($statement instanceof CheckStatement) - || ($statement instanceof ChecksumStatement) - || ($statement instanceof OptimizeStatement) - || ($statement instanceof RepairStatement) - ) { + } else if ($statement instanceof CreateStatement) { + $flags['querytype'] = 'CREATE'; + $flags['reload'] = true; + } else if ($statement instanceof AnalyzeStatement) { + $flags['querytype'] = 'ANALYZE'; + $flags['is_maint'] = true; + } else if ($statement instanceof CheckStatement) { + $flags['querytype'] = 'CHECK'; + $flags['is_maint'] = true; + } else if ($statement instanceof ChecksumStatement) { + $flags['querytype'] = 'CHECKSUM'; + $flags['is_maint'] = true; + } else if ($statement instanceof OptimizeStatement) { + $flags['querytype'] = 'OPTIMIZE'; + $flags['is_maint'] = true; + } else if ($statement instanceof RepairStatement) { + $flags['querytype'] = 'REPAIR'; $flags['is_maint'] = true; } else if ($statement instanceof CallStatement) { + $flags['querytype'] = 'CALL'; $flags['is_procedure'] = true; } else if ($statement instanceof DeleteStatement) { + $flags['querytype'] = 'DELETE'; $flags['is_delete'] = true; $flags['is_affected'] = true; } else if ($statement instanceof DropStatement) { + $flags['querytype'] = 'DROP'; $flags['reload'] = true; if (($statement->options->has('DATABASE') @@ -112,14 +257,19 @@ class Query $flags['drop_database'] = true; } } else if ($statement instanceof ExplainStatement) { + $flags['querytype'] = 'EXPLAIN'; $flags['is_explain'] = true; } else if ($statement instanceof InsertStatement) { + $flags['querytype'] = 'INSERT'; $flags['is_affected'] = true; $flags['is_insert'] = true; } else if ($statement instanceof ReplaceStatement) { + $flags['querytype'] = 'REPLACE'; $flags['is_affected'] = true; $flags['is_replace'] = true; + $flags['is_insert'] = true; } else if ($statement instanceof SelectStatement) { + $flags['querytype'] = 'SELECT'; $flags['is_select'] = true; if (!empty($statement->from)) { @@ -158,12 +308,43 @@ class Query ) { $flags['is_analyse'] = true; } + + if (!empty($statement->group)) { + $flags['group'] = true; + } + + if (!empty($statement->having)) { + $flags['having'] = true; + } + + if (!empty($statement->union)) { + $flags['union'] = true; + } + + if (!empty($statement->join)) { + $flags['join'] = true; + } + } else if ($statement instanceof ShowStatement) { + $flags['querytype'] = 'SHOW'; $flags['is_show'] = true; } else if ($statement instanceof UpdateStatement) { + $flags['querytype'] = 'UPDATE'; $flags['is_affected'] = true; } + if (($statement instanceof SelectStatement) + || ($statement instanceof UpdateStatement) + || ($statement instanceof DeleteStatement) + ) { + if (!empty($statement->limit)) { + $flags['limit'] = true; + } + if (!empty($statement->order)) { + $flags['order'] = true; + } + } + return $flags; } @@ -190,13 +371,16 @@ class Query $ret['statement'] = $statement; if ($statement instanceof SelectStatement) { - $ret['tables'] = array(); + $ret['select_tables'] = array(); + $ret['select_expr'] = array(); foreach ($statement->expr as $expr) { if (!empty($expr->table)) { - $ret['tables'][] = array( + $ret['select_tables'][] = array( $expr->table, !empty($expr->database) ? $expr->database : null ); + } else { + $ret['select_expr'][] = $expr->expr; } } } @@ -204,4 +388,106 @@ class Query return $ret; } + public static function getClauseType($clause) + { + $type = ''; + for ($i = 0, $len = strlen($clause); $i < $len; ++$i) { + if ((empty($type)) && (ctype_space($type))) { + // Skipping whitespaces if we haven't started determining the + // type. + continue; + } + if (!ctype_alnum($clause[$i])) { + // The type contains only alphanumeric characters. + break; + } + // Adding character. + $type .= $clause[$i]; + } + return $type; + } + + /** + * Replaces the clause in the query. If the clause does not exist, it is + * inserted. + * + * It is a very basic version of a query builder. + * + * @param Statement $statement The parsed query that has to be modified. + * @param TokensList $list The list of tokens. + * @param string $clause The clause to be replaced. + * + * @return string + */ + public static function replaceClause($statement, $list, $clause) + { + + /** + * Current location. + * @var int + */ + $currIdx = 0; + + /** + * The count of brackets. + * We keep track of them so we won't insert the clause in a subquery. + * @var int + */ + $brackets = 0; + + /** + * The sections before the clause + * @var string + */ + $before = ''; + + /** + * The sections after the clause. + * @var string + */ + $after = ''; + + /** + * The place where the clause should be added. + * @var int + */ + $clauseIdx = $statement::$SECTIONS[static::getClauseType($clause)]; + + for ($i = $statement->first; $i <= $statement->last; ++$i) { + + $token = $list->tokens[$i]; + + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === '(') { + ++$brackets; + } elseif ($token->value === ')') { + --$brackets; + } + } + + if ($brackets == 0) { + // Checking if we changed sections. + if ($token->type === Token::TYPE_KEYWORD) { + if (isset($statement::$SECTIONS[$token->value])) { + if ($statement::$SECTIONS[$token->value] > $currIdx) { + $currIdx = $statement::$SECTIONS[$token->value]; + } + } + } + } + + if ($currIdx < $clauseIdx) { + $before .= $token->token; + } elseif ($currIdx > $clauseIdx) { + $after .= $token->value; + } + } + + return $before . ' ' . $clause . ' ' . $after; + } + } diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 4b9b21daef..8298d8d73f 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -39,7 +39,7 @@ class Routine $lexer = new Lexer($param); // A dummy parser is used for error reporting. - $type = DataTypeFragment::parse(new Parser(), $lexer->tokens); + $type = DataTypeFragment::parse(new Parser(), $lexer->list); if ($type === null) { return array('', '', '', '', ''); @@ -71,7 +71,7 @@ class Routine $lexer = new Lexer('(' . $param . ')'); // A dummy parser is used for error reporting. - $param = ParamDefFragment::parse(new Parser(), $lexer->tokens); + $param = ParamDefFragment::parse(new Parser(), $lexer->list); if (empty($param[0])) { return array('', '', '', '', ''); diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index f8959946b0..206da97d60 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -60,7 +60,6 @@ function PMA_getTableNameBySQL($sql, $tables) return trim($table); } - /** * Handle remembered sorting order, only for single table query * @@ -75,31 +74,29 @@ function PMA_handleSortOrder( $db, $table, &$analyzed_sql_results, &$full_sql_query ) { $pmatable = new PMA_Table($table, $db); - if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])) { - $sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN); - if ($sorted_col) { - //remove the tablename from retrieved preference - //to get just the column name and the sort order - $sorted_col = str_replace( - PMA_Util::backquote($table) . '.', '', $sorted_col - ); - // retrieve the remembered sorting order for current table - $sql_order_to_append = ' ORDER BY ' . $sorted_col . ' '; - $full_sql_query - = $analyzed_sql_results['analyzed_sql'][0]['section_before_limit'] - . $sql_order_to_append - . $analyzed_sql_results['analyzed_sql'][0]['limit_clause'] - . ' ' - . $analyzed_sql_results['analyzed_sql'][0]['section_after_limit']; - // update the $analyzed_sql - $analyzed_sql_results['analyzed_sql'][0]['section_before_limit'] - .= $sql_order_to_append; - $analyzed_sql_results['analyzed_sql'][0]['order_by_clause'] - = $sorted_col; + if (empty($analyzed_sql_results['order'])) { + + // Retrieving the name of the column we should sort after. + $sortCol = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN); + if (empty($sortCol)) { + return; } + + // Remove the name of the the table from the retrieved field name. + $sortCol = str_replace(PMA_Util::backquote($table) . '.', '', $sortCol); + + // Create the new query. + $full_sql_query = 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); } else { - // store the remembered table into session + // Store the remembered table into session. $pmatable->setUiProp( PMA_Table::PROP_SORTED_COLUMN, $analyzed_sql_results['analyzed_sql'][0]['order_by_clause'] @@ -110,16 +107,18 @@ function PMA_handleSortOrder( /** * Append limit clause to SQL query * - * @param array $analyzed_sql the analyzed query - * @param string $sql_limit_to_append clause to append + * @param array &$analyzed_sql_results the analyzed query results * * @return string limit clause appended SQL query */ -function PMA_getSqlWithLimitClause($analyzed_sql, - $sql_limit_to_append -) { - return $analyzed_sql[0]['section_before_limit'] . "\n" - . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; +function PMA_getSqlWithLimitClause(&$analyzed_sql_results) +{ + return SqlParser\Utils\Query::replaceClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'LIMIT ' . $_SESSION['tmpval']['pos'] . ', ' + . $_SESSION['tmpval']['max_rows'] + ); } @@ -617,23 +616,15 @@ function PMA_getHtmlForBookmark($displayParts, $cfgBookmark, $sql_query, $db, */ function PMA_isRememberSortingOrder($analyzed_sql_results) { - $select_from = isset( - $analyzed_sql_results['analyzed_sql'][0]['queryflags']['select_from'] - ); - if ($GLOBALS['cfg']['RememberSorting'] + return $GLOBALS['cfg']['RememberSorting'] && ! ($analyzed_sql_results['is_count'] - || $analyzed_sql_results['is_export'] - || $analyzed_sql_results['is_func'] - || $analyzed_sql_results['is_analyse']) - && isset($analyzed_sql_results['analyzed_sql'][0]['select_expr']) - && (count($analyzed_sql_results['analyzed_sql'][0]['select_expr']) == 0) - && $select_from - && count($analyzed_sql_results['analyzed_sql'][0]['table_ref']) == 1 - ) { - return true; - } else { - return false; - } + || $analyzed_sql_results['is_export'] + || $analyzed_sql_results['is_func'] + || $analyzed_sql_results['is_analyse']) + && $analyzed_sql_results['select_from'] + && empty($analyzed_sql_results['select_expr']) + && count($analyzed_sql_results['analyzed_sql']['select_expr']) == 0 + && count($analyzed_sql_results['analyzed_sql']['select_tables']) == 1; } /** @@ -646,20 +637,12 @@ function PMA_isRememberSortingOrder($analyzed_sql_results) */ function PMA_isAppendLimitClause($analyzed_sql_results) { - $select_from = isset( - $analyzed_sql_results['analyzed_sql'][0]['queryflags']['select_from'] - ); - if (($_SESSION['tmpval']['max_rows'] != 'all') + return ($_SESSION['tmpval']['max_rows'] != 'all') && ! ($analyzed_sql_results['is_export'] || $analyzed_sql_results['is_analyse']) - && ($select_from || $analyzed_sql_results['is_subquery']) - && ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['offset']) - && empty($analyzed_sql_results['analyzed_sql'][0]['limit_clause']) - ) { - return true; - } else { - return false; - } + && ($analyzed_sql_results['select_from'] + || $analyzed_sql_results['is_subquery']) + && empty($analyzed_sql_results['limit']); } /** @@ -673,29 +656,18 @@ function PMA_isAppendLimitClause($analyzed_sql_results) */ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end) { - $distinct = isset( - $analyzed_sql_results['analyzed_sql'][0]['queryflags']['distinct'] - ); - - $table_name = isset( - $analyzed_sql_results['analyzed_sql'][0]['table_ref'][1]['table_name'] - ); - if (! $analyzed_sql_results['is_group'] + return ! $analyzed_sql_results['is_group'] && ! $analyzed_sql_results['is_func'] - && ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['union']) - && ! $distinct - && ! $table_name - && (empty($analyzed_sql_results['analyzed_sql'][0]['where_clause']) - || $analyzed_sql_results['analyzed_sql'][0]['where_clause'] == '1 ') - && empty($analyzed_sql_results['analyzed_sql'][0]['group_by_clause']) + && empty($analyzed_sql_results['union']) + && empty($analyzed_sql_results['distinct']) + && count($analyzed_sql_results['select_tables'] <= 1) + && (empty($analyzed_sql_results['statement']->where) + || (count($analyzed_sql_results['statement']->where) == 1 + && $analyzed_sql_results['statement']->where->expr ==='1')) + && empty($analyzed_sql_results['group']) && ! isset($find_real_end) - && !$analyzed_sql_results['is_subquery'] - && empty($analyzed_sql_results['analyzed_sql'][0]['having_clause']) - ) { - return true; - } else { - return false; - } + && ! $analyzed_sql_results['is_subquery'] + && empty($analyzed_sql_results['having']); } /** @@ -708,14 +680,9 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end) */ function PMA_isDeleteTransformationInfo($analyzed_sql_results) { - if (!empty($analyzed_sql_results['analyzed_sql'][0]['querytype']) - && (($analyzed_sql_results['analyzed_sql'][0]['querytype'] == 'ALTER') - || ($analyzed_sql_results['analyzed_sql'][0]['querytype'] == 'DROP')) - ) { - return true; - } else { - return false; - } + return !empty($analyzed_sql_results['querytype']) + && (($analyzed_sql_results['querytype'] == 'ALTER') + || ($analyzed_sql_results['querytype'] == 'DROP')); } /** @@ -1099,18 +1066,13 @@ function PMA_getNumberOfRowsAffectedOrChanged($is_affected, $result) */ function PMA_hasCurrentDbChanged($db) { - // Checks if the current database has changed - // This could happen if the user sends a query like "USE `database`;" - $reload = 0; if (/*overload*/mb_strlen($db)) { $current_db = $GLOBALS['dbi']->fetchValue('SELECT DATABASE()'); // $current_db is false, except when a USE statement was sent - if ($current_db != false && $db !== $current_db) { - $reload = 1; - } + return ($current_db != false) && ($db !== $current_db); } - return $reload; + return false; } /** @@ -1154,26 +1116,25 @@ function PMA_cleanupRelations($db, $table, $dropped_column, $purge, $extra_data) * the 'LIMIT' clause that may have been programatically added * * @param int $num_rows number of rows affected/changed by the query - * @param bool $is_select whether the query is SELECT or not * @param bool $justBrowsing whether just browsing or not * @param string $db the current database * @param string $table the current table - * @param array $parsed_sql parsed sql * @param array $analyzed_sql_results the analyzed query and other variables set * after analyzing the query * * @return int $unlim_num_rows unlimited number of rows */ function PMA_countQueryResults( - $num_rows, $is_select, $justBrowsing, - $db, $table, $parsed_sql, $analyzed_sql_results + $num_rows, $justBrowsing, $db, $table, $analyzed_sql_results ) { if (!PMA_isAppendLimitClause($analyzed_sql_results)) { // if we did not append a limit, set this to get a correct // "Showing rows..." message // $_SESSION['tmpval']['max_rows'] = 'all'; $unlim_num_rows = $num_rows; - } elseif ($is_select || $analyzed_sql_results['is_subquery']) { + } elseif ($analyzed_sql_results['querytype'] == 'SELECT' + || $analyzed_sql_results['is_subquery'] + ) { // c o u n t q u e r y // If we are "just browsing", there is only one table, @@ -1219,10 +1180,12 @@ function PMA_countQueryResults( // SELECT // (SELECT + // TODO: Replace PMA_SQP_ + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $count_query = PMA_SQP_format( - $parsed_sql, + $analyzed_sql_results['parsed_sql'], 'query_only', 0, $analyzed_sql[0]['position_of_first_select'] + 1 @@ -1230,7 +1193,7 @@ function PMA_countQueryResults( $count_query .= ' SQL_CALC_FOUND_ROWS '; // add everything that was after the first SELECT $count_query .= PMA_SQP_format( - $parsed_sql, + $analyzed_sql_results['parsed_sql'], 'query_only', $analyzed_sql[0]['position_of_first_select'] + 1 ); @@ -1341,8 +1304,7 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil ); $unlim_num_rows = PMA_countQueryResults( - $num_rows, $analyzed_sql_results['is_select'], $justBrowsing, $db, - $table, $analyzed_sql_results['parsed_sql'], $analyzed_sql_results + $num_rows, $justBrowsing, $db, $table, $analyzed_sql_results ); $extra_data = PMA_cleanupRelations( @@ -1365,23 +1327,23 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil /** * Delete related tranformatioinformationn information * - * @param String $db current database - * @param String $table current table - * @param array $analyzed_sql analyzed sql query + * @param String $db current database + * @param String $table current table + * @param array $analyzed_sql_results analyzed sql results * * @return void */ -function PMA_deleteTransformationInfo($db, $table, $analyzed_sql) +function PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results) { include_once 'libraries/transformations.lib.php'; - if ($analyzed_sql[0]['querytype'] == 'ALTER') { + if ($analyzed_sql_results['querytype'] == 'ALTER') { $posDrop = /*overload*/mb_stripos( - $analyzed_sql[0]['unsorted_query'], + $analyzed_sql_results['analyzed_sql'][0]['unsorted_query'], 'DROP' ); if ($posDrop !== false) { $drop_column = PMA_getColumnNameInColumnDropSql( - $analyzed_sql[0]['unsorted_query'] + $analyzed_sql_results['analyzed_sql'][0]['unsorted_query'] ); if ($drop_column != '') { @@ -1389,7 +1351,7 @@ function PMA_deleteTransformationInfo($db, $table, $analyzed_sql) } } - } else if (($analyzed_sql[0]['querytype'] == 'DROP') && ($table != '')) { + } else if (($analyzed_sql_results['querytype'] == 'DROP') && ($table != '')) { PMA_clearTransformations($db, $table); } } @@ -1403,14 +1365,14 @@ function PMA_deleteTransformationInfo($db, $table, $analyzed_sql) * * @return string $message */ -function PMA_getMessageForNoRowsReturned($message_to_show, $analyzed_sql_results, - $num_rows +function PMA_getMessageForNoRowsReturned($message_to_show, + $analyzed_sql_results, $num_rows ) { - if ($analyzed_sql_results['is_delete']) { + if ($analyzed_sql_results['querytype'] == 'DELETE"') { $message = PMA_Message::getMessageForDeletedRows($num_rows); } elseif ($analyzed_sql_results['is_insert']) { - if ($analyzed_sql_results['is_replace']) { - // For replace we get DELETED + INSERTED row count, + if ($analyzed_sql_results['querytype'] == 'REPLACE') { + // For REPLACE we get DELETED + INSERTED row count, // so we have to call it affected $message = PMA_Message::getMessageForAffectedRows($num_rows); } else { @@ -1438,7 +1400,9 @@ function PMA_getMessageForNoRowsReturned($message_to_show, $analyzed_sql_results // fact that $message_to_show is sent for every case. // The $message_to_show containing a success message and sent with // the form should not have priority over errors - } elseif (! empty($message_to_show) && ! $analyzed_sql_results['is_select']) { + } elseif (! empty($message_to_show) + && $analyzed_sql_results['querytype'] != 'SELECT' + ) { $message = PMA_Message::rawSuccess(htmlspecialchars($message_to_show)); } elseif (! empty($GLOBALS['show_as_php'])) { $message = PMA_Message::success(__('Showing as PHP code')); @@ -1492,14 +1456,12 @@ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db, $table, $message_to_show, $num_rows, $displayResultsObject, $extra_data ) { if (PMA_isDeleteTransformationInfo($analyzed_sql_results)) { - PMA_deleteTransformationInfo( - $db, $table, $analyzed_sql_results['analyzed_sql'] - ); + PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results); } $message = PMA_getMessageForNoRowsReturned( - isset($message_to_show) ? $message_to_show : null, $analyzed_sql_results, - $num_rows + isset($message_to_show) ? $message_to_show : null, + $analyzed_sql_results, $num_rows ); $html_output = ''; @@ -1526,8 +1488,7 @@ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db, $response = PMA_Response::getInstance(); $response->addJSON(isset($extra_data) ? $extra_data : array()); - $query_type = PMA_DisplayResults::QUERY_TYPE_SELECT; - if ($analyzed_sql_results['analyzed_sql'][0]['querytype'] == $query_type) { + if (!empty($analyzed_sql_results['is_select'])) { $html_output .= $displayResultsObject->getCreateViewQueryResultOp( $analyzed_sql_results['analyzed_sql'] ); @@ -2029,7 +1990,6 @@ function PMA_getQueryResponseForResultsReturned($result, * @param bool|null $find_real_end whether to find real end or not * @param string $sql_query_for_bookmark the sql query to be stored as bookmark * @param array|null $extra_data extra data - * @param bool $is_affected whether affected or not * @param string $message_to_show message to show * @param string $message message * @param array|null $sql_data sql data @@ -2049,16 +2009,29 @@ function PMA_getQueryResponseForResultsReturned($result, */ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, $is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark, - $extra_data, $is_affected, $message_to_show, $message, - $sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message, - $query_type, $sql_query, $selectedTables, $complete_query + $extra_data, $message_to_show, $message, $sql_data, $goto, $pmaThemeImage, + $disp_query, $disp_message, $query_type, $sql_query, $selectedTables, + $complete_query ) { $html_output = PMA_executeQueryAndGetQueryResponse( - $analyzed_sql_results, $is_gotofile, $db, $table, - $find_real_end, $sql_query_for_bookmark, - $extra_data, $is_affected, $message_to_show, $message, - $sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message, - $query_type, $sql_query, $selectedTables, $complete_query + $analyzed_sql_results, // analyzed_sql_results + $is_gotofile, // is_gotofile + $db, // db + $table, // table + $find_real_end, // find_real_end + $sql_query_for_bookmark, // sql_query_for_bookmark + $extra_data, // extra_data + $message_to_show, // message_to_show + $message, // message + $sql_data, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + $disp_query, // disp_query + $disp_message, // disp_message + $query_type, // query_type + $sql_query, // sql_query + $selectedTables, // selectedTables + $complete_query // complete_query ); $response = PMA_Response::getInstance(); @@ -2075,7 +2048,6 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, * @param bool|null $find_real_end whether to find real end or not * @param string $sql_query_for_bookmark the sql query to be stored as bookmark * @param array|null $extra_data extra data - * @param bool $is_affected whether affected or not * @param string $message_to_show message to show * @param string $message message * @param array|null $sql_data sql data @@ -2095,9 +2067,9 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, */ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results, $is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark, - $extra_data, $is_affected, $message_to_show, $message, - $sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message, - $query_type, $sql_query, $selectedTables, $complete_query + $extra_data, $message_to_show, $message, $sql_data, $goto, $pmaThemeImage, + $disp_query, $disp_message, $query_type, $sql_query, $selectedTables, + $complete_query ) { // Include PMA_Index class for use in PMA_DisplayResults class include_once './libraries/Index.class.php'; @@ -2111,7 +2083,7 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results, // Handling is not required when it's a union query // (the parser never sets the 'union' key to 0) if (PMA_isRememberSortingOrder($analyzed_sql_results) - && ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['union']) + && empty($analyzed_sql_results['union']) ) { if (! isset($_SESSION['sql_from_query_box'])) { PMA_handleSortOrder($db, $table, $analyzed_sql_results, $sql_query); @@ -2131,11 +2103,7 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results, // Do append a "LIMIT" clause? if (PMA_isAppendLimitClause($analyzed_sql_results)) { - $full_sql_query = PMA_getSqlWithLimitClause( - $analyzed_sql_results['analyzed_sql'], - ' LIMIT ' . $_SESSION['tmpval']['pos'] - . ', ' . $_SESSION['tmpval']['max_rows'] . " " - ); + $full_sql_query = PMA_getSqlWithLimitClause($analyzed_sql_results); } $GLOBALS['reload'] = PMA_hasCurrentDbChanged($db); @@ -2155,7 +2123,7 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results, ); // No rows returned -> move back to the calling page - if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { + if ((0 == $num_rows && 0 == $unlim_num_rows) || $analyzed_sql_results['is_affected']) { $html_output = PMA_getQueryResponseForNoResultsReturned( $analyzed_sql_results, $db, $table, isset($message_to_show) ? $message_to_show : null, diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 1e896e3755..982b0b79a9 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -3004,9 +3004,24 @@ function PMA_displayTableBrowseForSelectedColumns($db, $table, $goto, include_once 'libraries/sql.lib.php'; PMA_executeQueryAndSendQueryResponse( - $analyzed_sql_results, false, $db, $table, null, null, null, false, - null, null, null, $goto, $pmaThemeImage, null, null, - null, $sql_query, null, null + $analyzed_sql_results, // analyzed_sql_results + false, // is_gotofile + $db, // db + $table, // table + null, // find_real_end + null, // sql_query_for_bookmark + null, // extra_data + null, // message_to_show + null, // message + null, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + null, // disp_query + null, // disp_message + null, // query_type + $sql_query, // sql_query + null, // selectedTables + null // complete_query ); } diff --git a/sql.php b/sql.php index 0e68804f91..5ba7e194c2 100644 --- a/sql.php +++ b/sql.php @@ -197,23 +197,22 @@ if ($goto == 'sql.php') { } // end if PMA_executeQueryAndSendQueryResponse( - $analyzed_sql_results, - $is_gotofile, - $db, - $table, - isset($find_real_end) ? $find_real_end : null, - isset($import_text) ? $import_text : null, - isset($extra_data) ? $extra_data : null, - $is_affected, - isset($message_to_show) ? $message_to_show : null, - isset($message) ? $message : null, - isset($sql_data) ? $sql_data : null, - $goto, - $pmaThemeImage, - isset($disp_query) ? $display_query : null, - isset($disp_message) ? $disp_message : null, - isset($query_type) ? $query_type : null, - $sql_query, - isset($selected) ? $selected : null, - isset($complete_query) ? $complete_query : null + $analyzed_sql_results, // analyzed_sql_results + $is_gotofile, // is_gotofile + $db, // db + $table, // table + isset($find_real_end) ? $find_real_end : null, // find_real_end + isset($import_text) ? $import_text : null, // sql_query_for_bookmark + isset($extra_data) ? $extra_data : null, // extra_data + isset($message_to_show) ? $message_to_show : null, // message_to_show + isset($message) ? $message : null, // message + isset($sql_data) ? $sql_data : null, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + isset($disp_query) ? $display_query : null, // disp_query + isset($disp_message) ? $disp_message : null, // disp_message + isset($query_type) ? $query_type : null, // query_type + $sql_query, // sql_query + isset($selected) ? $selected : null, // selectedTables + isset($complete_query) ? $complete_query : null // complete_query ); diff --git a/tbl_row_action.php b/tbl_row_action.php index 70423e141e..38ccef9b74 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -145,9 +145,24 @@ if (!empty($submit_mult)) { include_once 'libraries/parse_analyze.inc.php'; PMA_executeQueryAndSendQueryResponse( - $analyzed_sql_results, false, $db, $table, null, null, null, false, null, - null, null, $goto, $pmaThemeImage, null, null, null, $sql_query, - null, null + $analyzed_sql_results, // analyzed_sql_results + false, // is_gotofile + $db, // db + $table, // table + null, // find_real_end + null, // sql_query_for_bookmark + null, // extra_data + null, // message_to_show + null, // message + null, // sql_data + $goto, // goto + $pmaThemeImage, // pmaThemeImage + null, // disp_query + null, // disp_message + null, // query_type + $sql_query, // sql_query + null, // selectedTables + null // complete_query ); } } diff --git a/tbl_select.php b/tbl_select.php index 914b547157..84d82784b1 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -64,6 +64,7 @@ if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns'])) $response->addHTML($table_search->getSelectionForm($goto)); } else { + /** * Selection criteria have been submitted -> do the work */ @@ -75,8 +76,23 @@ if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns'])) include_once 'libraries/parse_analyze.inc.php'; PMA_executeQueryAndSendQueryResponse( - $analyzed_sql_results, false, $db, $table, null, null, null, false, - null, null, null, $GLOBALS['goto'], $pmaThemeImage, null, - null, null, $sql_query, null, null + $analyzed_sql_results, // analyzed_sql_results + false, // is_gotofile + $db, // db + $table, // table + null, // find_real_end + null, // sql_query_for_bookmark + null, // extra_data + null, // message_to_show + null, // message + null, // sql_data + $GLOBALS['goto'], // goto + $pmaThemeImage, // pmaThemeImage + null, // disp_query + null, // disp_message + null, // query_type + $sql_query, // sql_query + null, // selectedTables + null // complete_query ); } From 46e44ed0d59868213db8956c8adb17b5398425a1 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 28 Jun 2015 23:57:33 +0300 Subject: [PATCH 30/57] Replaced more of the old parser (2). Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 58 ++++----- libraries/parse_analyze.inc.php | 10 +- .../sql-parser/src/Fragments/LimitKeyword.php | 4 + libraries/sql-parser/src/Parser.php | 10 +- libraries/sql-parser/src/Statement.php | 11 +- .../src/Statements/AlterStatement.php | 105 ++++++++++++++-- .../src/Statements/DropStatement.php | 4 +- .../Statements/NotImplementedStatement.php | 4 +- libraries/sql-parser/src/Utils/Query.php | 99 +++++++++++---- libraries/sql.lib.php | 116 +++++++----------- 10 files changed, 274 insertions(+), 147 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 3ee40f21d3..c793cc0d74 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4201,11 +4201,11 @@ class PMA_DisplayResults /** * Prepare a table of results returned by a SQL query. * - * @param integer &$dt_result the link id associated to the query - * which results have to be displayed - * @param array &$displayParts the parts to display - * @param array $analyzed_sql the analyzed query - * @param boolean $is_limited_display With limited operations or not + * @param integer &$dt_result the link id associated to the query + * which results have to be displayed + * @param array &$displayParts the parts to display + * @param array $analyzed_sql_results analyzed sql results + * @param boolean $is_limited_display With limited operations or not * * @return string $table_html Generated HTML content for resulted table * @@ -4214,10 +4214,13 @@ class PMA_DisplayResults * @see sql.php file */ public function getTable( - &$dt_result, &$displayParts, $analyzed_sql, + &$dt_result, &$displayParts, $analyzed_sql_results, $is_limited_display = false ) { + // TODO: Remove. + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; + $table_html = ''; // Following variable are needed for use in isset/empty or // use with array indexes/safe use in foreach @@ -4236,10 +4239,8 @@ class PMA_DisplayResults && $showtable['Type'] == self::TABLE_TYPE_INNO_DB); if ($is_innodb - && ! isset($analyzed_sql[0]['queryflags']['union']) - && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) - && (empty($analyzed_sql[0]['where_clause']) - || ($analyzed_sql[0]['where_clause'] == '1 ')) + && PMA_isJustBrowsing($analyzed_sql_results, true) + ) { // "j u s t b r o w s i n g" $pre_count = '~'; @@ -4310,9 +4311,7 @@ class PMA_DisplayResults // 2.3 Prepare the navigation bars if (!/*overload*/mb_strlen($this->__get('table'))) { - if (isset($analyzed_sql[0]['query_type']) - && ($analyzed_sql[0]['query_type'] == self::QUERY_TYPE_SELECT) - ) { + if ($analyzed_sql_results['querytype'] == 'SELECT') { // table does not always contain a real table name, // for example in MySQL 5.0.x, the query SHOW STATUS // returns STATUS as a table name @@ -4416,7 +4415,7 @@ class PMA_DisplayResults // 6. ----- Prepare "Query results operations" if ((! isset($printview) || ($printview != '1')) && ! $is_limited_display) { $table_html .= $this->_getResultsOperations( - $displayParts, $analyzed_sql + $displayParts, $analyzed_sql_results ); } @@ -4946,8 +4945,8 @@ class PMA_DisplayResults /** * Generates HTML to display the Create view in span tag * - * @param array $analyzed_sql the analyzed Query - * @param string $url_query String with URL Parameters + * @param array $analyzed_sql_results analyzed sql results + * @param string $url_query String with URL Parameters * * @return string * @@ -4955,10 +4954,10 @@ class PMA_DisplayResults * * @see _getResultsOperations() */ - private function _getLinkForCreateView($analyzed_sql, $url_query) + private function _getLinkForCreateView($analyzed_sql_results, $url_query) { $results_operations_html = ''; - if (!PMA_DRIZZLE && !isset($analyzed_sql[0]['queryflags']['procedure'])) { + if (!PMA_DRIZZLE && empty($analyzed_sql_results['procedure'])) { $ajax_class = ' ajax'; @@ -4979,14 +4978,14 @@ class PMA_DisplayResults /** * Calls the _getResultsOperations with $only_view as true * - * @param array $analyzed_sql the analyzed Query + * @param array $analyzed_sql_results analyzed sql results * * @return string * * @access public * */ - public function getCreateViewQueryResultOp($analyzed_sql) + public function getCreateViewQueryResultOp($analyzed_sql_results) { $results_operations_html = ''; @@ -4994,7 +4993,7 @@ class PMA_DisplayResults //and setting only_view parameter to be true to generate just view $results_operations_html .= $this->_getResultsOperations( array(), - $analyzed_sql, + $analyzed_sql_results, true ); return $results_operations_html; @@ -5027,7 +5026,7 @@ class PMA_DisplayResults * Get operations that are available on results. * * @param array $displayParts the parts to display - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * @param boolean $only_view Whether to show only view * * @return string $results_operations_html html content @@ -5037,7 +5036,7 @@ class PMA_DisplayResults * @see getTable() */ private function _getResultsOperations( - $displayParts, $analyzed_sql, $only_view = false + $displayParts, $analyzed_sql_results, $only_view = false ) { global $printview; @@ -5063,7 +5062,7 @@ class PMA_DisplayResults // show only view and not other options if ($only_view == true) { $results_operations_html .= $this->_getLinkForCreateView( - $analyzed_sql, $url_query + $analyzed_sql_results, $url_query ); if ($header_shown) { @@ -5084,15 +5083,12 @@ class PMA_DisplayResults // If the parser found a PROCEDURE clause // (most probably PROCEDURE ANALYSE()) it makes no sense to // display the Export link). - if (isset($analyzed_sql[0]) - && ($analyzed_sql[0]['querytype'] == self::QUERY_TYPE_SELECT) + if (($analyzed_sql_results['querytype'] == self::QUERY_TYPE_SELECT) && ! isset($printview) - && ! isset($analyzed_sql[0]['queryflags']['procedure']) + && empty($analyzed_sql_results['procedure']) ) { - if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) - && ! isset($analyzed_sql[0]['table_ref'][1]['table_true_name']) - ) { + if (count($analyzed_sql_results['select_tables']) == 1) { $_url_params['single_table'] = 'true'; } @@ -5185,7 +5181,7 @@ class PMA_DisplayResults } $results_operations_html .= $this->_getLinkForCreateView( - $analyzed_sql, $url_query + $analyzed_sql_results, $url_query ); if ($header_shown) { diff --git a/libraries/parse_analyze.inc.php b/libraries/parse_analyze.inc.php index c4c3904002..f2cee87efc 100644 --- a/libraries/parse_analyze.inc.php +++ b/libraries/parse_analyze.inc.php @@ -25,13 +25,13 @@ extract($analyzed_sql_results); // If the targeted table (and database) are different than the ones that is // currently browsed, edit `$db` and `$table` to match them so other elements // (page headers, links, navigation panel) can be updated properly. -if (!empty($analyzed_sql_results['tables'])) { +if (!empty($analyzed_sql_results['select_tables'])) { // Previous table and database name is stored to check if it changed. $prevDb = $db; $prevTable = $table; - if (count($analyzed_sql_results['tables']) > 1) { + if (count($analyzed_sql_results['select_tables']) > 1) { /** * @todo if there are more than one table name in the Select: @@ -41,9 +41,9 @@ if (!empty($analyzed_sql_results['tables'])) { */ $table = ''; } else { - $table = $analyzed_sql_results['tables'][0][0]; - if (!empty($analyzed_sql_results['tables'][0][1])) { - $db = $analyzed_sql_results['tables'][0][1]; + $table = $analyzed_sql_results['select_tables'][0][0]; + if (!empty($analyzed_sql_results['select_tables'][0][1])) { + $db = $analyzed_sql_results['select_tables'][0][1]; } } diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index 261ef3e721..a23eb4c73e 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -70,6 +70,10 @@ class LimitKeyword extends Fragment continue; } + if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { + break; + } + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'OFFSET')) { if ($offset) { $parser->error('An offset was expected.'); diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 0a876b7ab1..2a9bd47c47 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -79,7 +79,11 @@ class Parser * @var array */ public static $KEYWORD_PARSERS = array( - + 'ALTER' => array( + 'class' => 'SqlParser\\Fragments\\FieldFragment', + 'field' => 'table', + 'options' => array('skipColumn' => true), + ), 'ANALYZE' => array( 'class' => 'SqlParser\\Fragments\\FromKeyword', 'field' => 'tables', @@ -100,6 +104,10 @@ class Parser 'class' => 'SqlParser\\Fragments\\FromKeyword', 'field' => 'tables', ), + 'DROP' => array( + 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'field' => 'fields' + ), 'FROM' => array( 'class' => 'SqlParser\\Fragments\\FromKeyword', 'field' => 'from', diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 74b2cc3a6a..f10b5eed7f 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -100,9 +100,18 @@ abstract class Statement */ $field = null; + /** + * Parser's options. + * @var array + */ + $options = array(); + if (!empty(Parser::$KEYWORD_PARSERS[$token->value])) { $class = Parser::$KEYWORD_PARSERS[$token->value]['class']; $field = Parser::$KEYWORD_PARSERS[$token->value]['field']; + if (!empty(Parser::$KEYWORD_PARSERS[$token->value]['options'])) { + $options = Parser::$KEYWORD_PARSERS[$token->value]['options']; + } } if (!empty(Parser::$STATEMENT_PARSERS[$token->value])) { @@ -130,7 +139,7 @@ abstract class Statement // Parsing this keyword. if ($class !== null) { ++$list->idx; // Skipping keyword. - $this->$field = $class::parse($parser, $list, array()); + $this->$field = $class::parse($parser, $list, $options); } $this->after($parser, $list, $token); diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index 1d6b44ca96..b6c18edf3c 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -8,6 +8,11 @@ */ namespace SqlParser\Statements; +use SqlParser\Parser; +use SqlParser\Token; +use SqlParser\TokensList; +use SqlParser\Fragments\FieldFragment; +use SqlParser\Fragments\OptionsFragment; use SqlParser\Statements\NotImplementedStatement; /** @@ -22,6 +27,20 @@ use SqlParser\Statements\NotImplementedStatement; class AlterStatement extends NotImplementedStatement { + /** + * Table affected. + * + * @var FieldFragment + */ + public $table; + + /** + * Column affected by this statement. + * + * @var FieldFragment + */ + public $altered; + /** * Options of this statement. * @@ -29,17 +48,81 @@ class AlterStatement extends NotImplementedStatement */ public static $OPTIONS = array( - 'DATABASE' => 1, - 'EVENT' => 1, - 'FUNCTION' => 1, - 'INDEX' => 1, - 'LOGFILE' => 1, - 'PROCEDURE' => 1, - 'SCHEMA' => 1, - 'SERVER' => 1, - 'TABLE' => 1, - 'TABLESPACE' => 1, - 'TRIGGER' => 1, + 'ONLINE' => 1, + 'OFFLINE' => 1, + + 'IGNORE' => 2, + + 'TABLE' => 3, + + 'ADD' => 4, + 'ALTER' => 4, + 'ANALYZE' => 4, + 'CHANGE' => 4, + 'CHECK' => 4, + 'COALESCE' => 4, + 'CONVERT' => 4, + 'DISABLE' => 4, + 'DISCARD' => 4, + 'DROP' => 4, + 'ENABLE' => 4, + 'IMPORT' => 4, + 'MODIFY' => 4, + 'OPTIMIZE' => 4, + 'ORDER' => 4, + 'PARTITION' => 4, + 'REBUILD' => 4, + 'REMOVE' => 4, + 'RENAME' => 4, + 'REORGANIZE' => 4, + 'REPAIR' => 4, + + 'COLUMN' => 5, + 'CONSTRAINT' => 5, + 'DEFAULT' => 5, + 'TO' => 5, + 'BY' => 5, + 'FOREIGN' => 5, + 'FULLTEXT' => 5, + 'KEYS' => 5, + 'PARTITIONING' => 5, + 'PRIMARY KEY' => 5, + 'SPATIAL' => 5, + 'TABLESPACE' => 5, + 'INDEX' => 5, + + 'DEFAULT CHARACTER SET' => array(6, 'var'), + + 'COLLATE' => array(7, 'var'), ); + /** + * Extracts the name of affected column. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * @param Token $token The token that is being parsed. + * + * @return void + */ + public function after(Parser $parser, TokensList $list, Token $token) + { + // Parsing operation. + ++$list->idx; + $this->options->merge( + OptionsFragment::parse( + $parser, + $list, + static::$OPTIONS + ) + ); + + // Parsing affected field. + ++$list->idx; + $this->altered = FieldFragment::parse($parser, $list); + + // + parent::after($parser, $list, $token); + } + } diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php index 716ca54f84..babf18ac58 100644 --- a/libraries/sql-parser/src/Statements/DropStatement.php +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -48,7 +48,7 @@ class DropStatement extends Statement /** * Dropped elements. * - * @var FromKeyworrd[] + * @var FieldFragment[] */ - public $name; + public $fields; } diff --git a/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/libraries/sql-parser/src/Statements/NotImplementedStatement.php index 1ad5cc50ef..1689df22ee 100644 --- a/libraries/sql-parser/src/Statements/NotImplementedStatement.php +++ b/libraries/sql-parser/src/Statements/NotImplementedStatement.php @@ -16,7 +16,7 @@ use SqlParser\TokensList; /** * Not implemented (yet) statements. * - * The `before` function makes the parser jump straight to the first delimiter. + * The `after` function makes the parser jump straight to the first delimiter. * * @category Statements * @package SqlParser @@ -36,7 +36,7 @@ class NotImplementedStatement extends Statement * * @return void */ - public function before(Parser $parser, TokensList $list, Token $token) + public function after(Parser $parser, TokensList $list, Token $token) { $list->getNextOfType(Token::TYPE_DELIMITER); --$list->idx; diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index 8cb9dfd4fd..dde33042d2 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -373,6 +373,10 @@ class Query if ($statement instanceof SelectStatement) { $ret['select_tables'] = array(); $ret['select_expr'] = array(); + + // Trying to find selected tables only from the select expression. + // Sometimes, this is not possible because the tables aren't defined + // explicitly (e.g. SELECT * FROM film, SELECT film_id FROM film). foreach ($statement->expr as $expr) { if (!empty($expr->table)) { $ret['select_tables'][] = array( @@ -383,16 +387,37 @@ class Query $ret['select_expr'][] = $expr->expr; } } + + // If no tables names were found in the SELECT clause or if there + // are expressions like * or COUNT(*), etc. tables names should be + // extracted from the FROM clause as well. + if ((empty($ret['select_tables'])) || (!$ret['select_expr'])) { + foreach ($statement->from as $expr) { + if (!empty($expr->table)) { + $ret['select_tables'][] = array( + $expr->table, + !empty($expr->database) ? $expr->database : null + ); + } + } + } } return $ret; } + /** + * Gets the type of clause. + * + * @param string $clause The clause. + * + * @return string + */ public static function getClauseType($clause) { $type = ''; for ($i = 0, $len = strlen($clause); $i < $len; ++$i) { - if ((empty($type)) && (ctype_space($type))) { + if ((empty($type)) && (ctype_space($clause[$i]))) { // Skipping whitespaces if we haven't started determining the // type. continue; @@ -408,18 +433,20 @@ class Query } /** - * Replaces the clause in the query. If the clause does not exist, it is - * inserted. - * - * It is a very basic version of a query builder. + * Gets a specific clause. * * @param Statement $statement The parsed query that has to be modified. * @param TokensList $list The list of tokens. - * @param string $clause The clause to be replaced. + * @param string $clause The clause to be returned. + * @param int $type The type of the search. + * -1 for everything that was before + * 0 only for the clause + * 1 for everything after + * @param bool $skipFirst Whether to skip the first keyword in clause. * * @return string */ - public static function replaceClause($statement, $list, $clause) + public static function getClause($statement, $list, $clause, $type = 0, $skipFirst = true) { /** @@ -436,16 +463,10 @@ class Query $brackets = 0; /** - * The sections before the clause + * The string to be returned. * @var string */ - $before = ''; - - /** - * The sections after the clause. - * @var string - */ - $after = ''; + $ret = ''; /** * The place where the clause should be added. @@ -473,21 +494,57 @@ class Query // Checking if we changed sections. if ($token->type === Token::TYPE_KEYWORD) { if (isset($statement::$SECTIONS[$token->value])) { - if ($statement::$SECTIONS[$token->value] > $currIdx) { + if ($statement::$SECTIONS[$token->value] >= $currIdx) { $currIdx = $statement::$SECTIONS[$token->value]; + if (($skipFirst) && ($currIdx == $clauseIdx)) { + // This token is skipped (not added to the old + // clause) because it will be replaced. + continue; + } } } } } - if ($currIdx < $clauseIdx) { - $before .= $token->token; - } elseif ($currIdx > $clauseIdx) { - $after .= $token->value; + if ((($type === -1) && ($currIdx < $clauseIdx)) + || (($type === 0) && ($currIdx === $clauseIdx)) + || (($type === 1) && ($currIdx > $clauseIdx)) + ) { + $ret .= $token->token; } } - return $before . ' ' . $clause . ' ' . $after; + return trim($ret); + } + + /** + * Builds a query by rebuilding the statement from the tokens list supplied + * and replaces a clause. + * + * It is a very basic version of a query builder. + * + * @param Statement $statement The parsed query that has to be modified. + * @param TokensList $list The list of tokens. + * @param string $clause The clause to be replaced. + * @param bool $onlyType Whether only the type of the clause should + * be replaced or the entire clause. + * + * @return string + */ + public static function replaceClause($statement, $list, $clause, $onlyType = false) + { + // TODO: Update the tokens list and the statement. + + if ($onlyType) { + return static::getClause($statement, $list, $clause, -1, false) . ' ' . + $clause . ' ' . + static::getCLause($statement, $list, $clause, 0) . ' ' . + static::getClause($statement, $list, $clause, 1, false); + } + + return static::getClause($statement, $list, $clause, -1, false) . ' ' . + $clause . ' ' . + static::getClause($statement, $list, $clause, 1, false); } } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 206da97d60..3abe192229 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -99,7 +99,11 @@ function PMA_handleSortOrder( // Store the remembered table into session. $pmatable->setUiProp( PMA_Table::PROP_SORTED_COLUMN, - $analyzed_sql_results['analyzed_sql'][0]['order_by_clause'] + Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'ORDER' + ) ); } } @@ -623,8 +627,8 @@ function PMA_isRememberSortingOrder($analyzed_sql_results) || $analyzed_sql_results['is_analyse']) && $analyzed_sql_results['select_from'] && empty($analyzed_sql_results['select_expr']) - && count($analyzed_sql_results['analyzed_sql']['select_expr']) == 0 - && count($analyzed_sql_results['analyzed_sql']['select_tables']) == 1; + && count($analyzed_sql_results['select_expr']) == 0 + && count($analyzed_sql_results['select_tables']) == 1; } /** @@ -1127,11 +1131,12 @@ function PMA_cleanupRelations($db, $table, $dropped_column, $purge, $extra_data) function PMA_countQueryResults( $num_rows, $justBrowsing, $db, $table, $analyzed_sql_results ) { + if (!PMA_isAppendLimitClause($analyzed_sql_results)) { // if we did not append a limit, set this to get a correct // "Showing rows..." message // $_SESSION['tmpval']['max_rows'] = 'all'; - $unlim_num_rows = $num_rows; + $unlim_num_rows = $num_rows; } elseif ($analyzed_sql_results['querytype'] == 'SELECT' || $analyzed_sql_results['is_subquery'] ) { @@ -1171,64 +1176,31 @@ function PMA_countQueryResults( } } else { - // add select expression after the SQL_CALC_FOUND_ROWS - // for UNION, just adding SQL_CALC_FOUND_ROWS - // after the first SELECT works. + // The SQL_CALC_FOUND_ROWS option of the SELECT statement is used. - // take the left part, could be: - // SELECT - // (SELECT + // For UNION statements, only a SQL_CALC_FOUND_ROWS is required + // after the first SELECT. - // TODO: Replace PMA_SQP_ - - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; - - $count_query = PMA_SQP_format( - $analyzed_sql_results['parsed_sql'], - 'query_only', - 0, - $analyzed_sql[0]['position_of_first_select'] + 1 + $count_query = SqlParser\Utils\Query::replaceClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'SELECT SQL_CALC_FOUND_ROWS', + true ); - $count_query .= ' SQL_CALC_FOUND_ROWS '; - // add everything that was after the first SELECT - $count_query .= PMA_SQP_format( - $analyzed_sql_results['parsed_sql'], - 'query_only', - $analyzed_sql[0]['position_of_first_select'] + 1 - ); - // ensure there is no semicolon at the end of the - // count query because we'll probably add - // a LIMIT 1 clause after it - $count_query = rtrim($count_query); - $count_query = rtrim($count_query, ';'); - // if using SQL_CALC_FOUND_ROWS, add a LIMIT to avoid - // long delays. Returned count will be complete anyway. - // (but a LIMIT would disrupt results in an UNION) + // Another LIMIT clause is added to avoid long delays. + // A complete result will be returned anyway, but the LIMIT would + // stop the query as soon as the result that is required has been + // computed. - if (! isset($analyzed_sql[0]['queryflags']['union'])) { + if (empty($analyzed_sql_results['queryflags']['union'])) { $count_query .= ' LIMIT 1'; } - // run the count query - + // Running the count query. $GLOBALS['dbi']->tryQuery($count_query); - // if (mysql_error()) { - // void. - // I tried the case - // (SELECT `User`, `Host`, `Db`, `Select_priv` FROM `db`) - // UNION (SELECT `User`, `Host`, "%" AS "Db", - // `Select_priv` - // FROM `user`) ORDER BY `User`, `Host`, `Db`; - // and although the generated count_query is wrong - // the SELECT FOUND_ROWS() work! (maybe it gets the - // count from the latest query that worked) - // - // another case where the count_query is wrong: - // SELECT COUNT(*), f1 from t1 group by f1 - // and you click to sort on count(*) - // } + $unlim_num_rows = $GLOBALS['dbi']->fetchValue('SELECT FOUND_ROWS()'); } // end else "just browsing" } else {// not $is_select @@ -1336,22 +1308,14 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil function PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results) { include_once 'libraries/transformations.lib.php'; - if ($analyzed_sql_results['querytype'] == 'ALTER') { - $posDrop = /*overload*/mb_stripos( - $analyzed_sql_results['analyzed_sql'][0]['unsorted_query'], - 'DROP' - ); - if ($posDrop !== false) { - $drop_column = PMA_getColumnNameInColumnDropSql( - $analyzed_sql_results['analyzed_sql'][0]['unsorted_query'] - ); - - if ($drop_column != '') { - PMA_clearTransformations($db, $table, $drop_column); + $statement = $analyzed_sql_results['statement']; + if ($statement instanceof SqlParser\Statements\AlterStatement) { + if ($statement->options->has('DROP')) { + if (!empty($statement->altered->column)) { + PMA_clearTransformations($db, $table, $statement->altered->column); } } - - } else if (($analyzed_sql_results['querytype'] == 'DROP') && ($table != '')) { + } elseif ($statement instanceof SqlParser\Statements\DropStatement) { PMA_clearTransformations($db, $table); } } @@ -1490,7 +1454,7 @@ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db, if (!empty($analyzed_sql_results['is_select'])) { $html_output .= $displayResultsObject->getCreateViewQueryResultOp( - $analyzed_sql_results['analyzed_sql'] + $analyzed_sql_results ); } } @@ -1649,7 +1613,7 @@ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, $table_html .= $displayResultsObject->getTable( $result, $displayParts, - $analyzed_sql_results['analyzed_sql'] + $analyzed_sql_results ); } @@ -1675,7 +1639,7 @@ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, ); $table_html .= $displayResultsObject->getTable( - $result, $displayParts, $analyzed_sql_results['analyzed_sql'] + $result, $displayParts, $analyzed_sql_results ); $GLOBALS['dbi']->freeResult($result); } @@ -1847,10 +1811,16 @@ function PMA_getQueryResponseForResultsReturned($result, // - if the result set does not contain all the columns of a unique key // (unless this is an updatable view) - $sele_exp_cls = $analyzed_sql_results['analyzed_sql'][0]['select_expr_clause']; - $updatableView - = trim($sele_exp_cls) == '*' - && PMA_Table::isUpdatableView($db, $table); + $updatableView = false; + + $statement = $analyzed_sql_results['statement']; + if ($statement instanceof SqlParser\Statements\SelectStatement) { + if (!empty($statement->expr)) { + if ($statement->expr[0]->expr === '*') { + $updatableView = PMA_Table::isUpdatableView($db, $table); + } + } + } $has_unique = PMA_resultSetContainsUniqueKey( $db, $table, $fields_meta From d2b54985656d25befd5abd225caa701cfcfbee4f Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 30 Jun 2015 01:06:44 +0300 Subject: [PATCH 31/57] Fix failing tests. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/parse_analyze.inc.php | 8 +- libraries/sql-parser/src/Builder.php | 84 +++++++++++++++ libraries/sql-parser/src/Fragment.php | 11 ++ .../src/Fragments/ArrayFragment.php | 37 ++++++- .../sql-parser/src/Fragments/CallKeyword.php | 33 +++++- .../src/Fragments/CreateDefFragment.php | 1 - .../src/Fragments/DataTypeFragment.php | 1 - .../src/Fragments/FieldDefFragment.php | 3 +- .../src/Fragments/FieldFragment.php | 73 ++++++++++++- ...electKeyword.php => FieldListFragment.php} | 18 +++- .../sql-parser/src/Fragments/FromKeyword.php | 83 -------------- .../sql-parser/src/Fragments/IntoKeyword.php | 5 +- .../sql-parser/src/Fragments/JoinKeyword.php | 1 - .../sql-parser/src/Fragments/KeyFragment.php | 1 - .../sql-parser/src/Fragments/LimitKeyword.php | 27 ++++- .../src/Fragments/OptionsFragment.php | 32 +++++- .../sql-parser/src/Fragments/OrderKeyword.php | 3 +- .../src/Fragments/ParamDefFragment.php | 1 - .../src/Fragments/ReferencesKeyword.php | 5 +- .../src/Fragments/RenameKeyword.php | 1 - .../sql-parser/src/Fragments/SetKeyword.php | 1 - .../src/Fragments/ValuesKeyword.php | 1 - .../sql-parser/src/Fragments/WhereKeyword.php | 51 ++++++--- libraries/sql-parser/src/Lexer.php | 1 - libraries/sql-parser/src/Parser.php | 101 +++++++++++++++--- libraries/sql-parser/src/Statement.php | 30 ++++-- .../src/Statements/AlterStatement.php | 3 +- ...sumStatement.php => ChecksumStatement.php} | 0 .../src/Statements/CreateStatement.php | 2 + .../src/Statements/MaintenanceStatement.php | 2 + .../Statements/NotImplementedStatement.php | 2 + .../src/Statements/RenameStatement.php | 2 + .../src/Statements/SelectStatement.php | 43 +++++--- libraries/sql-parser/src/Token.php | 86 +++++++-------- libraries/sql-parser/src/Utils/Query.php | 58 +++++----- libraries/sql-parser/src/Utils/Table.php | 3 - 36 files changed, 566 insertions(+), 248 deletions(-) create mode 100644 libraries/sql-parser/src/Builder.php rename libraries/sql-parser/src/Fragments/{SelectKeyword.php => FieldListFragment.php} (81%) delete mode 100644 libraries/sql-parser/src/Fragments/FromKeyword.php rename libraries/sql-parser/src/Statements/{ChecsumStatement.php => ChecksumStatement.php} (100%) diff --git a/libraries/parse_analyze.inc.php b/libraries/parse_analyze.inc.php index f2cee87efc..785a36faf8 100644 --- a/libraries/parse_analyze.inc.php +++ b/libraries/parse_analyze.inc.php @@ -28,8 +28,7 @@ extract($analyzed_sql_results); if (!empty($analyzed_sql_results['select_tables'])) { // Previous table and database name is stored to check if it changed. - $prevDb = $db; - $prevTable = $table; + $prev_db = $db; if (count($analyzed_sql_results['select_tables']) > 1) { @@ -50,9 +49,8 @@ if (!empty($analyzed_sql_results['select_tables'])) { // There is no point checking if a reload is required if we already decided // to reload. Also, no reload is required for AJAX requests. if ((empty($reload)) && (empty($GLOBALS['is_ajax_request']))) { - // NOTE: Tables are case-insensitive. - $reload = ((strcasecmp($db, $prevDb) == 0) - || (strcasecmp($table, $prevTable)) == 0) ? false : true; + // NOTE: Database names are case-insensitive. + $reload = strcasecmp($db, $prev_db) != 0; } // Updating the array as well. diff --git a/libraries/sql-parser/src/Builder.php b/libraries/sql-parser/src/Builder.php new file mode 100644 index 0000000000..b4559e9aa0 --- /dev/null +++ b/libraries/sql-parser/src/Builder.php @@ -0,0 +1,84 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class Builder +{ + + /** + * Statement to be build. + * + * @var Statement + */ + public $statement; + + /** + * Built query. + * + * @var string + */ + public $query; + + /** + * Constructor. + * + * @param Statement $statement + */ + public function __construct($statement = null) + { + $this->statement = $statement; + + if ($this->statement != null) { + $this->build(); + } + } + + /** + * Builds the statement. + * + * @return void + */ + public function build() + { + $statement = $this->statement; + foreach ($statement::$CLAUSES as $clause) { + $name = $clause[0]; + $type = $clause[1]; + + if (empty(Parser::$KEYWORD_PARSERS[$name])) { + continue; + } + + $class = Parser::$KEYWORD_PARSERS[$name]['class']; + $field = Parser::$KEYWORD_PARSERS[$name]['field']; + + if (empty($statement->$field)) { + continue; + } + + if ($type & 2) { + $this->query .= $name . ' '; + } + + if ($type & 1) { + $this->query .= $class::build($statement->$field) . ' '; + } + } + } +} diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php index a9a349ac23..6ae85da486 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Fragment.php @@ -38,4 +38,15 @@ abstract class Fragment return null; } + /** + * Builds the string representation of a fragment of this type. + * + * @param Fragment $fragment The fragment to be built. + * + * @return string + */ + public static function build(Fragment $fragment) + { + return null; + } } diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Fragments/ArrayFragment.php index 7ed22ad9c0..db12622493 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Fragments/ArrayFragment.php @@ -25,6 +25,13 @@ use SqlParser\TokensList; class ArrayFragment extends Fragment { + /** + * The array that contains the unprocessed value of each token. + * + * @var array + */ + public $raw = array(); + /** * The array that contains the processed value of each token. * @@ -33,11 +40,16 @@ class ArrayFragment extends Fragment public $values = array(); /** - * The array that contains the unprocessed value of each token. + * Constructor. * - * @var array + * @param array $raw The unprocessed values. + * @param array $values The processed values. */ - public $raw = array(); + public function __construct(array $raw = array(), array $values = array()) + { + $this->raw = $raw; + $this->values = $values; + } /** * @param Parser $parser The parser that serves as context. @@ -67,7 +79,6 @@ class ArrayFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -114,4 +125,22 @@ class ArrayFragment extends Fragment return $ret; } + + /** + * @param ArrayFragment $fragment The fragment to be built. + * + * @return string + */ + public static function build(ArrayFragment $fragment) + { + $values = array(); + if (!empty($fragment->raw)) { + $values = $fragment->raw; + } else { + foreach ($fragment->values as $value) { + $values[] = $value; + } + } + return '(' . implode(', ', $values) . ')'; + } } diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php index ae3c467f6a..3b8cc80b5a 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -35,9 +35,25 @@ class CallKeyword extends Fragment /** * The list of parameters * - * @var array + * @var ArrayFragment */ - public $parameters = array(); + public $parameters; + + /** + * Constructor. + * + * @param string $name The name of the function to be called. + * @param array|ArrayFragment $parameters The parameters of this function. + */ + public function __construct($name = null, $parameters = null) + { + $this->name = $name; + if (is_array($parameters)) { + $this->parameters = new ArrayFragment($parameters); + } elseif ($parameters instanceof ArrayFragment) { + $this->parameters = $parameters; + } + } /** * @param Parser $parser The parser that serves as context. @@ -64,7 +80,6 @@ class CallKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -86,7 +101,7 @@ class CallKeyword extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $ret->parameters = ArrayFragment::parse($parser, $list)->values; + $ret->parameters = ArrayFragment::parse($parser, $list); } break; } @@ -95,4 +110,14 @@ class CallKeyword extends Fragment return $ret; } + + /** + * @param CallKeyword $fragment The fragment to be built. + * + * @return string + */ + public static function build(CallKeyword $fragment) + { + return $fragment->name . ArrayFragment::build($fragment->parameters); + } } diff --git a/libraries/sql-parser/src/Fragments/CreateDefFragment.php b/libraries/sql-parser/src/Fragments/CreateDefFragment.php index 403426c109..933ea5ef5e 100644 --- a/libraries/sql-parser/src/Fragments/CreateDefFragment.php +++ b/libraries/sql-parser/src/Fragments/CreateDefFragment.php @@ -92,7 +92,6 @@ class CreateDefFragment extends Fragment $ret = new CreateDefFragment(); for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index 2ad700a676..0b9e1a81b2 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -94,7 +94,6 @@ class DataTypeFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index d38eeda7c8..6c5771e95a 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -129,7 +129,6 @@ class FieldDefFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -176,7 +175,7 @@ class FieldDefFragment extends Fragment --$list->idx; } $state = 5; - } else if ($state === 5) { + } elseif ($state === 5) { if ((!empty($expr->type)) || (!empty($expr->key))) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index 51403248cb..8b0f0ef125 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -74,6 +74,38 @@ class FieldFragment extends Fragment */ public $subquery; + /** + * Constructor. + * + * Syntax: + * new FieldFragment('expr') + * new FieldFragment('expr', 'alias') + * new FieldFragment('database', 'table', 'column') + * new FieldFragment('database', 'table', 'column', 'alias') + * + * If the database, table or column name is not required, pass an empty + * string. + * + * @param string $database The name of the database or the the expression. + * the the expression. + * @param string $table The name of the table or the alias of the expression. + * the alias of the expression. + * @param string $column The name of the column. + * @param string $alias The name of the alias. + */ + public function __construct($database = null, $table = null, $column = null, $alias = null) + { + if (($column === null) && ($alias === null)) { + $this->expr = $database; // case 1 + $this->alias = $table; // case 2 + } else { + $this->database = $database; // case 3 + $this->table = $table; // case 3 + $this->column = $column; // case 3 + $this->alias = $alias; // case 4 + } + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -120,7 +152,6 @@ class FieldFragment extends Fragment $prev = null; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -150,8 +181,10 @@ class FieldFragment extends Fragment $alias = 2; continue; } - break; - } else if ($prev === true) { + if (!($token->flags & Token::FLAG_KEYWORD_FUNCTION)) { + break; + } + } elseif ($prev === true) { if ((empty($ret->subquery) && (!empty(Parser::$STATEMENT_PARSERS[$token->value])))) { // A `(` was previously found and this keyword is the // beginning of a statement, so this is a subquery. @@ -236,7 +269,7 @@ class FieldFragment extends Fragment if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_FUNCTION)) { $prev = strtoupper($token->value); - } else if (($token->type === Token::TYPE_OPERATOR) || ($token->value === '(')) { + } elseif (($token->type === Token::TYPE_OPERATOR) || ($token->value === '(')) { $prev = true; } else { $prev = null; @@ -258,4 +291,36 @@ class FieldFragment extends Fragment --$list->idx; return $ret; } + + /** + * @param FieldFragment $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $ret = ''; + + if (!empty($fragment->expr)) { + $ret = $fragment->expr; + } else { + $fields = array(); + if (!empty($fragment->database)) { + $fields[] = $fragment->database; + } + if (!empty($fragment->table)) { + $fields[] = $fragment->table; + } + if (!empty($fragment->column)) { + $fields[] = $fragment->column; + } + $ret = implode('.', $fields); + } + + if (!empty($fragment->alias)) { + $ret .= ' AS ' . $fragment->alias; + } + + return $ret; + } } diff --git a/libraries/sql-parser/src/Fragments/SelectKeyword.php b/libraries/sql-parser/src/Fragments/FieldListFragment.php similarity index 81% rename from libraries/sql-parser/src/Fragments/SelectKeyword.php rename to libraries/sql-parser/src/Fragments/FieldListFragment.php index 5cf47199e3..cc769e00e8 100644 --- a/libraries/sql-parser/src/Fragments/SelectKeyword.php +++ b/libraries/sql-parser/src/Fragments/FieldListFragment.php @@ -1,7 +1,7 @@ * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class SelectKeyword extends Fragment +class FieldListFragment extends Fragment { /** @@ -39,7 +39,6 @@ class SelectKeyword extends Fragment $expr = null; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -64,7 +63,7 @@ class SelectKeyword extends Fragment if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { $ret[] = $expr; } else { - $expr = FieldFragment::parse($parser, $list); + $expr = FieldFragment::parse($parser, $list, $options); if ($expr === null) { break; } @@ -80,4 +79,13 @@ class SelectKeyword extends Fragment --$list->idx; return $ret; } + + public static function build($fragment) + { + $ret = array(); + foreach ($fragment as $frag) { + $ret[] = $frag::build($frag); + } + return implode($ret, ', '); + } } diff --git a/libraries/sql-parser/src/Fragments/FromKeyword.php b/libraries/sql-parser/src/Fragments/FromKeyword.php deleted file mode 100644 index 6fbf0ba365..0000000000 --- a/libraries/sql-parser/src/Fragments/FromKeyword.php +++ /dev/null @@ -1,83 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class FromKeyword extends Fragment -{ - - /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. - * - * @return FieldFragment[] - */ - public static function parse(Parser $parser, TokensList $list, array $options = array()) - { - $ret = array(); - - $expr = new FieldFragment(); - - for (; $list->idx < $list->count; ++$list->idx) { - - /** - * Token parsed at this moment. - * @var Token - */ - $token = $list->tokens[$list->idx]; - - // End of statement. - if ($token->type === Token::TYPE_DELIMITER) { - break; - } - - // Skipping whitespaces and comments. - if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { - continue; - } - - // No keyword is expected. - if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { - break; - } - - if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { - $ret[] = $expr; - } else { - $expr = FieldFragment::parse($parser, $list, array('skipColumn' => true)); - if ($expr === null) { - break; - } - } - - } - - // Last iteration was not saved. - if ($expr !== null) { - $ret[] = $expr; - } - - --$list->idx; - return $ret; - } -} diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index 558b3e64c6..0b515319e3 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -74,7 +74,6 @@ class IntoKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -105,13 +104,13 @@ class IntoKeyword extends Fragment if ($state === 0) { $ret->name = $token->value; $state = 1; - } else if ($state === 1) { + } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { $ret->fields = ArrayFragment::parse($parser, $list)->values; ++$list->idx; } break; - } else if ($state === 2) { + } elseif ($state === 2) { $ret->name = $token->value; ++$list->idx; break; diff --git a/libraries/sql-parser/src/Fragments/JoinKeyword.php b/libraries/sql-parser/src/Fragments/JoinKeyword.php index 011bd4d80d..f8e1a57963 100644 --- a/libraries/sql-parser/src/Fragments/JoinKeyword.php +++ b/libraries/sql-parser/src/Fragments/JoinKeyword.php @@ -66,7 +66,6 @@ class JoinKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Fragments/KeyFragment.php index 4a71857c90..d84c9f6565 100644 --- a/libraries/sql-parser/src/Fragments/KeyFragment.php +++ b/libraries/sql-parser/src/Fragments/KeyFragment.php @@ -95,7 +95,6 @@ class KeyFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index a23eb4c73e..af8d92dbd8 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -39,6 +39,18 @@ class LimitKeyword extends Fragment */ public $rowCount; + /** + * Constructor. + * + * @param int $rowCount The row count. + * @param int $offset The offset. + */ + public function __construct($rowCount = null, $offset = null) + { + $this->rowCount = $rowCount; + $this->offset = $offset; + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -53,7 +65,6 @@ class LimitKeyword extends Fragment $offset = false; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -103,4 +114,18 @@ class LimitKeyword extends Fragment --$list->idx; return $ret; } + + /** + * @param LimitKeyword $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + if (empty($fragment->offset)) { + return $fragment->rowCount; + } else { + return $fragment->offset . ', ' . $fragment->rowCount; + } + } } diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index 54d4857d2f..16459cc5ba 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -32,6 +32,17 @@ class OptionsFragment extends Fragment */ public $options = array(); + /** + * Constructor. + * + * @param array $options The array of options. Options that have a value + * must be an array with two keys 'name' and 'value'. + */ + public function __construct(array $options = array()) + { + $this->options = $options; + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -59,7 +70,6 @@ class OptionsFragment extends Fragment $brackets = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -127,6 +137,24 @@ class OptionsFragment extends Fragment return $ret; } + /** + * @param OptionsFragment $fragment The fragment to be built. + * + * @return string + */ + public static function build(OptionsFragment $fragment) + { + $options = array(); + foreach ($fragment->options as $option) { + if (is_array($option)) { + $options[] = $option['name'] . '=' . $option['value']; + } else { + $options[] = $option; + } + } + return implode(' ', $options); + } + /** * Checks if it has the specified option and returns it value or true. * @@ -158,7 +186,7 @@ class OptionsFragment extends Fragment { if (is_array($options)) { $this->options = array_merge_recursive($this->options, $options); - } else if ($options instanceof OptionsFragment) { + } elseif ($options instanceof OptionsFragment) { $this->options = array_merge_recursive($this->options, $options->options); } } diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Fragments/OrderKeyword.php index 51942083fc..7a760841c1 100644 --- a/libraries/sql-parser/src/Fragments/OrderKeyword.php +++ b/libraries/sql-parser/src/Fragments/OrderKeyword.php @@ -67,7 +67,6 @@ class OrderKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -90,7 +89,7 @@ class OrderKeyword extends Fragment } elseif ($state === 1) { if (($token->type === Token::TYPE_KEYWORD) && (($token->value === 'ASC') || ($token->value === 'DESC'))) { $expr->type = $token->value; - } else if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { + } elseif (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { if (!empty($expr->field)) { $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php index a51259658d..583c3abbcd 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -80,7 +80,6 @@ class ParamDefFragment extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php index d4afd0194f..8de0233a71 100644 --- a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php @@ -84,7 +84,6 @@ class ReferencesKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -104,10 +103,10 @@ class ReferencesKeyword extends Fragment if ($state === 0) { $ret->table = $token->value; $state = 1; - } else if ($state === 1) { + } elseif ($state === 1) { $ret->columns = ArrayFragment::parse($parser, $list)->values; $state = 2; - } else if ($state === 2) { + } elseif ($state === 2) { $ret->options = OptionsFragment::parse($parser, $list, static::$REFERENCES_OPTIONS); ++$list->idx; break; diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Fragments/RenameKeyword.php index 980ad7b022..077982aafb 100644 --- a/libraries/sql-parser/src/Fragments/RenameKeyword.php +++ b/libraries/sql-parser/src/Fragments/RenameKeyword.php @@ -71,7 +71,6 @@ class RenameKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Fragments/SetKeyword.php index 547768cb37..bced45fb43 100644 --- a/libraries/sql-parser/src/Fragments/SetKeyword.php +++ b/libraries/sql-parser/src/Fragments/SetKeyword.php @@ -67,7 +67,6 @@ class SetKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/ValuesKeyword.php b/libraries/sql-parser/src/Fragments/ValuesKeyword.php index 6977f6811a..c867551599 100644 --- a/libraries/sql-parser/src/Fragments/ValuesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ValuesKeyword.php @@ -65,7 +65,6 @@ class ValuesKeyword extends Fragment $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index 1b36cc8a73..d2143f3589 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -46,6 +46,16 @@ class WhereKeyword extends Fragment */ public $condition; + /** + * Constructor. + * + * @param string $condition The condition or the operator. + */ + public function __construct($condition = null) + { + $this->condition = trim($condition); + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -57,10 +67,13 @@ class WhereKeyword extends Fragment { $ret = array(); - $expr = new WhereKeyword(); + /** + * The condition that was parsed so far. + * @var string + */ + $condition = ''; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -73,23 +86,23 @@ class WhereKeyword extends Fragment } // Skipping whitespaces and comments. - if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + if ($token->type === Token::TYPE_COMMENT) { continue; } // Conditions are delimited by logical operators. if (in_array($token->value, static::$OPERATORS, true)) { - if (!empty($expr->condition)) { - $ret[] = $expr; + if (!empty(trim($condition))) { + // Adding the condition that is delimited by this operator. + $ret[] = new WhereKeyword($condition); + $condition = ''; } - $expr = new WhereKeyword(); + // Adding the operator. + $expr = new WhereKeyword($token->value); $expr->isOperator = true; - $expr->condition = $token->value; $ret[] = $expr; - $expr = new WhereKeyword(); - continue; } @@ -98,16 +111,30 @@ class WhereKeyword extends Fragment break; } - $expr->condition .= $token->token; + $condition .= $token->token; } // Last iteration was not processed. - if (!empty($expr->condition)) { - $ret[] = $expr; + if (!empty(trim($condition))) { + $ret[] = new WhereKeyword($condition); } --$list->idx; return $ret; } + + /** + * @param WhereKeyword $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $conditions = array(); + foreach ($fragment as $f) { + $conditions[] = $f->condition; + } + return implode(' ', $conditions); + } } diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index b91db8bf2a..0d0862d908 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -168,7 +168,6 @@ class Lexer $lastToken = null; for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) { - /** * The new token. * @var Token diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 2a9bd47c47..29e67017f5 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -9,6 +9,7 @@ */ namespace SqlParser; +use SqlParser\Statements\SelectStatement; use SqlParser\Exceptions\ParserException; /** @@ -37,7 +38,7 @@ class Parser 'ANALYZE' => 'SqlParser\\Statements\\AnalyzeStatement', 'BACKUP' => 'SqlParser\\Statements\\BackupStatement', 'CHECK' => 'SqlParser\\Statements\\CheckStatement', - 'CHECKSUM' => 'SqlParser\\Statements\\ChecsumStatement', + 'CHECKSUM' => 'SqlParser\\Statements\\ChecksumStatement', 'OPTIMIZE' => 'SqlParser\\Statements\\OptimizeStatement', 'REPAIR' => 'SqlParser\\Statements\\RepairStatement', 'RESTORE' => 'SqlParser\\Statements\\RestoreStatement', @@ -79,38 +80,51 @@ class Parser * @var array */ public static $KEYWORD_PARSERS = array( + + // This is not a proper keyword and was added here to help the builder. + '_OPTIONS' => array( + 'class' => 'SqlParser\\Fragments\\OptionsFragment', + 'field' => 'options', + ), + 'ALTER' => array( 'class' => 'SqlParser\\Fragments\\FieldFragment', 'field' => 'table', 'options' => array('skipColumn' => true), ), 'ANALYZE' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'BACKUP' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'CALL' => array( 'class' => 'SqlParser\\Fragments\\CallKeyword', 'field' => 'call', ), 'CHECK' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'CHECKSUM' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'DROP' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', - 'field' => 'fields' + 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'field' => 'fields', + 'options' => array('skipColumn' => true), ), 'FROM' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'from', + 'options' => array('skipColumn' => true), ), 'GROUP BY' => array( 'class' => 'SqlParser\\Fragments\\OrderKeyword', @@ -133,8 +147,9 @@ class Parser 'field' => 'limit', ), 'OPTIMIZE' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'ORDER BY' => array( 'class' => 'SqlParser\\Fragments\\OrderKeyword', @@ -153,24 +168,27 @@ class Parser 'field' => 'renames', ), 'REPAIR' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'RESTORE' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'tables', + 'options' => array('skipColumn' => true), ), 'SET' => array( 'class' => 'SqlParser\\Fragments\\SetKeyword', 'field' => 'set', ), 'SELECT' => array( - 'class' => 'SqlParser\\Fragments\\SelectKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'expr', ), 'UPDATE' => array( - 'class' => 'SqlParser\\Fragments\\FromKeyword', + 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'from', + 'options' => array('skipColumn' => true), ), 'VALUE' => array( 'class' => 'SqlParser\\Fragments\\ValuesKeyword', @@ -252,6 +270,29 @@ class Parser */ public function parse() { + + /** + * Last parsed statement. + * @var Statement + */ + $lastStatement = null; + + /** + * Whether a union is parsed or not. + * @var bool + */ + $inUnion = true; + + /** + * The index of the last token from the last statement. + * @var int + */ + $prevLastIdx = -1; + + /** + * The list of tokens. + * @var TokensList + */ $list = &$this->list; for (; $list->idx < $list->count; ++$list->idx) { @@ -268,13 +309,21 @@ class Parser continue; } + if ($token->value === 'UNION') { + $inUnion = true; + continue; + } + // Checking if it is a known statement that can be parsed. if (empty(static::$STATEMENT_PARSERS[$token->value])) { $this->error( 'Unrecognized statement type "' . $token->value . '".', $token ); + // Skipping to the end of this statement. $list->getNextOfType(Token::TYPE_DELIMITER); + // + $prevLastIdx = $list->idx; continue; } @@ -290,8 +339,32 @@ class Parser */ $stmt = new $class(); + // The first token that is a part of this token is the next token + // unprocessed by the previous statement. + // There might be brackets around statements and this shouldn't + // affect the parser + $stmt->first = $prevLastIdx + 1; + + // Parsing the actual statement. $stmt->parse($this, $this->list); - $this->statements[] = $stmt; + + // Storing the index of the last token parsed and updating the old + // index. + $stmt->last = $list->idx; + $prevLastIdx = $list->idx; + + // Finally, storing the statement. + if (($inUnion) + && ($lastStatement instanceof SelectStatement) + && ($stmt instanceof SelectStatement) + ) { + $lastStatement->union[] = $stmt; + $inUnion = false; + } else { + $this->statements[] = $stmt; + $lastStatement = $stmt; + } + } } diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index f10b5eed7f..0cb362cdc0 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -26,6 +26,20 @@ use SqlParser\Fragments\OptionsFragment; abstract class Statement { + /** + * The clauses of this statement, in order. + * + * The value attributed to each clause is used by the builder and it may + * have one of the following values: + * + * - 1 = 01 - add the clause only + * - 2 = 10 - add the keyword + * - 3 = 11 - add both the keyword and the clause + * + * @var array + */ + public static $CLAUSES; + /** * The options of this query. * @@ -59,8 +73,6 @@ abstract class Statement */ public function parse(Parser $parser, TokensList $list) { - $this->first = $list->idx; - /** * Whether options were parsed or not. * For statements that do not have any options this is set to `true` by @@ -70,7 +82,6 @@ abstract class Statement $parsedOptions = isset(static::$OPTIONS) ? false : true; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @var Token @@ -88,6 +99,12 @@ abstract class Statement continue; } + // Unions are parsed by the parser because they represent more than + // one statement. + if ($token->value === 'UNION') { + break; + } + /** * The name of the class that is used for parsing. * @var string @@ -124,7 +141,7 @@ abstract class Statement ); $parsedOptions = true; } - } else if ($class === null) { + } elseif ($class === null) { // There is no parser for this keyword and isn't the beggining // of a statement (so no options) either. $parser->error( @@ -145,11 +162,11 @@ abstract class Statement $this->after($parser, $list, $token); } - $this->last = $list->idx--; // Go back to last used token. + --$list->idx; // Go back to last used token. } /** - * Function called before the token was processed. + * Function called before the token is processed. * * @param Parser $parser The instance that requests parsing. * @param TokensList $list The list of tokens to be parsed. @@ -175,5 +192,4 @@ abstract class Statement { } - } diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index b6c18edf3c..81bca056f9 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -97,6 +97,8 @@ class AlterStatement extends NotImplementedStatement ); /** + * Function called after the token was processed. + * * Extracts the name of affected column. * * @param Parser $parser The instance that requests parsing. @@ -124,5 +126,4 @@ class AlterStatement extends NotImplementedStatement // parent::after($parser, $list, $token); } - } diff --git a/libraries/sql-parser/src/Statements/ChecsumStatement.php b/libraries/sql-parser/src/Statements/ChecksumStatement.php similarity index 100% rename from libraries/sql-parser/src/Statements/ChecsumStatement.php rename to libraries/sql-parser/src/Statements/ChecksumStatement.php diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index ef11537d99..f13866a965 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -100,6 +100,8 @@ class CreateStatement extends Statement public $body; /** + * Function called before the token is processed. + * * Parsing the `CREATE` statement. * * @param Parser $parser The instance that requests parsing. diff --git a/libraries/sql-parser/src/Statements/MaintenanceStatement.php b/libraries/sql-parser/src/Statements/MaintenanceStatement.php index a0df6343df..97c87b94b1 100644 --- a/libraries/sql-parser/src/Statements/MaintenanceStatement.php +++ b/libraries/sql-parser/src/Statements/MaintenanceStatement.php @@ -37,6 +37,8 @@ class MaintenanceStatement extends Statement public $tables; /** + * Function called after the token was processed. + * * Parses the additional options fragment at the end. * * @param Parser $parser The instance that requests parsing. diff --git a/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/libraries/sql-parser/src/Statements/NotImplementedStatement.php index 1689df22ee..b96c5583fd 100644 --- a/libraries/sql-parser/src/Statements/NotImplementedStatement.php +++ b/libraries/sql-parser/src/Statements/NotImplementedStatement.php @@ -28,6 +28,8 @@ class NotImplementedStatement extends Statement { /** + * Function called after the token was processed. + * * Jump to the end of the delimiter. * * @param Parser $parser The instance that requests parsing. diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php index 5ebd2faac4..473efe0ad2 100644 --- a/libraries/sql-parser/src/Statements/RenameStatement.php +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -36,6 +36,8 @@ class RenameStatement extends Statement public $renames; /** + * Function called before the token is processed. + * * Skips the `TABLE` keyword after `RENAME`. * * @param Parser $parser The instance that requests parsing. diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 0c4c354f19..7704e263fe 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -68,17 +68,29 @@ class SelectStatement extends Statement ); /** - * The sections of this statement, in order. + * The clauses of this statement, in order. * - * Used by the query builder to arrange the clauses. + * @see Statement::$CLAUSES * * @var array */ - public static $SECTIONS = array( - 'SELECT' => 0, '%OPTIONS' => 1,'FROM' => 2, 'PARTITION' => 3, - 'WHERE' => 4, 'GROUP BY' => 5, 'HAVING' => 6, 'ORDER BY' => 7, - 'LIMIT' => 8, 'PROCEDURE' => 9, 'INTO' => 10, 'UNION' => 11, - 'JOIN' => 12, '%OPTIONS' => 13 + public static $CLAUSES = array( + 'SELECT' => array('SELECT', 2), + // Used for options. + '_OPTIONS' => array('_OPTIONS', 1), + // Used for select expressions. + '_SELECT' => array('SELECT', 1), + 'FROM' => array('FROM', 3), + 'PARTITION' => array('PARTITION', 3), + 'WHERE' => array('WHERE', 3), + 'GROUP BY' => array('GROUP BY', 3), + 'HAVING' => array('HAVING', 3), + 'ORDER BY' => array('ORDER BY', 3), + 'LIMIT' => array('LIMIT', 3), + 'PROCEDURE' => array('PROCEDURE', 3), + 'INTO' => array('INTO', 3), + 'UNION' => array('UNION', 3), + 'JOIN' => array('JOIN', 3), ); /** @@ -86,33 +98,33 @@ class SelectStatement extends Statement * * @var FieldFragment[] */ - public $expr; + public $expr = array(); /** * Tables used as sources for this statement. * * @var FieldFragment[] */ - public $from; + public $from = array(); /** * Partitions used as source for this statement. * - * @var ArrayFragment[] + * @var ArrayFragment */ public $partition; /** * Conditions used for filtering each row of the result set. * - * @var WhereKeyword + * @var WhereKeyword[] */ public $where; /** * Conditions used for grouping the result set. * - * @var GroupKeyword + * @var OrderKeyword[] */ public $group; @@ -157,4 +169,11 @@ class SelectStatement extends Statement * @var JoinKeyword */ public $join; + + /** + * Unions. + * + * @var SelectStatement[] + */ + public $union = array(); } diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index fa23d2870f..1db0d1d037 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -217,52 +217,52 @@ class Token public function extract() { switch ($this->type) { - case Token::TYPE_KEYWORD: - if (!($this->flags & Token::FLAG_KEYWORD_RESERVED)) { - // Unreserved keywords should stay the way they are because they - // might represent field names. - return $this->token; - } - return strtoupper($this->token); - case Token::TYPE_WHITESPACE: - return ' '; - case Token::TYPE_BOOL: - return strtoupper($this->token) === 'TRUE'; - case Token::TYPE_NUMBER: - $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 - if ($this->flags & Token::FLAG_NUMBER_HEX) { - if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { - $ret = str_replace('-', '', $this->token); - sscanf($ret, "%x", $ret); - $ret = -$ret; - } else { - sscanf($ret, "%x", $ret); + case Token::TYPE_KEYWORD: + if (!($this->flags & Token::FLAG_KEYWORD_RESERVED)) { + // Unreserved keywords should stay the way they are because they + // might represent field names. + return $this->token; } - } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) + return strtoupper($this->token); + case Token::TYPE_WHITESPACE: + return ' '; + case Token::TYPE_BOOL: + return strtoupper($this->token) === 'TRUE'; + case Token::TYPE_NUMBER: + $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 + if ($this->flags & Token::FLAG_NUMBER_HEX) { + if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { + $ret = str_replace('-', '', $this->token); + sscanf($ret, "%x", $ret); + $ret = -$ret; + } else { + sscanf($ret, "%x", $ret); + } + } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) || ($this->flags & Token::FLAG_NUMBER_FLOAT) - ) { - sscanf($ret, "%f", $ret); - } else { - sscanf($ret, "%d", $ret); - } - return $ret; - case Token::TYPE_STRING: - $quote = $this->token[0]; - $str = str_replace($quote . $quote, $quote, $this->token); - return mb_substr($str, 1, -1); // trims quotes - case Token::TYPE_SYMBOL: - $str = $this->token; - if ((isset($str[0])) && ($str[0] === '@')) { - $str = mb_substr($str, 1); - } - if ((isset($str[0])) && (($str[0] === '`') + ) { + sscanf($ret, "%f", $ret); + } else { + sscanf($ret, "%d", $ret); + } + return $ret; + case Token::TYPE_STRING: + $quote = $this->token[0]; + $str = str_replace($quote . $quote, $quote, $this->token); + return mb_substr($str, 1, -1); // trims quotes + case Token::TYPE_SYMBOL: + $str = $this->token; + if ((isset($str[0])) && ($str[0] === '@')) { + $str = mb_substr($str, 1); + } + if ((isset($str[0])) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\'')) - ) { - $quote = $str[0]; - $str = str_replace($quote . $quote, $quote, $str); - $str = mb_substr($str, 1, -1); - } - return $str; + ) { + $quote = $str[0]; + $str = str_replace($quote . $quote, $quote, $str); + $str = mb_substr($str, 1, -1); + } + return $str; } return $this->token; } diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index dde33042d2..f97374404a 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -222,32 +222,32 @@ class Query if ($statement instanceof AlterStatement) { $flags['querytype'] = 'ALTER'; $flags['reload'] = true; - } else if ($statement instanceof CreateStatement) { + } elseif ($statement instanceof CreateStatement) { $flags['querytype'] = 'CREATE'; $flags['reload'] = true; - } else if ($statement instanceof AnalyzeStatement) { + } elseif ($statement instanceof AnalyzeStatement) { $flags['querytype'] = 'ANALYZE'; $flags['is_maint'] = true; - } else if ($statement instanceof CheckStatement) { + } elseif ($statement instanceof CheckStatement) { $flags['querytype'] = 'CHECK'; $flags['is_maint'] = true; - } else if ($statement instanceof ChecksumStatement) { + } elseif ($statement instanceof ChecksumStatement) { $flags['querytype'] = 'CHECKSUM'; $flags['is_maint'] = true; - } else if ($statement instanceof OptimizeStatement) { + } elseif ($statement instanceof OptimizeStatement) { $flags['querytype'] = 'OPTIMIZE'; $flags['is_maint'] = true; - } else if ($statement instanceof RepairStatement) { + } elseif ($statement instanceof RepairStatement) { $flags['querytype'] = 'REPAIR'; $flags['is_maint'] = true; - } else if ($statement instanceof CallStatement) { + } elseif ($statement instanceof CallStatement) { $flags['querytype'] = 'CALL'; $flags['is_procedure'] = true; - } else if ($statement instanceof DeleteStatement) { + } elseif ($statement instanceof DeleteStatement) { $flags['querytype'] = 'DELETE'; $flags['is_delete'] = true; $flags['is_affected'] = true; - } else if ($statement instanceof DropStatement) { + } elseif ($statement instanceof DropStatement) { $flags['querytype'] = 'DROP'; $flags['reload'] = true; @@ -256,19 +256,19 @@ class Query ) { $flags['drop_database'] = true; } - } else if ($statement instanceof ExplainStatement) { + } elseif ($statement instanceof ExplainStatement) { $flags['querytype'] = 'EXPLAIN'; $flags['is_explain'] = true; - } else if ($statement instanceof InsertStatement) { + } elseif ($statement instanceof InsertStatement) { $flags['querytype'] = 'INSERT'; $flags['is_affected'] = true; $flags['is_insert'] = true; - } else if ($statement instanceof ReplaceStatement) { + } elseif ($statement instanceof ReplaceStatement) { $flags['querytype'] = 'REPLACE'; $flags['is_affected'] = true; $flags['is_replace'] = true; $flags['is_insert'] = true; - } else if ($statement instanceof SelectStatement) { + } elseif ($statement instanceof SelectStatement) { $flags['querytype'] = 'SELECT'; $flags['is_select'] = true; @@ -294,7 +294,7 @@ class Query if (!empty($expr->function)) { if ($expr->function === 'COUNT') { $flags['is_count'] = true; - } else if (in_array($expr->function, static::$FUNCTIONS)) { + } elseif (in_array($expr->function, static::$FUNCTIONS)) { $flags['is_func'] = true; } } @@ -325,10 +325,10 @@ class Query $flags['join'] = true; } - } else if ($statement instanceof ShowStatement) { + } elseif ($statement instanceof ShowStatement) { $flags['querytype'] = 'SHOW'; $flags['is_show'] = true; - } else if ($statement instanceof UpdateStatement) { + } elseif ($statement instanceof UpdateStatement) { $flags['querytype'] = 'UPDATE'; $flags['is_affected'] = true; } @@ -409,7 +409,7 @@ class Query /** * Gets the type of clause. * - * @param string $clause The clause. + * @param string $clause The clause. * * @return string */ @@ -450,7 +450,7 @@ class Query { /** - * Current location. + * The index of the current clause. * @var int */ $currIdx = 0; @@ -469,19 +469,20 @@ class Query $ret = ''; /** - * The place where the clause should be added. + * The clauses of this type of statement and their index. + * @var array + */ + $clauses = array_flip(array_keys($statement::$CLAUSES)); + + /** + * The index of this clause. * @var int */ - $clauseIdx = $statement::$SECTIONS[static::getClauseType($clause)]; + $clauseIdx = $clauses[static::getClauseType($clause)]; for ($i = $statement->first; $i <= $statement->last; ++$i) { - $token = $list->tokens[$i]; - if ($token->type === Token::TYPE_DELIMITER) { - break; - } - if ($token->type === Token::TYPE_OPERATOR) { if ($token->value === '(') { ++$brackets; @@ -493,9 +494,9 @@ class Query if ($brackets == 0) { // Checking if we changed sections. if ($token->type === Token::TYPE_KEYWORD) { - if (isset($statement::$SECTIONS[$token->value])) { - if ($statement::$SECTIONS[$token->value] >= $currIdx) { - $currIdx = $statement::$SECTIONS[$token->value]; + if (isset($clauses[$token->value])) { + if ($clauses[$token->value] >= $currIdx) { + $currIdx = $clauses[$token->value]; if (($skipFirst) && ($currIdx == $clauseIdx)) { // This token is skipped (not added to the old // clause) because it will be replaced. @@ -546,5 +547,4 @@ class Query $clause . ' ' . static::getClause($statement, $list, $clause, 1, false); } - } diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index 95b685001c..86ccbfb4d1 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -43,7 +43,6 @@ class Table $ret = array(); foreach ($statement->fields as $field) { - if ((empty($field->key)) || ($field->key->type !== 'FOREIGN KEY')) { continue; } @@ -93,7 +92,6 @@ class Table $ret = array(); foreach ($statement->fields as $field) { - // Skipping keys. if (empty($field->type)) { continue; @@ -105,7 +103,6 @@ class Table ); if ($field->options) { - if ($field->type->name === 'TIMESTAMP') { if ($field->options->has('NOT NULL')) { $ret[$field->name]['timestamp_not_null'] = true; From 825cfbdc11436e9c125b680aa1df98868dd657a7 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 30 Jun 2015 01:26:47 +0300 Subject: [PATCH 32/57] Fixed coding style. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 5 +- .../src/Fragments/FieldFragment.php | 2 - .../sql-parser/src/Fragments/WhereKeyword.php | 2 +- .../src/Statements/SelectStatement.php | 2 +- libraries/sql-parser/src/Token.php | 86 +++++++++---------- 5 files changed, 47 insertions(+), 50 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index c793cc0d74..5d8fcdccd2 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4240,7 +4240,6 @@ class PMA_DisplayResults if ($is_innodb && PMA_isJustBrowsing($analyzed_sql_results, true) - ) { // "j u s t b r o w s i n g" $pre_count = '~'; @@ -5025,9 +5024,9 @@ class PMA_DisplayResults /** * Get operations that are available on results. * - * @param array $displayParts the parts to display + * @param array $displayParts the parts to display * @param array $analyzed_sql_results analyzed sql results - * @param boolean $only_view Whether to show only view + * @param boolean $only_view Whether to show only view * * @return string $results_operations_html html content * diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index 8b0f0ef125..a6c5777e08 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -299,8 +299,6 @@ class FieldFragment extends Fragment */ public static function build($fragment) { - $ret = ''; - if (!empty($fragment->expr)) { $ret = $fragment->expr; } else { diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index d2143f3589..8bc3018d2b 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -125,7 +125,7 @@ class WhereKeyword extends Fragment } /** - * @param WhereKeyword $fragment The fragment to be built. + * @param WhereKeyword[] $fragment The fragment to be built. * * @return string */ diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 7704e263fe..84ec5a29f3 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -70,7 +70,7 @@ class SelectStatement extends Statement /** * The clauses of this statement, in order. * - * @see Statement::$CLAUSES + * @see Statement::$CLAUSES * * @var array */ diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index 1db0d1d037..fa23d2870f 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -217,52 +217,52 @@ class Token public function extract() { switch ($this->type) { - case Token::TYPE_KEYWORD: - if (!($this->flags & Token::FLAG_KEYWORD_RESERVED)) { - // Unreserved keywords should stay the way they are because they - // might represent field names. - return $this->token; - } - return strtoupper($this->token); - case Token::TYPE_WHITESPACE: - return ' '; - case Token::TYPE_BOOL: - return strtoupper($this->token) === 'TRUE'; - case Token::TYPE_NUMBER: - $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 - if ($this->flags & Token::FLAG_NUMBER_HEX) { - if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { - $ret = str_replace('-', '', $this->token); - sscanf($ret, "%x", $ret); - $ret = -$ret; - } else { - sscanf($ret, "%x", $ret); - } - } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) - || ($this->flags & Token::FLAG_NUMBER_FLOAT) - ) { - sscanf($ret, "%f", $ret); + case Token::TYPE_KEYWORD: + if (!($this->flags & Token::FLAG_KEYWORD_RESERVED)) { + // Unreserved keywords should stay the way they are because they + // might represent field names. + return $this->token; + } + return strtoupper($this->token); + case Token::TYPE_WHITESPACE: + return ' '; + case Token::TYPE_BOOL: + return strtoupper($this->token) === 'TRUE'; + case Token::TYPE_NUMBER: + $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42 + if ($this->flags & Token::FLAG_NUMBER_HEX) { + if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) { + $ret = str_replace('-', '', $this->token); + sscanf($ret, "%x", $ret); + $ret = -$ret; } else { - sscanf($ret, "%d", $ret); + sscanf($ret, "%x", $ret); } - return $ret; - case Token::TYPE_STRING: - $quote = $this->token[0]; - $str = str_replace($quote . $quote, $quote, $this->token); - return mb_substr($str, 1, -1); // trims quotes - case Token::TYPE_SYMBOL: - $str = $this->token; - if ((isset($str[0])) && ($str[0] === '@')) { - $str = mb_substr($str, 1); - } - if ((isset($str[0])) && (($str[0] === '`') + } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE) + || ($this->flags & Token::FLAG_NUMBER_FLOAT) + ) { + sscanf($ret, "%f", $ret); + } else { + sscanf($ret, "%d", $ret); + } + return $ret; + case Token::TYPE_STRING: + $quote = $this->token[0]; + $str = str_replace($quote . $quote, $quote, $this->token); + return mb_substr($str, 1, -1); // trims quotes + case Token::TYPE_SYMBOL: + $str = $this->token; + if ((isset($str[0])) && ($str[0] === '@')) { + $str = mb_substr($str, 1); + } + if ((isset($str[0])) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\'')) - ) { - $quote = $str[0]; - $str = str_replace($quote . $quote, $quote, $str); - $str = mb_substr($str, 1, -1); - } - return $str; + ) { + $quote = $str[0]; + $str = str_replace($quote . $quote, $quote, $str); + $str = mb_substr($str, 1, -1); + } + return $str; } return $this->token; } From 2826b6b328dea467bb8a368d3a5fa96523ef173f Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 30 Jun 2015 22:14:58 +0300 Subject: [PATCH 33/57] More refactoring. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 317 ++++++++---------- libraries/Util.class.php | 32 -- libraries/parse_analyze.inc.php | 4 +- libraries/sql-parser/src/Fragment.php | 7 +- .../src/Fragments/ArrayFragment.php | 2 +- .../sql-parser/src/Fragments/CallKeyword.php | 2 +- .../sql-parser/src/Fragments/LimitKeyword.php | 2 +- .../src/Fragments/OptionsFragment.php | 2 +- .../sql-parser/src/Fragments/WhereKeyword.php | 29 +- libraries/sql.lib.php | 44 ++- test/classes/PMA_DisplayResults_test.php | 84 ++--- test/classes/PMA_Util_test.php | 36 -- 12 files changed, 213 insertions(+), 348 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 5d8fcdccd2..19288f1f2b 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -660,7 +660,7 @@ class PMA_DisplayResults * Return true if we are executing a query in the form of * "SELECT * FROM ..." * - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * * @return boolean * @@ -668,17 +668,16 @@ class PMA_DisplayResults * * @see _getTableHeaders(), _getColumnParams() */ - private function _isSelect($analyzed_sql) + private function _isSelect($analyzed_sql_results) { - if (!isset($analyzed_sql[0]['select_expr'])) { - $analyzed_sql[0]['select_expr'] = 0; - } - - return ! ($this->__get('is_count') || $this->__get('is_export') - || $this->__get('is_func') || $this->__get('is_analyse')) - && (count($analyzed_sql[0]['select_expr']) == 0) - && isset($analyzed_sql[0]['queryflags']['select_from']) - && (count($analyzed_sql[0]['table_ref']) == 1); + return ! ($this->__get('is_count') + || $this->__get('is_export') + || $this->__get('is_func') + || $this->__get('is_analyse')) + && !empty($analyzed_sql_results['queryflags']['select_from']) + && !empty($analyzed_sql_results['statement']->from) + && (count($analyzed_sql_results['statement']->from) == 1) + && !empty($analyzed_sql_results['statement']->from[0]->table) == 1; } @@ -1139,7 +1138,7 @@ class PMA_DisplayResults * Get the headers of the results table, for all of the columns * * @param array $displayParts which elements to display - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * @param array $sort_expression sort expression * @param string $sort_expression_nodirection sort expression * without direction @@ -1155,9 +1154,9 @@ class PMA_DisplayResults * @see getTableHeaders() */ private function _getTableHeadersForColumns( - $displayParts, $analyzed_sql, - $sort_expression, $sort_expression_nodirection, - $sort_direction, $is_limited_display, $unsorted_sql_query + $displayParts, $analyzed_sql_results, $sort_expression, + $sort_expression_nodirection, $sort_direction, $is_limited_display, + $unsorted_sql_query ) { $html = ''; @@ -1175,9 +1174,9 @@ class PMA_DisplayResults // Prepare Display column comments if enabled // ($GLOBALS['cfg']['ShowBrowseComments']). - $comments_map = $this->_getTableCommentsArray($analyzed_sql); + $comments_map = $this->_getTableCommentsArray($analyzed_sql_results); - list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql); + list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql_results); // optimize: avoid calling a method on each iteration $number_of_columns = $this->__get('fields_cnt'); @@ -1245,7 +1244,7 @@ class PMA_DisplayResults * Get the headers of the results table * * @param array &$displayParts which elements to display - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * @param array $sort_expression sort expression * @param string $sort_expression_nodirection sort expression * without direction @@ -1260,9 +1259,9 @@ class PMA_DisplayResults * @see getTable() */ private function _getTableHeaders( - &$displayParts, $analyzed_sql, - $sort_expression = array(), $sort_expression_nodirection = '', - $sort_direction = '', $is_limited_display = false + &$displayParts, $analyzed_sql_results, $sort_expression = array(), + $sort_expression_nodirection = '', $sort_direction = '', + $is_limited_display = false ) { $table_headers_html = ''; @@ -1271,8 +1270,8 @@ class PMA_DisplayResults $printview = $this->__get('printview'); $display_params = $this->__get('display_params'); - if ($analyzed_sql == '') { - $analyzed_sql = array(); + if ($analyzed_sql_results['analyzed_sql'] == '') { + $analyzed_sql_results['analyzed_sql'] = array(); } // can the result be sorted? @@ -1284,7 +1283,7 @@ class PMA_DisplayResults // "Sort by key" drop-down list($unsorted_sql_query, $drop_down_html) = $this->_getUnsortedSqlAndSortByKeyDropDown( - $analyzed_sql, $sort_expression[0] + $analyzed_sql_results, $sort_expression[0] ); $table_headers_html .= $drop_down_html; @@ -1303,7 +1302,7 @@ class PMA_DisplayResults . ''; // Output data needed for column reordering and show/hide column - if ($this->_isSelect($analyzed_sql)) { + if ($this->_isSelect($analyzed_sql_results)) { $table_headers_html .= $this->_getDataForResettingColumnOrder(); } @@ -1343,11 +1342,11 @@ class PMA_DisplayResults // See if we have to highlight any header fields of a WHERE query. // Uses SQL-Parser results. - $this->_setHighlightedColumnGlobalField($analyzed_sql); + $this->_setHighlightedColumnGlobalField($analyzed_sql_results); // Get the headers for all of the columns $table_headers_html .= $this->_getTableHeadersForColumns( - $displayParts, $analyzed_sql, $sort_expression, + $displayParts, $analyzed_sql_results, $sort_expression, $sort_expression_nodirection, $sort_direction, $is_limited_display, $unsorted_sql_query ); @@ -1368,8 +1367,8 @@ class PMA_DisplayResults /** * Prepare unsorted sql query and sort by key drop down * - * @param array $analyzed_sql the analyzed query - * @param string $sort_expression sort expression + * @param array $analyzed_sql_results analyzed sql results + * @param string $sort_expression sort expression * * @return array two element array - $unsorted_sql_query, $drop_down_html * @@ -1378,9 +1377,9 @@ class PMA_DisplayResults * @see _getTableHeaders() */ private function _getUnsortedSqlAndSortByKeyDropDown( - $analyzed_sql, $sort_expression + $analyzed_sql_results, $sort_expression ) { - + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $drop_down_html = ''; // Just as fallback @@ -1598,7 +1597,7 @@ class PMA_DisplayResults /** * Get table comments as array * - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * * @return array $comments_map table comments when condition true * null when condition falls @@ -1607,8 +1606,9 @@ class PMA_DisplayResults * * @see _getTableHeaders() */ - private function _getTableCommentsArray($analyzed_sql) + private function _getTableCommentsArray($analyzed_sql_results) { + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $comments_map = array(); @@ -1633,7 +1633,7 @@ class PMA_DisplayResults /** * Set global array for store highlighted header fields * - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * * @return void * @@ -1641,9 +1641,9 @@ class PMA_DisplayResults * * @see _getTableHeaders() */ - private function _setHighlightedColumnGlobalField($analyzed_sql) + private function _setHighlightedColumnGlobalField($analyzed_sql_results) { - + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $highlight_columns = array(); if (isset($analyzed_sql) && isset($analyzed_sql[0]) && isset($analyzed_sql[0]['where_clause_identifiers']) @@ -2667,12 +2667,12 @@ class PMA_DisplayResults /** * Prepare the body of the results table * - * @param integer &$dt_result the link id associated to the query + * @param integer &$dt_result the link id associated to the query which results have to be displayed * which results have to be displayed - * @param array &$displayParts which elements to display - * @param array $map the list of relations - * @param array $analyzed_sql the analyzed query - * @param boolean $is_limited_display with limited operations or not + * @param array &$displayParts which elements to display + * @param array $map the list of relations + * @param array $analyzed_sql_results analyzed sql results + * @param boolean $is_limited_display with limited operations or not * * @return string $table_body_html html content * @@ -2683,7 +2683,8 @@ class PMA_DisplayResults * @see getTable() */ private function _getTableBody( - &$dt_result, &$displayParts, $map, $analyzed_sql, $is_limited_display = false + &$dt_result, &$displayParts, $map, $analyzed_sql_results, + $is_limited_display = false ) { global $row; // mostly because of browser transformations, @@ -2693,7 +2694,7 @@ class PMA_DisplayResults // query without conditions to shorten URLs when needed, 200 is just // guess, it should depend on remaining URL length - $url_sql_query = $this->_getUrlSqlQuery($analyzed_sql); + $url_sql_query = $this->_getUrlSqlQuery($analyzed_sql_results); $display_params = $this->__get('display_params'); @@ -2701,7 +2702,7 @@ class PMA_DisplayResults $map = array(); } - $row_no = 0; + $row_no = 0; $display_params['edit'] = array(); $display_params['copy'] = array(); $display_params['delete'] = array(); @@ -2731,7 +2732,7 @@ class PMA_DisplayResults } // prepare to get the column order, if available - list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql); + list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql_results); // Correction University of Virginia 19991216 in the while below // Previous code assumed that all tables have keys, specifically that @@ -2854,9 +2855,15 @@ class PMA_DisplayResults $this->_setMimeMap(); } $table_body_html .= $this->_getRowValues( - $dt_result, $row, $row_no, $col_order, $map, - $grid_edit_class, $col_visib, - $url_sql_query, $analyzed_sql + $dt_result, + $row, + $row_no, + $col_order, + $map, + $grid_edit_class, + $col_visib, + $url_sql_query, + $analyzed_sql_results ); // 3. Displays the modify/delete links on the right if required @@ -2959,18 +2966,18 @@ class PMA_DisplayResults /** * Get the values for one data row * - * @param integer &$dt_result the link id associated to the query + * @param integer &$dt_result the link id associated to the query which results have to be displayed * which results have to be displayed - * @param array $row current row data - * @param integer $row_no the index of current row - * @param array $col_order the column order + * @param array $row current row data + * @param integer $row_no the index of current row + * @param array $col_order the column order false when a property not found * false when a property not found - * @param array $map the list of relations - * @param string $grid_edit_class the class for all editable columns - * @param boolean $col_visib column is visible(false) + * @param array $map the list of relations + * @param string $grid_edit_class the class for all editable columns + * @param boolean $col_visib column is visible(false) array column isn't visible(string array) * array column isn't visible(string array) - * @param string $url_sql_query the analyzed sql query - * @param array $analyzed_sql the analyzed query + * @param string $url_sql_query the analyzed sql query + * @param array $analyzed_sql_results analyzed sql results * * @return string $row_values_html html content * @@ -2981,9 +2988,9 @@ class PMA_DisplayResults private function _getRowValues( &$dt_result, $row, $row_no, $col_order, $map, $grid_edit_class, $col_visib, - $url_sql_query, $analyzed_sql + $url_sql_query, $analyzed_sql_results ) { - + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $row_values_html = ''; // Following variable are needed for use in isset/empty or @@ -3314,7 +3321,7 @@ class PMA_DisplayResults /** * Get url sql query without conditions to shorten URLs * - * @param array $analyzed_sql analyzed query + * @param array $analyzed_sql_results analyzed sql results * * @return string $url_sql analyzed sql query * @@ -3322,9 +3329,9 @@ class PMA_DisplayResults * * @see _getTableBody() */ - private function _getUrlSqlQuery($analyzed_sql) + private function _getUrlSqlQuery($analyzed_sql_results) { - + $analyzed_sql = $analyzed_sql_results['analyzed_sql']; if (isset($analyzed_sql) && isset($analyzed_sql[0]) && isset($analyzed_sql[0]['querytype']) @@ -3353,7 +3360,7 @@ class PMA_DisplayResults /** * Get column order and column visibility * - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results analyzed sql results * * @return array 2 element array - $col_order, $col_visib * @@ -3361,9 +3368,9 @@ class PMA_DisplayResults * * @see _getTableBody() */ - private function _getColumnParams($analyzed_sql) + private function _getColumnParams($analyzed_sql_results) { - if ($this->_isSelect($analyzed_sql)) { + if ($this->_isSelect($analyzed_sql_results)) { $pmatable = new PMA_Table($this->__get('table'), $this->__get('db')); $col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER); $col_visib = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_VISIB); @@ -4197,7 +4204,6 @@ class PMA_DisplayResults = $query['repeat_cells']; } - /** * Prepare a table of results returned by a SQL query. * @@ -4218,8 +4224,11 @@ class PMA_DisplayResults $is_limited_display = false ) { - // TODO: Remove. - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; + /** + * The statement this table is built for. + * @var SelectStatement + */ + $statement = $analyzed_sql_results['statement']; $table_html = ''; // Following variable are needed for use in isset/empty or @@ -4264,19 +4273,28 @@ class PMA_DisplayResults if ($displayParts['nav_bar'] == '1') { list($pos_next, $pos_prev) = $this->_getOffsets(); } // end if - if (!isset($analyzed_sql[0]['order_by_clause'])) { - $analyzed_sql[0]['order_by_clause'] = ""; + + // 1.3 Extract sorting expressions. + // we need $sort_expression and $sort_expression_nodirection + // even if there are many table references + $sort_expression = array(); + $sort_expression_nodirection = array(); + $sort_direction = array(); + + if (!empty($statement->order)) { + foreach ($statement->order as $o) { + $sort_expression[] = $o->field->expr . ' ' . $o->type; + $sort_expression_nodirection[] = $o->field->expr; + $sort_direction[] = $o->type; + } + } else { + $sort_expression[] = ''; + $sort_expression_nodirection[] = ''; + $sort_direction[] = ''; } - // 1.3 Find the sort expression - // we need $sort_expression and $sort_expression_nodirection - // even if there are many table references - list( - $sort_expression, $sort_expression_nodirection, - $sort_direction - ) = $this->_getSortParams($analyzed_sql[0]['order_by_clause']); - $number_of_columns = count($sort_expression_nodirection); + // 1.4 Prepares display of first and last value of the sorted column $sorted_column_message = ''; for ( $i = 0; $i < $number_of_columns; $i++ ) { @@ -4291,8 +4309,12 @@ class PMA_DisplayResults if (($displayParts['nav_bar'] == '1') && isset($pos_next)) { $message = $this->_setMessageInformation( - $sorted_column_message, $analyzed_sql[0]['limit_clause'], - $total, $pos_next, $pre_count, $after_count + $sorted_column_message, + $analyzed_sql_results, + $total, + $pos_next, + $pre_count, + $after_count ); $table_html .= PMA_Util::getMessage( @@ -4321,15 +4343,11 @@ class PMA_DisplayResults } - if (($displayParts['nav_bar'] == '1') - && empty($analyzed_sql[0]['limit_clause']) - ) { - + if (($displayParts['nav_bar'] == '1') && (empty($statemet->limit))) { $table_html .= $this->_getPlacedTableNavigations( $pos_next, $pos_prev, self::PLACE_TOP_DIRECTION_DROPDOWN, $is_innodb ); - } elseif (! isset($printview) || ($printview != '1')) { $table_html .= "\n" . '

' . "\n"; } @@ -4340,18 +4358,13 @@ class PMA_DisplayResults // initialize map $map = array(); - // find tables $target = array(); - if (isset($analyzed_sql[0]['table_ref']) - && is_array($analyzed_sql[0]['table_ref']) - ) { - - foreach ($analyzed_sql[0]['table_ref'] - as $table_ref_position => $table_ref) { - $target[] = $analyzed_sql[0]['table_ref'] - [$table_ref_position]['table_true_name']; + if (!empty($statement->from)) { + foreach ($statement->from as $field) { + if (!empty($field->table)) { + $target[] = $field->table; + } } - } if (/*overload*/mb_strlen($this->__get('table'))) { @@ -4373,19 +4386,27 @@ class PMA_DisplayResults // 3. ----- Prepare the results table ----- $table_html .= $this->_getTableHeaders( - $displayParts, $analyzed_sql, $sort_expression, - $sort_expression_nodirection, $sort_direction, $is_limited_display - ) - . '' . "\n"; + $displayParts, + $analyzed_sql_results, + $sort_expression, + $sort_expression_nodirection, + $sort_direction, + $is_limited_display + ); + + $table_html .= '' . "\n"; $table_html .= $this->_getTableBody( - $dt_result, $displayParts, $map, $analyzed_sql, $is_limited_display + $dt_result, + $displayParts, + $map, + $analyzed_sql_results, + $is_limited_display ); $this->__set('display_params', null); - $table_html .= '' . "\n" - . ''; + $table_html .= '' . "\n" . ''; // 4. ----- Prepares the link for multi-fields edit and delete @@ -4394,15 +4415,15 @@ class PMA_DisplayResults ) { $table_html .= $this->_getMultiRowOperationLinks( - $dt_result, $analyzed_sql, $displayParts['del_lnk'] + $dt_result, + $analyzed_sql_results, + $displayParts['del_lnk'] ); } // 5. ----- Get the navigation bar at the bottom if required ----- - if (($displayParts['nav_bar'] == '1') - && empty($analyzed_sql[0]['limit_clause']) - ) { + if (($displayParts['nav_bar'] == '1') && empty($statement->limit)) { $table_html .= $this->_getPlacedTableNavigations( $pos_next, $pos_prev, self::PLACE_BOTTOM_DIRECTION_DROPDOWN, $is_innodb @@ -4456,61 +4477,6 @@ class PMA_DisplayResults } // end of the '_getOffsets()' function - /** - * Get sort parameters - * - * @param string $order_by_clause the order by clause of the sql query - * - * @return array 3 element array: $sort_expression, - * $sort_expression_nodirection, $sort_direction - * - * @access private - * - * @see getTable() - */ - private function _getSortParams($order_by_clause) - { - - $sort_expression = array(); - $sort_expression_nodirection = array(); - $sort_direction = array(); - if (! empty($order_by_clause)) { - // Each order by clause is assumed to be delimited by a comma - // A typical order by clause would be order by column1 asc, column2 desc - // The following line counts the number of columns in order by clause - $matches = explode(',', $order_by_clause); - // Iterate over each column in order by clause - foreach ($matches as $index=>$order_by_clause2) { - - $sort_expression[$index] = trim( - str_replace(' ', ' ', $order_by_clause2) - ); - /** - * Get rid of ASC|DESC - */ - preg_match( - '@(.*)([[:space:]]*(ASC|DESC))@si', - $sort_expression[$index], $matches - ); - - $sort_expression_nodirection[$index] = isset($matches[1]) - ? trim($matches[1]) - : $sort_expression[$index]; - $sort_direction[$index] - = isset($matches[2]) ? trim($matches[2]) : ''; - } - } else { - $sort_expression[0] = $sort_expression_nodirection[0] - = $sort_direction[0] = ''; - } - - return array($sort_expression, $sort_expression_nodirection, - $sort_direction - ); - - } // end of the '_getSortParams()' function - - /** * Prepare sorted column message * @@ -4633,7 +4599,7 @@ class PMA_DisplayResults * Set the content that needs to be shown in message * * @param string $sorted_column_message the message for sorted column - * @param string $limit_clause the limit clause of analyzed query + * @param array $analyzed_sql_results the analyzed query * @param integer $total the total number of rows returned by * the SQL query without any * programmatically appended LIMIT clause @@ -4648,22 +4614,21 @@ class PMA_DisplayResults * @see getTable() */ private function _setMessageInformation( - $sorted_column_message, $limit_clause, $total, + $sorted_column_message, $analyzed_sql_results, $total, $pos_next, $pre_count, $after_count ) { $unlim_num_rows = $this->__get('unlim_num_rows'); // To use in isset() - if (! empty($limit_clause)) { + if (!empty($analyzed_sql_results['statement']->limit)) { - $limit_data - = PMA_Util::analyzeLimitClause($limit_clause); - $first_shown_rec = $limit_data['start']; + $first_shown_rec = $analyzed_sql_results['statement']->limit->offset; + $row_count = $analyzed_sql_results['statement']->limit->rowCount; - if ($limit_data['length'] < $total) { - $last_shown_rec = $limit_data['start'] + $limit_data['length'] - 1; + if ($row_count < $total) { + $last_shown_rec = $first_shown_rec + $row_count - 1; } else { - $last_shown_rec = $limit_data['start'] + $total - 1; + $last_shown_rec = $first_shown_rec + $total - 1; } } elseif (($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS) @@ -4811,10 +4776,10 @@ class PMA_DisplayResults /** * Prepare multi field edit/delete links * - * @param integer &$dt_result the link id associated to the query + * @param integer &$dt_result the link id associated to the query which results have to be displayed * which results have to be displayed - * @param array $analyzed_sql the analyzed query - * @param string $del_link the display element - 'del_link' + * @param array $analyzed_sql_results analyzed sql results + * @param string $del_link the display element - 'del_link' * * @return string $links_html html content * @@ -4823,7 +4788,7 @@ class PMA_DisplayResults * @see getTable() */ private function _getMultiRowOperationLinks( - &$dt_result, $analyzed_sql, $del_link + &$dt_result, $analyzed_sql_results, $del_link ) { $links_html = '
'; @@ -4857,9 +4822,7 @@ class PMA_DisplayResults $delete_text, 'b_drop.png', 'delete' ); - if (isset($analyzed_sql[0]) - && $analyzed_sql[0]['querytype'] == self::QUERY_TYPE_SELECT - ) { + if ($analyzed_sql_results['querytype'] == 'SELECT') { $links_html .= PMA_Util::getButtonOrImage( 'submit_mult', 'mult_submit', 'submit_mult_export', __('Export'), 'b_tblexport.png', 'export' diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 3bbdee123f..04315c7217 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4181,38 +4181,6 @@ class PMA_Util return $server_type; } - /** - * Analyzes the limit clause and return the start and length attributes of it. - * - * @param string $limit_clause limit clause - * - * @return array|bool Start and length attributes of the limit clause or false - * on failure - */ - public static function analyzeLimitClause($limit_clause) - { - $limitParams = trim(str_ireplace('LIMIT', '', $limit_clause)); - if ('' == $limitParams) { - return false; - } - - $start_and_length = explode(',', $limitParams); - $size = count($start_and_length); - if ($size == 1) { - return array( - 'start' => '0', - 'length' => trim($start_and_length[0]) - ); - } elseif ($size == 2) { - return array( - 'start' => trim($start_and_length[0]), - 'length' => trim($start_and_length[1]) - ); - } - - return false; - } - /** * Prepare HTML code for display button. * diff --git a/libraries/parse_analyze.inc.php b/libraries/parse_analyze.inc.php index 785a36faf8..bd56c23584 100644 --- a/libraries/parse_analyze.inc.php +++ b/libraries/parse_analyze.inc.php @@ -19,7 +19,7 @@ $analyzed_sql_results = SqlParser\Utils\Query::getAll($sql_query); $analyzed_sql_results['parsed_sql'] = PMA_SQP_parse($sql_query); $analyzed_sql_results['analyzed_sql'] = PMA_SQP_analyze($analyzed_sql_results['parsed_sql']); -// TODO: Refactor this as well. +// TODO: Refactor this. extract($analyzed_sql_results); // If the targeted table (and database) are different than the ones that is @@ -53,7 +53,7 @@ if (!empty($analyzed_sql_results['select_tables'])) { $reload = strcasecmp($db, $prev_db) != 0; } - // Updating the array as well. + // Updating the array. $analyzed_sql_results['reload'] = $reload; } diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php index 6ae85da486..29ec8a9395 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Fragment.php @@ -41,11 +41,14 @@ abstract class Fragment /** * Builds the string representation of a fragment of this type. * - * @param Fragment $fragment The fragment to be built. + * In other words, this function represents the inverse function of + * `static::parse`. + * + * @param mixed $fragment The fragment to be built. * * @return string */ - public static function build(Fragment $fragment) + public static function build($fragment) { return null; } diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Fragments/ArrayFragment.php index db12622493..8c91fc2b55 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Fragments/ArrayFragment.php @@ -131,7 +131,7 @@ class ArrayFragment extends Fragment * * @return string */ - public static function build(ArrayFragment $fragment) + public static function build($fragment) { $values = array(); if (!empty($fragment->raw)) { diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php index 3b8cc80b5a..e56940b295 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -116,7 +116,7 @@ class CallKeyword extends Fragment * * @return string */ - public static function build(CallKeyword $fragment) + public static function build($fragment) { return $fragment->name . ArrayFragment::build($fragment->parameters); } diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index af8d92dbd8..36efa0208e 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -45,7 +45,7 @@ class LimitKeyword extends Fragment * @param int $rowCount The row count. * @param int $offset The offset. */ - public function __construct($rowCount = null, $offset = null) + public function __construct($rowCount = 0, $offset = 0) { $this->rowCount = $rowCount; $this->offset = $offset; diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index 16459cc5ba..00ac282c16 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -142,7 +142,7 @@ class OptionsFragment extends Fragment * * @return string */ - public static function build(OptionsFragment $fragment) + public static function build($fragment) { $options = array(); foreach ($fragment->options as $option) { diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index 8bc3018d2b..0710738169 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -44,16 +44,16 @@ class WhereKeyword extends Fragment * * @var string */ - public $condition; + public $expr; /** * Constructor. * - * @param string $condition The condition or the operator. + * @param string $expr The condition or the operator. */ - public function __construct($condition = null) + public function __construct($expr = null) { - $this->condition = trim($condition); + $this->expr = trim($expr); } /** @@ -71,9 +71,10 @@ class WhereKeyword extends Fragment * The condition that was parsed so far. * @var string */ - $condition = ''; + $tmp = ''; for (; $list->idx < $list->count; ++$list->idx) { + /** * Token parsed at this moment. * @var Token @@ -92,10 +93,10 @@ class WhereKeyword extends Fragment // Conditions are delimited by logical operators. if (in_array($token->value, static::$OPERATORS, true)) { - if (!empty(trim($condition))) { + if (!empty(trim($tmp))) { // Adding the condition that is delimited by this operator. - $ret[] = new WhereKeyword($condition); - $condition = ''; + $ret[] = new WhereKeyword($tmp); + $tmp = ''; } // Adding the operator. @@ -111,13 +112,13 @@ class WhereKeyword extends Fragment break; } - $condition .= $token->token; + $tmp .= $token->token; } // Last iteration was not processed. - if (!empty(trim($condition))) { - $ret[] = new WhereKeyword($condition); + if (!empty(trim($tmp))) { + $ret[] = new WhereKeyword($tmp); } --$list->idx; @@ -131,10 +132,10 @@ class WhereKeyword extends Fragment */ public static function build($fragment) { - $conditions = array(); + $ret = array(); foreach ($fragment as $f) { - $conditions[] = $f->condition; + $ret[] = $f->expr; } - return implode(' ', $conditions); + return implode(' ', $ret); } } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 3abe192229..5381a3e4e2 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -99,10 +99,10 @@ function PMA_handleSortOrder( // Store the remembered table into session. $pmatable->setUiProp( PMA_Table::PROP_SORTED_COLUMN, - Query::getClause( + SqlParser\Utils\Query::getClause( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, - 'ORDER' + 'ORDER BY' ) ); } @@ -667,7 +667,7 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end) && count($analyzed_sql_results['select_tables'] <= 1) && (empty($analyzed_sql_results['statement']->where) || (count($analyzed_sql_results['statement']->where) == 1 - && $analyzed_sql_results['statement']->where->expr ==='1')) + && $analyzed_sql_results['statement']->where[0]->condition ==='1')) && empty($analyzed_sql_results['group']) && ! isset($find_real_end) && ! $analyzed_sql_results['is_subquery'] @@ -1629,17 +1629,29 @@ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, } $_SESSION['is_multi_query'] = false; $displayResultsObject->setProperties( - $unlim_num_rows, $fields_meta, $analyzed_sql_results['is_count'], - $analyzed_sql_results['is_export'], $analyzed_sql_results['is_func'], - $analyzed_sql_results['is_analyse'], $num_rows, - $fields_cnt, $GLOBALS['querytime'], $pmaThemeImage, $GLOBALS['text_dir'], - $analyzed_sql_results['is_maint'], $analyzed_sql_results['is_explain'], - $analyzed_sql_results['is_show'], $showtable, $printview, $url_query, - $editable, $browse_dist + $unlim_num_rows, + $fields_meta, + $analyzed_sql_results['is_count'], + $analyzed_sql_results['is_export'], + $analyzed_sql_results['is_func'], + $analyzed_sql_results['is_analyse'], + $num_rows, + $fields_cnt, $GLOBALS['querytime'], + $pmaThemeImage, $GLOBALS['text_dir'], + $analyzed_sql_results['is_maint'], + $analyzed_sql_results['is_explain'], + $analyzed_sql_results['is_show'], + $showtable, + $printview, + $url_query, + $editable, + $browse_dist ); $table_html .= $displayResultsObject->getTable( - $result, $displayParts, $analyzed_sql_results + $result, + $displayParts, + $analyzed_sql_results ); $GLOBALS['dbi']->freeResult($result); } @@ -1779,12 +1791,10 @@ function PMA_getHtmlForIndexesProblems($query_type, $selectedTables, $db) * * @return string html */ -function PMA_getQueryResponseForResultsReturned($result, - $analyzed_sql_results, $db, $table, $message, $sql_data, - $displayResultsObject, $pmaThemeImage, - $unlim_num_rows, $num_rows, $disp_query, - $disp_message, $profiling_results, $query_type, $selectedTables, $sql_query, - $complete_query +function PMA_getQueryResponseForResultsReturned($result, $analyzed_sql_results, + $db, $table, $message, $sql_data, $displayResultsObject, $pmaThemeImage, + $unlim_num_rows, $num_rows, $disp_query, $disp_message, $profiling_results, + $query_type, $selectedTables, $sql_query, $complete_query ) { // If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 9846c986dd..9c69a6b004 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -94,15 +94,18 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase */ public function testisSelect() { - $analyzed_sql = array(array()); - $analyzed_sql[0]['select_expr'] = array(); - $analyzed_sql[0]['queryflags']['select_from'] = 'pma'; - $analyzed_sql[0]['table_ref'] = array('table_ref'); - + $parser = new \SqlParser\Parser('SELECT * FROM pma'); $this->assertTrue( $this->_callPrivateFunction( '_isSelect', - array($analyzed_sql) + array( + array( + 'statement' => $parser->statements[0], + 'queryflags' => array( + 'select_from' => true, + ), + ), + ) ) ); } @@ -349,57 +352,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase ); } - /** - * Data provider for testGetSortParams - * - * @return array parameters and output - */ - public function dataProviderForGetSortParams() - { - return array( - array('', array(array(''), array(''), array(''))), - array( - '`a_sales`.`customer_id` ASC', - array( - array('`a_sales`.`customer_id` ASC'), - array('`a_sales`.`customer_id`'), - array('ASC') - ) - ), - array( - '`a_sales`.`customer_id` ASC, `b_sales`.`customer_id` DESC', - array( - array( - '`a_sales`.`customer_id` ASC', - '`b_sales`.`customer_id` DESC' - ), - array('`a_sales`.`customer_id`', '`b_sales`.`customer_id`'), - array('ASC', 'DESC') - ) - ), - ); - } - - /** - * Test for _getSortParams - * - * @param string $order_by_clause the order by clause of the sql query - * @param string $output output of _getSortParams - * - * @return void - * - * @dataProvider dataProviderForGetSortParams - */ - public function testGetSortParams($order_by_clause, $output) - { - $this->assertEquals( - $output, - $this->_callPrivateFunction( - '_getSortParams', array($order_by_clause) - ) - ); - } - /** * Data provider for testGetCheckboxForMultiRowSubmissions * @@ -1290,18 +1242,22 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase { return array( array( - array(), + array( + 'analyzed_sql' => array(), + ), array() ), array( array( - 0 => array( - 'where_clause_identifiers' => array( - 0 => '`id`', - 1 => '`id`', - 2 => '`db_name`' + 'analyzed_sql' => array( + 0 => array( + 'where_clause_identifiers' => array( + 0 => '`id`', + 1 => '`id`', + 2 => '`db_name`' + ) ) - ) + ), ), array( '`id`' => 'true', diff --git a/test/classes/PMA_Util_test.php b/test/classes/PMA_Util_test.php index e88b0237d6..034fc80bbb 100644 --- a/test/classes/PMA_Util_test.php +++ b/test/classes/PMA_Util_test.php @@ -18,42 +18,6 @@ require_once 'libraries/Util.class.php'; */ class PMA_Util_Test extends PHPUnit_Framework_TestCase { - /** - * Test for analyze Limit Clause - * - * @return void - */ - public function testAnalyzeLimitClause() - { - $limit_data = PMA_Util::analyzeLimitClause("limit 2,4"); - $this->assertEquals( - '2', - $limit_data['start'] - ); - $this->assertEquals( - '4', - $limit_data['length'] - ); - - $limit_data = PMA_Util::analyzeLimitClause("limit 3"); - $this->assertEquals( - '0', - $limit_data['start'] - ); - $this->assertEquals( - '3', - $limit_data['length'] - ); - - $limit_data = PMA_Util::analyzeLimitClause("limit 3,2,5"); - $this->assertFalse($limit_data); - - $limit_data = PMA_Util::analyzeLimitClause("limit"); - $this->assertFalse($limit_data); - - $limit_data = PMA_Util::analyzeLimitClause("limit "); - $this->assertFalse($limit_data); - } /** * Test for createGISData From 684b4bed1ad751cab9c7d673de6824e6c402d24a Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 2 Jul 2015 01:21:30 +0300 Subject: [PATCH 34/57] Finished replacing the old parser in DisplayResults. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 220 ++++++++---------- .../sql-parser/src/Fragments/WhereKeyword.php | 51 +++- libraries/sql-parser/src/Utils/Query.php | 85 +++---- libraries/sql.lib.php | 1 + test/classes/PMA_DisplayResults_test.php | 32 +-- 5 files changed, 191 insertions(+), 198 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 19288f1f2b..40a67bcd63 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -1270,10 +1270,6 @@ class PMA_DisplayResults $printview = $this->__get('printview'); $display_params = $this->__get('display_params'); - if ($analyzed_sql_results['analyzed_sql'] == '') { - $analyzed_sql_results['analyzed_sql'] = array(); - } - // can the result be sorted? if ($displayParts['sort_lnk'] == '1') { @@ -1379,27 +1375,17 @@ class PMA_DisplayResults private function _getUnsortedSqlAndSortByKeyDropDown( $analyzed_sql_results, $sort_expression ) { - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $drop_down_html = ''; - // Just as fallback - $unsorted_sql_query = $this->__get('sql_query'); - if (isset($analyzed_sql[0]['unsorted_query'])) { - $unsorted_sql_query = $analyzed_sql[0]['unsorted_query']; - } - // Handles the case of multiple clicks on a column's header - // which would add many spaces before "ORDER BY" in the - // generated query. - $unsorted_sql_query = trim($unsorted_sql_query); + $unsorted_sql_query = SqlParser\Utils\Query::replaceClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'ORDER BY', + '' + ); - // sorting by indexes, only if it makes sense (only one table ref) - if (isset($analyzed_sql) - && isset($analyzed_sql[0]) - && isset($analyzed_sql[0]['querytype']) - && ($analyzed_sql[0]['querytype'] == self::QUERY_TYPE_SELECT) - && isset($analyzed_sql[0]['table_ref']) - && (count($analyzed_sql[0]['table_ref']) == 1) - ) { + // Data is sorted by indexes only if it there is only one table. + if ($this->_isSelect($analyzed_sql_results)) { // grab indexes data: $indexes = PMA_Index::getFromTable( $this->__get('table'), @@ -1599,8 +1585,7 @@ class PMA_DisplayResults * * @param array $analyzed_sql_results analyzed sql results * - * @return array $comments_map table comments when condition true - * null when condition falls + * @return array $comments_map table comments * * @access private * @@ -1608,24 +1593,24 @@ class PMA_DisplayResults */ private function _getTableCommentsArray($analyzed_sql_results) { - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; - - $comments_map = array(); - - if ($GLOBALS['cfg']['ShowBrowseComments']) { - if (isset($analyzed_sql[0]) - && is_array($analyzed_sql[0]) - && isset($analyzed_sql[0]['table_ref']) - ) { - foreach ($analyzed_sql[0]['table_ref'] as $tbl) { - $tb = $tbl['table_true_name']; - $comments_map[$tb] = PMA_getComments($this->__get('db'), $tb); - unset($tb); - } - } + if ((!$GLOBALS['cfg']['ShowBrowseComments']) + || (empty($analyzed_sql_results['statement']->from)) + ) { + return array(); } - return $comments_map; + $ret = array(); + foreach ($analyzed_sql_results['statement']->from as $field) { + if (empty($field->table)) { + continue; + } + $ret[$field->table] = PMA_getComments( + empty($field->database) ? $this->__get('db') : $field->database, + $field->table + ); + } + + return $ret; } // end of the '_getTableCommentsArray()' function @@ -1643,14 +1628,13 @@ class PMA_DisplayResults */ private function _setHighlightedColumnGlobalField($analyzed_sql_results) { - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $highlight_columns = array(); - if (isset($analyzed_sql) && isset($analyzed_sql[0]) - && isset($analyzed_sql[0]['where_clause_identifiers']) - && is_array($analyzed_sql[0]['where_clause_identifiers']) - ) { - foreach ($analyzed_sql[0]['where_clause_identifiers'] as $wci) { - $highlight_columns[$wci] = 'true'; + + if (!empty($analyzed_sql_results['statement']->where)) { + foreach ($analyzed_sql_results['statement']->where as $expr) { + foreach ($expr->identifiers as $identifier) { + $highlight_columns[$identifier] = 'true'; + } } } @@ -2990,7 +2974,6 @@ class PMA_DisplayResults $grid_edit_class, $col_visib, $url_sql_query, $analyzed_sql_results ) { - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; $row_values_html = ''; // Following variable are needed for use in isset/empty or @@ -3181,9 +3164,15 @@ class PMA_DisplayResults $display_params['data'][$row_no][$i] = $this->_getDataCellForNumericColumns( - $row[$i], $class, $condition_field, $meta, $map, - $is_field_truncated, $analyzed_sql, - $transformation_plugin, $default_function, + $row[$i], + $class, + $condition_field, + $meta, + $map, + $is_field_truncated, + $analyzed_sql_results, + $transformation_plugin, + $default_function, $transform_options ); @@ -3196,9 +3185,16 @@ class PMA_DisplayResults $display_params['data'][$row_no][$i] = $this->_getDataCellForGeometryColumns( - $row[$i], $class, $meta, $map, $_url_params, - $condition_field, $transformation_plugin, - $default_function, $transform_options, $analyzed_sql + $row[$i], + $class, + $meta, + $map, + $_url_params, + $condition_field, + $transformation_plugin, + $default_function, + $transform_options, + $analyzed_sql_results ); } else { @@ -3206,10 +3202,19 @@ class PMA_DisplayResults $display_params['data'][$row_no][$i] = $this->_getDataCellForNonNumericColumns( - $row[$i], $class, $meta, $map, $_url_params, - $condition_field, $transformation_plugin, - $default_function, $transform_options, - $is_field_truncated, $analyzed_sql, $dt_result, $i + $row[$i], + $class, + $meta, + $map, + $_url_params, + $condition_field, + $transformation_plugin, + $default_function, + $transform_options, + $is_field_truncated, + $analyzed_sql_results, + $dt_result, + $i ); } @@ -3317,7 +3322,6 @@ class PMA_DisplayResults } - /** * Get url sql query without conditions to shorten URLs * @@ -3331,28 +3335,24 @@ class PMA_DisplayResults */ private function _getUrlSqlQuery($analyzed_sql_results) { - $analyzed_sql = $analyzed_sql_results['analyzed_sql']; - if (isset($analyzed_sql) - && isset($analyzed_sql[0]) - && isset($analyzed_sql[0]['querytype']) - && ($analyzed_sql[0]['querytype'] == self::QUERY_TYPE_SELECT) - && (/*overload*/mb_strlen($this->__get('sql_query')) > 200) + if (($analyzed_sql_results['querytype'] != 'SELECT') + || (/*overload*/mb_strlen($this->__get('sql_query')) < 200) ) { - - $url_sql_query = 'SELECT '; - if (isset($analyzed_sql[0]['queryflags']['distinct'])) { - $url_sql_query .= ' DISTINCT '; - } - - $url_sql_query .= $analyzed_sql[0]['select_expr_clause']; - if (!empty($analyzed_sql[0]['from_clause'])) { - $url_sql_query .= ' FROM ' . $analyzed_sql[0]['from_clause']; - } - - return $url_sql_query; + return $this->__get('sql_query'); } - return $this->__get('sql_query'); + $query = 'SELECT ' . SqlParser\Utils\Query::getClause( + $parser->statements[0], $parser->list, 'SELECT' + ); + + $from_clause = SqlParser\Utils\Query::getClause( + $parser->statements[0], $parser->list, 'FROM' + ); + if (!empty($from_clause)) { + $query .= ' FROM ' . $from_clause; + } + + return $query; } // end of the '_getUrlSqlQuery()' function @@ -3732,7 +3732,7 @@ class PMA_DisplayResults * @param array $map the list of relations * @param boolean $is_field_truncated the condition for blob data * replacements - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results the analyzed query * @param object|string $transformation_plugin the name of transformation plugin * @param string $default_function the default transformation * function @@ -3746,7 +3746,7 @@ class PMA_DisplayResults */ private function _getDataCellForNumericColumns( $column, $class, $condition_field, $meta, $map, $is_field_truncated, - $analyzed_sql, $transformation_plugin, $default_function, + $analyzed_sql_results, $transformation_plugin, $default_function, $transform_options ) { @@ -3763,7 +3763,7 @@ class PMA_DisplayResults $cell = $this->_getRowData( 'right ' . $class, $condition_field, - $analyzed_sql, $meta, $map, $column, + $analyzed_sql_results, $meta, $map, $column, $transformation_plugin, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated, '' @@ -3796,7 +3796,7 @@ class PMA_DisplayResults * @param string $default_function the default transformation * function * @param string $transform_options the transformation parameters - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results the analyzed query * * @return string $cell the prepared data cell, html content * @@ -3807,7 +3807,7 @@ class PMA_DisplayResults private function _getDataCellForGeometryColumns( $column, $class, $meta, $map, $_url_params, $condition_field, $transformation_plugin, $default_function, $transform_options, - $analyzed_sql + $analyzed_sql_results ) { if (! isset($column) || is_null($column)) { $cell = $this->_buildNullDisplay($class, $condition_field, $meta); @@ -3845,7 +3845,7 @@ class PMA_DisplayResults ) = $this->_getPartialText($wktval); $cell = $this->_getRowData( - $class, $condition_field, $analyzed_sql, $meta, $map, + $class, $condition_field, $analyzed_sql_results, $meta, $map, $wktval, $transformation_plugin, $default_function, '', $where_comparison, $transform_options, $is_field_truncated, '' @@ -3867,7 +3867,7 @@ class PMA_DisplayResults $cell = $this->_getRowData( $class, $condition_field, - $analyzed_sql, $meta, $map, $wkbval, + $analyzed_sql_results, $meta, $map, $wkbval, $transformation_plugin, $default_function, '', $where_comparison, $transform_options, $is_field_truncated, '' @@ -3909,7 +3909,7 @@ class PMA_DisplayResults * @param string $transform_options the transformation parameters * @param boolean $is_field_truncated is data truncated due to * LimitChars - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results the analyzed query * @param integer &$dt_result the link id associated to * the query which results * have to be displayed @@ -3924,7 +3924,7 @@ class PMA_DisplayResults private function _getDataCellForNonNumericColumns( $column, $class, $meta, $map, $_url_params, $condition_field, $transformation_plugin, $default_function, $transform_options, - $is_field_truncated, $analyzed_sql, &$dt_result, $col_index + $is_field_truncated, $analyzed_sql_results, &$dt_result, $col_index ) { $original_length = 0; @@ -4035,7 +4035,7 @@ class PMA_DisplayResults $cell = $this->_getRowData( $class, $condition_field, - $analyzed_sql, $meta, $map, $column, + $analyzed_sql_results, $meta, $map, $column, $transformation_plugin, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated, $original_length @@ -5310,7 +5310,7 @@ class PMA_DisplayResults * @param string $class css classes for the td element * @param bool $condition_field whether the column is a part of * the where clause - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results the analyzed query * @param object $meta the meta-information about the * field * @param array $map the list of relations @@ -5335,11 +5335,10 @@ class PMA_DisplayResults * */ private function _getRowData( - $class, $condition_field, $analyzed_sql, $meta, $map, $data, + $class, $condition_field, $analyzed_sql_results, $meta, $map, $data, $transformation_plugin, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated, $original_length='' ) { - $relational_display = $_SESSION['tmpval']['relational_display']; $printview = $this->__get('printview'); $decimals = isset($meta->decimals) ? $meta->decimals : '-1'; @@ -5358,32 +5357,19 @@ class PMA_DisplayResults ) . '">'; - if (isset($analyzed_sql[0]['select_expr']) - && is_array($analyzed_sql[0]['select_expr']) - ) { - - foreach ($analyzed_sql[0]['select_expr'] - as $select_expr_position => $select_expr - ) { - - $alias = $analyzed_sql[0]['select_expr'] - [$select_expr_position]['alias']; - - if (!isset($alias) || !/*overload*/mb_strlen($alias)) { - continue; - } // end if - - $true_column = $analyzed_sql[0]['select_expr'] - [$select_expr_position]['column']; - - if ($alias == $meta->name) { - // this change in the parameter does not matter - // outside of the function - $meta->name = $true_column; - } // end if - - } // end foreach - } // end if + if (!empty($analyzed_sql_results['statement'])) { + $statement = $analyzed_sql_results['statement']; + if (!empty($statement->expr)) { + foreach ($statement->expr as $expr) { + if ((empty($expr->alias)) || (empty($expr->column))) { + continue; + } + if (strcasecmp($meta->name, $expr->alias) == 0) { + $meta->name = $expr->column; + } + } + } + } if (isset($map[$meta->name])) { diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index 0710738169..f5bec24040 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -30,7 +30,14 @@ class WhereKeyword extends Fragment * * @var array */ - public static $OPERATORS = array('&&', '(', ')', 'AND', 'OR', 'XOR', '||'); + public static $OPERATORS = array('&&', 'AND', 'OR', 'XOR', '||'); + + /** + * Identifiers recognized. + * + * @var array + */ + public $identifiers = array(); /** * Whether this fragment is an operator. @@ -67,11 +74,13 @@ class WhereKeyword extends Fragment { $ret = array(); + $expr = new WhereKeyword(); + /** - * The condition that was parsed so far. - * @var string + * Counts brackets. + * @var int */ - $tmp = ''; + $brackets = 0; for (; $list->idx < $list->count; ++$list->idx) { @@ -93,10 +102,10 @@ class WhereKeyword extends Fragment // Conditions are delimited by logical operators. if (in_array($token->value, static::$OPERATORS, true)) { - if (!empty(trim($tmp))) { + $expr->expr = trim($expr->expr); + if (!empty($expr->expr)) { // Adding the condition that is delimited by this operator. - $ret[] = new WhereKeyword($tmp); - $tmp = ''; + $ret[] = $expr; } // Adding the operator. @@ -104,21 +113,39 @@ class WhereKeyword extends Fragment $expr->isOperator = true; $ret[] = $expr; + $expr = new WhereKeyword(); continue; } + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === '(') { + ++$brackets; + } elseif ($token->value === ')') { + --$brackets; + } + } + // No keyword is expected. if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { - break; + if ($brackets == 0) { + break; + } } - $tmp .= $token->token; - + $expr->expr .= $token->token; + if (($token->type === Token::TYPE_NONE) + || (($token->type === Token::TYPE_KEYWORD) && (!($token->flags & Token::FLAG_KEYWORD_RESERVED))) + || ($token->type === Token::TYPE_STRING) + || ($token->type === Token::TYPE_SYMBOL) + ) { + $expr->identifiers[] = $token->value; + } } // Last iteration was not processed. - if (!empty(trim($tmp))) { - $ret[] = new WhereKeyword($tmp); + $expr->expr = trim($expr->expr); + if (!empty($expr->expr)) { + $ret[] = $expr; } --$list->idx; diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index f97374404a..11a08d0212 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -8,6 +8,7 @@ */ namespace SqlParser\Utils; +use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; @@ -406,32 +407,6 @@ class Query return $ret; } - /** - * Gets the type of clause. - * - * @param string $clause The clause. - * - * @return string - */ - public static function getClauseType($clause) - { - $type = ''; - for ($i = 0, $len = strlen($clause); $i < $len; ++$i) { - if ((empty($type)) && (ctype_space($clause[$i]))) { - // Skipping whitespaces if we haven't started determining the - // type. - continue; - } - if (!ctype_alnum($clause[$i])) { - // The type contains only alphanumeric characters. - break; - } - // Adding character. - $type .= $clause[$i]; - } - return $type; - } - /** * Gets a specific clause. * @@ -474,11 +449,23 @@ class Query */ $clauses = array_flip(array_keys($statement::$CLAUSES)); + /** + * Lexer used for lexing the clause. + * @var Lexer + */ + $lexer = new Lexer($clause); + + /** + * The type of this clause. + * @var string + */ + $clauseType = $lexer->list->getNextOfType(Token::TYPE_KEYWORD)->value; + /** * The index of this clause. * @var int */ - $clauseIdx = $clauses[static::getClauseType($clause)]; + $clauseIdx = $clauses[$clauseType]; for ($i = $statement->first; $i <= $statement->last; ++$i) { $token = $list->tokens[$i]; @@ -493,16 +480,15 @@ class Query if ($brackets == 0) { // Checking if we changed sections. - if ($token->type === Token::TYPE_KEYWORD) { - if (isset($clauses[$token->value])) { - if ($clauses[$token->value] >= $currIdx) { - $currIdx = $clauses[$token->value]; - if (($skipFirst) && ($currIdx == $clauseIdx)) { - // This token is skipped (not added to the old - // clause) because it will be replaced. - continue; - } - } + if (($token->type === Token::TYPE_KEYWORD) + && (isset($clauses[$token->value])) + && ($clauses[$token->value] >= $currIdx) + ) { + $currIdx = $clauses[$token->value]; + if (($skipFirst) && ($currIdx == $clauseIdx)) { + // This token is skipped (not added to the old + // clause) because it will be replaced. + continue; } } } @@ -526,25 +512,30 @@ class Query * * @param Statement $statement The parsed query that has to be modified. * @param TokensList $list The list of tokens. - * @param string $clause The clause to be replaced. + * @param string $old The type of the clause that should be + * replaced. This can be an entire clause. + * @param string $new The new clause. If this parameter is omitted + * it is considered to be equal with `$old`. * @param bool $onlyType Whether only the type of the clause should * be replaced or the entire clause. * * @return string */ - public static function replaceClause($statement, $list, $clause, $onlyType = false) + public static function replaceClause($statement, $list, $old, $new = null, $onlyType = false) { // TODO: Update the tokens list and the statement. - if ($onlyType) { - return static::getClause($statement, $list, $clause, -1, false) . ' ' . - $clause . ' ' . - static::getCLause($statement, $list, $clause, 0) . ' ' . - static::getClause($statement, $list, $clause, 1, false); + if ($new === null) { + $new = $old; } - return static::getClause($statement, $list, $clause, -1, false) . ' ' . - $clause . ' ' . - static::getClause($statement, $list, $clause, 1, false); + if ($onlyType) { + return static::getClause($statement, $list, $old, -1, false) . ' ' . + $new . ' ' . static::getCLause($statement, $list, $old, 0) . ' ' . + static::getClause($statement, $list, $old, 1, false); + } + + return static::getClause($statement, $list, $old, -1, false) . ' ' . + $new . ' ' . static::getClause($statement, $list, $old, 1, false); } } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 5381a3e4e2..0e44cc9c6c 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1186,6 +1186,7 @@ function PMA_countQueryResults( $analyzed_sql_results['statement'], $analyzed_sql_results['parser']->list, 'SELECT SQL_CALC_FOUND_ROWS', + null, true ); diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 9c69a6b004..3485a80bf1 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1240,30 +1240,18 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase */ public function dataProviderForTestSetHighlightedColumnGlobalField() { + $parser = new SqlParser\Parser( + 'SELECT * FROM db_name WHERE `db_name`.`tbl`.id > 0 AND `id` < 10' + ); return array( array( + array('statement' => $parser->statements[0]), array( - 'analyzed_sql' => array(), + 'db_name' => 'true', + 'tbl' => 'true', + 'id' => 'true', ), - array() ), - array( - array( - 'analyzed_sql' => array( - 0 => array( - 'where_clause_identifiers' => array( - 0 => '`id`', - 1 => '`id`', - 2 => '`db_name`' - ) - ) - ), - ), - array( - '`id`' => 'true', - '`db_name`' => 'true' - ) - ) ); } @@ -1576,7 +1564,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase * @param string $default_function the default transformation function * @param string $transform_options the transformation parameters * @param boolean $is_field_truncated is data truncated due to LimitChars - * @param array $analyzed_sql the analyzed query + * @param array $analyzed_sql_results the analyzed query * @param integer $dt_result the link id associated to the query * which results have to be displayed * @param integer $col_index the column index @@ -1590,7 +1578,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase $protectBinary, $column, $class, $meta, $map, $_url_params, $condition_field, $transformation_plugin, $default_function, $transform_options, $is_field_truncated, - $analyzed_sql, $dt_result, $col_index, $output + $analyzed_sql_results, $dt_result, $col_index, $output ) { $_SESSION['tmpval']['display_binary'] = true; $_SESSION['tmpval']['display_blob'] = false; @@ -1604,7 +1592,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase array( $column, $class, $meta, $map, $_url_params, $condition_field, $transformation_plugin, $default_function, $transform_options, - $is_field_truncated, $analyzed_sql, &$dt_result, $col_index + $is_field_truncated, $analyzed_sql_results, &$dt_result, $col_index ) ) ); From c34cf9ff29e47618fc788d1fce8087375744705a Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 3 Jul 2015 00:19:50 +0300 Subject: [PATCH 35/57] More refactoring. Updated sql-parser library. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 66 ++++---- libraries/Util.class.php | 44 +++--- libraries/central_columns.lib.php | 3 - libraries/insert_edit.lib.php | 16 +- libraries/normalization.lib.php | 1 - libraries/plugins/export/ExportSql.class.php | 11 +- libraries/sql-parser/src/Builder.php | 3 + .../src/Fragments/FieldFragment.php | 7 +- libraries/sql-parser/src/Parser.php | 6 +- libraries/sql-parser/src/Statement.php | 19 ++- .../src/Statements/CreateStatement.php | 143 +++++++++++++++--- libraries/sql-parser/src/TokensList.php | 10 +- libraries/sql.lib.php | 2 +- tbl_zoom_select.php | 9 +- 14 files changed, 241 insertions(+), 99 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 40a67bcd63..da9e98fbe2 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2778,12 +2778,13 @@ class PMA_DisplayResults */ list($where_clause, $clause_is_unique, $condition_array) = PMA_Util::getUniqueCondition( - $dt_result, - $this->__get('fields_cnt'), - $this->__get('fields_meta'), - $row, - false, - $this->__get('table') + $dt_result, // handle + $this->__get('fields_cnt'), // fields_cnt + $this->__get('fields_meta'), // fields_meta + $row, // row + false, // force_unique + $this->__get('table'), // restrict_to_table + $analyzed_sql_results // analyzed_sql_results ); $whereClauseMap[$row_no][$this->__get('table')] = $where_clause; $this->__set('whereClauseMap', $whereClauseMap); @@ -3133,12 +3134,13 @@ class PMA_DisplayResults */ if (! isset($whereClauseMap[$row_no][$meta->orgtable])) { $unique_conditions = PMA_Util::getUniqueCondition( - $dt_result, - $this->__get('fields_cnt'), - $this->__get('fields_meta'), - $row, - false, - $meta->orgtable + $dt_result, // handle + $this->__get('fields_cnt'), // fields_cnt + $this->__get('fields_meta'), // fields_meta + $row, // row + false, // force_unique + $meta->orgtable, // restrict_to_table + $analyzed_sql_results // analyzed_sql_results ); $whereClauseMap[$row_no][$meta->orgtable] = $unique_conditions[0]; } @@ -4848,10 +4850,13 @@ class PMA_DisplayResults // in the multi-edit and multi-delete form list($where_clause, $clause_is_unique, $condition_array) = PMA_Util::getUniqueCondition( - $dt_result, - $this->__get('fields_cnt'), - $this->__get('fields_meta'), - $row + $dt_result, // handle + $this->__get('fields_cnt'), // fields_cnt + $this->__get('fields_meta'), // fields_meta + $row, // row + false, // force_unique + false, // restrict_to_table + $analyzed_sql_results // analyzed_sql_results ); unset($where_clause, $condition_array); @@ -5357,16 +5362,13 @@ class PMA_DisplayResults ) . '">'; - if (!empty($analyzed_sql_results['statement'])) { - $statement = $analyzed_sql_results['statement']; - if (!empty($statement->expr)) { - foreach ($statement->expr as $expr) { - if ((empty($expr->alias)) || (empty($expr->column))) { - continue; - } - if (strcasecmp($meta->name, $expr->alias) == 0) { - $meta->name = $expr->column; - } + if (!empty($analyzed_sql_results['statement']->expr)) { + foreach ($analyzed_sql_results['statement']->expr as $expr) { + if ((empty($expr->alias)) || (empty($expr->column))) { + continue; + } + if (strcasecmp($meta->name, $expr->alias) == 0) { + $meta->name = $expr->column; } } } @@ -5415,16 +5417,10 @@ class PMA_DisplayResults 'table' => $map[$meta->name][0], 'pos' => '0', 'sql_query' => 'SELECT * FROM ' - . PMA_Util::backquote( - $map[$meta->name][3] - ) . '.' - . PMA_Util::backquote( - $map[$meta->name][0] - ) + . PMA_Util::backquote($map[$meta->name][3]) . '.' + . PMA_Util::backquote($map[$meta->name][0]) . ' WHERE ' - . PMA_Util::backquote( - $map[$meta->name][1] - ) + . PMA_Util::backquote($map[$meta->name][1]) . $where_comparison, ); diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 04315c7217..4076bfc5f5 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -2139,22 +2139,24 @@ class PMA_Util /** * Function to generate unique condition for specified row. * - * @param resource $handle current query result - * @param integer $fields_cnt number of fields - * @param array $fields_meta meta information about fields - * @param array $row current row - * @param boolean $force_unique generate condition only on pk or - * unique - * @param string|boolean $restrict_to_table restrict the unique condition to - * this table or false if none + * @param resource $handle current query result + * @param integer $fields_cnt number of fields + * @param array $fields_meta meta information about fields + * @param array $row current row + * @param boolean $force_unique generate condition only on pk + * or unique + * @param string|boolean $restrict_to_table restrict the unique condition + * to this table or false if + * none + * @param array $analyzed_sql_results the analyzed query * * @access public * - * @return array the calculated condition and whether condition is unique + * @return array the calculated condition and whether condition is unique */ public static function getUniqueCondition( $handle, $fields_cnt, $fields_meta, $row, $force_unique = false, - $restrict_to_table = false + $restrict_to_table = false, $analyzed_sql_results = null ) { $primary_key = ''; $unique_key = ''; @@ -2175,19 +2177,16 @@ class PMA_Util if (! isset($meta->orgname) || ! /*overload*/mb_strlen($meta->orgname)) { $meta->orgname = $meta->name; - if (isset($GLOBALS['analyzed_sql'][0]['select_expr']) - && is_array($GLOBALS['analyzed_sql'][0]['select_expr']) - ) { - foreach ( - $GLOBALS['analyzed_sql'][0]['select_expr'] as $select_expr - ) { - // need (string) === (string) - // '' !== 0 but '' == 0 - if ((string)$select_expr['alias'] === (string)$meta->name) { - $meta->orgname = $select_expr['column']; + if (!empty($analyzed_sql_results['statement']->expr)) { + foreach ($analyzed_sql_results['statement']->expr as $expr) { + if ((empty($expr->alias)) || (empty($expr->column))) { + continue; + } + if (strcasecmp($meta->name, $expr->alias) == 0) { + $meta->orgname = $expr->column; break; - } // end if - } // end foreach + } + } } } @@ -3943,7 +3942,6 @@ class PMA_Util * @param bool $insert_mode Whether the operation is 'insert' * * @global array $cfg PMA configuration - * @global array $analyzed_sql Analyzed SQL query * @global mixed $data data of currently edited row * (used to detect whether to choose defaults) * diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index e1d59f3728..89241b512c 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -953,7 +953,6 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) 'extracted_columnspec' => array(), 'columnMeta' => $row['col_attribute'], 'submit_attribute' => false, - 'analyzed_sql' => null )) . ''; $tableHtml .= @@ -1084,7 +1083,6 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) ), 'columnMeta' => array(), 'submit_attribute' => false, - 'analyzed_sql' => null )) . ''; $tableHtml .= @@ -1311,7 +1309,6 @@ function PMA_getHTMLforAddNewColumn($db) 'extracted_columnspec' => array(), 'columnMeta' => array(), 'submit_attribute' => false, - 'analyzed_sql' => null )) . '' . '' diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 9b30e3dad5..2681db249e 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -134,7 +134,13 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id, list($unique_condition, $tmp_clause_is_unique) = PMA_Util::getUniqueCondition( - $result[$key_id], count($meta), $meta, $rows[$key_id], true + $result[$key_id], // handle + count($meta), // fields_cnt + $meta, // fields_meta + $rows[$key_id], // row + true, // force_unique + false, // restrict_to_table + null // analyzed_sql_results ); if (! empty($unique_condition)) { @@ -1803,7 +1809,13 @@ function PMA_setSessionForEditNext($one_where_clause) // not a combination of all fields list($unique_condition, $clause_is_unique) = PMA_Util::getUniqueCondition( - $res, count($meta), $meta, $row, true + $res, // handle + count($meta), // fields_cnt + $meta, // fields_meta + $row, // row + true, // force_unique + false, // restrict_to_table + null // analyzed_sql_results ); if (! empty($unique_condition)) { $_SESSION['edit_next'] = $unique_condition; diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index d372a3fa17..52a7a89705 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -95,7 +95,6 @@ function PMA_getHtmlForCreateNewColumn( 'length' => '', 'extracted_columnspec' => array(), 'submit_attribute' => null, - 'analyzed_sql' => null, 'comments_map' => $comments_map, 'fields_meta' => null, 'is_backup' => true, diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 59f5c893c8..510140cf2d 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -2339,10 +2339,13 @@ class ExportSql extends ExportPlugin list($tmp_unique_condition, $tmp_clause_is_unique) = PMA_Util::getUniqueCondition( - $result, - $fields_cnt, - $fields_meta, - $row + $result, // handle + $fields_cnt, // fields_cnt + $fields_meta, // fields_meta + $row, // row + false, // force_unique + false, // restrict_to_table + null // analyzed_sql_results ); $insert_line .= ' WHERE ' . $tmp_unique_condition; unset($tmp_unique_condition, $tmp_clause_is_unique); diff --git a/libraries/sql-parser/src/Builder.php b/libraries/sql-parser/src/Builder.php index b4559e9aa0..5cb9d66fdb 100644 --- a/libraries/sql-parser/src/Builder.php +++ b/libraries/sql-parser/src/Builder.php @@ -57,6 +57,7 @@ class Builder public function build() { $statement = $this->statement; + foreach ($statement::$CLAUSES as $clause) { $name = $clause[0]; $type = $clause[1]; @@ -80,5 +81,7 @@ class Builder $this->query .= $class::build($statement->$field) . ' '; } } + + return $this->qeury; } } diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index a6c5777e08..edd0a2bbba 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -177,7 +177,7 @@ class FieldFragment extends Fragment if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { // Keywords may be found only between brackets. if ($brackets === 0) { - if ($token->value === 'AS') { + if ((empty($options['noAlias'])) && ($token->value === 'AS')) { $alias = 2; continue; } @@ -194,6 +194,11 @@ class FieldFragment extends Fragment } if ($token->type === Token::TYPE_OPERATOR) { + if ((!empty($options['noBrackets'])) && + (($token->value === '(') || ($token->value === ')')) + ) { + break; + } if ($token->value === '(') { ++$brackets; // We don't check to see if `$prev` is `true` (open bracke diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 29e67017f5..11874fac61 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -339,15 +339,15 @@ class Parser */ $stmt = new $class(); + // Parsing the actual statement. + $stmt->parse($this, $this->list); + // The first token that is a part of this token is the next token // unprocessed by the previous statement. // There might be brackets around statements and this shouldn't // affect the parser $stmt->first = $prevLastIdx + 1; - // Parsing the actual statement. - $stmt->parse($this, $this->list); - // Storing the index of the last token parsed and updating the old // index. $stmt->last = $list->idx; diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 0cb362cdc0..41fba6e117 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -63,6 +63,19 @@ abstract class Statement */ public $last; + /** + * Constructor. + * + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + */ + public function __construct(Parser $parser = null, TokensList $list = null) + { + if (($parser !== null) && ($list !== null)) { + $this->parse($parser, $list); + } + } + /** * Parses the statements defined by the tokens list. * @@ -73,6 +86,9 @@ abstract class Statement */ public function parse(Parser $parser, TokensList $list) { + // This may be corrected by the parser. + $this->first = $list->idx; + /** * Whether options were parsed or not. * For statements that do not have any options this is set to `true` by @@ -162,7 +178,8 @@ abstract class Statement $this->after($parser, $list, $token); } - --$list->idx; // Go back to last used token. + // This may be corrected by the parser. + $this->last = --$list->idx; // Go back to last used token. } /** diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index f13866a965..7fd8ef0501 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -12,9 +12,10 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; -use SqlParser\Fragments\CreateDefFragment; +use SqlParser\Fragments\ArrayFragment; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\FieldDefFragment; +use SqlParser\Fragments\FieldFragment; use SqlParser\Fragments\OptionsFragment; use SqlParser\Fragments\ParamDefFragment; @@ -49,38 +50,113 @@ class CreateStatement extends Statement 'USER' => 1, 'VIEW' => 1, + // CREATE TABLE 'TEMPORARY' => 2, 'IF NOT EXISTS' => 3, - 'DEFINER' => array(4, 'var'), + + // CREATE FUNCTION / PROCEDURE and CREATE VIEW + 'DEFINER' => array(2, 'var'), + + // CREATE VIEW + 'OR REPLACE' => array(3, 'var'), + 'ALGORITHM' => array(4, 'var'), + 'DEFINER' => array(5, 'var'), + 'SQL SECURITY' => array(6, 'var'), ); /** - * The name of the enw table. + * All table options. * - * @var CreateDefFragment + * @var array + */ + public static $TABLE_OPTIONS = array( + 'ENGINE' => array(1, 'var'), + 'AUTO_INCREMENT' => array(2, 'var'), + 'AVG_ROW_LENGTH' => array(3, 'var'), + 'DEFAULT CHARACTER SET' => array(4, 'var'), + 'CHARACTER SET' => array(4, 'var'), + 'CHECKSUM' => array(5, 'var'), + 'DEFAULT COLLATE' => array(5, 'var'), + 'COLLATE' => array(6, 'var'), + 'COMMENT' => array(7, 'var'), + 'CONNECTION' => array(8, 'var'), + 'DATA DIRECTORY' => array(9, 'var'), + 'DELAY_KEY_WRITE' => array(10, 'var'), + 'INDEX DIRECTORY' => array(11, 'var'), + 'INSERT_METHOD' => array(12, 'var'), + 'KEY_BLOCK_SIZE' => array(13, 'var'), + 'MAX_ROWS' => array(14, 'var'), + 'MIN_ROWS' => array(15, 'var'), + 'PACK_KEYS' => array(16, 'var'), + 'PASSWORD' => array(17, 'var'), + 'ROW_FORMAT' => array(18, 'var'), + 'TABLESPACE' => array(19, 'var'), + 'STORAGE' => array(20, 'var'), + 'UNION' => array(21, 'var'), + ); + + /** + * All function options. + * + * @var array + */ + public static $FUNC_OPTIONS = array( + 'COMMENT' => array(1, 'var'), + 'LANGUAGE SQL' => 2, + 'DETERMINISTIC' => 3, + 'NOT DETERMINISTIC' => 3, + 'CONSTAINS SQL' => 4, + 'NO SQL' => 4, + 'READS SQL DATA' => 4, + 'MODIFIES SQL DATA' => 4, + 'SQL SEQURITY DEFINER' => array(5, 'var'), + ); + + /** + * The name of the entity that is created. + * + * Used by all `CREATE` statements. + * + * @var FieldFragment */ public $name; /** * The options of the entity (table, procedure, function, etc.). * + * Used by `CREATE TABLE`, `CREATE FUNCTION` and `CREATE PROCEDURE`. + * * @var OptionsFragment * - * @see CreateDefFragment::$TABLE_OPTIONS - * @see CreateDefFragment::$FUNC_OPTIONS + * @see static::$TABLE_OPTIONS + * @see static::$FUNC_OPTIONS */ public $entityOptions; /** - * Field created by this statement. + * If `CREATE TABLE`, a list of fields in the new table. + * If `CREATE VIEW`, a list of columns. * - * @var FieldDefFragment[] + * Used by `CREATE TABLE` and `CREATE VIEW`. + * + * @var FieldDefFragment[]|ArrayFragment */ public $fields; + /** + * The `SELECT` statement that defines this view. + * + * Used by `CREATE VIEW`. + * + * @var SelectStatement + */ + public $select; + /** * The return data type of this routine. * + * Used by `CREATE FUNCTION`. + * * @var DataTypeFragment */ public $return; @@ -88,45 +164,59 @@ class CreateStatement extends Statement /** * The parameters of this routine. * + * Used by `CREATE FUNCTION` and `CREATE PROCEDURE`. + * * @var ParamDefFragment[] */ public $parameters; + /** * The body of this function or procedure. * + * Used by `CREATE FUNCTION` and `CREATE PROCEDURE`. + * * @var Token[] */ public $body; /** - * Function called before the token is processed. - * - * Parsing the `CREATE` statement. - * * @param Parser $parser The instance that requests parsing. * @param TokensList $list The list of tokens to be parsed. - * @param Token $token The token that is being parsed. * * @return void */ - public function before(Parser $parser, TokensList $list, Token $token) + public function parse(Parser $parser, TokensList $list) { - ++$list->idx; - $this->name = CreateDefFragment::parse($parser, $list); + ++$list->idx; // Skipping `CREATE`. + + // Parsing options. + $this->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + ++$list->idx; // Skipping last option. + + // Parsing the field name. + $this->name = FieldFragment::parse( + $parser, + $list, + array( + 'skipColumn' => true, + 'noBrackets' => true, + 'noAlias' => true, + ) + ); + ++$list->idx; // Skipping field. + if ($this->options->has('TABLE')) { - ++$list->idx; $this->fields = FieldDefFragment::parse($parser, $list); ++$list->idx; $this->entityOptions = OptionsFragment::parse( $parser, $list, - CreateDefFragment::$TABLE_OPTIONS + static::$TABLE_OPTIONS ); } elseif (($this->options->has('PROCEDURE')) || ($this->options->has('FUNCTION')) ) { - ++$list->idx; $this->parameters = ParamDefFragment::parse($parser, $list); if ($this->options->has('FUNCTION')) { $token = $list->getNextOfType(Token::TYPE_KEYWORD); @@ -147,7 +237,7 @@ class CreateStatement extends Statement $this->entityOptions = OptionsFragment::parse( $parser, $list, - CreateDefFragment::$FUNC_OPTIONS + static::$FUNC_OPTIONS ); ++$list->idx; $this->body = array(); @@ -160,6 +250,19 @@ class CreateStatement extends Statement break; } } + } else if ($this->options->has('VIEW')) { + $token = $list->getNext(); + + // Parsing columns list. + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { + --$list->idx; // getNext() also goes forward one field. + $this->fields = ArrayFragment::parse($parser, $list); + ++$list->idx; // Skipping last token from the array. + $token = $list->getNext(); + } + + // Parsing the 'SELECT' statement. + $this->select = new SelectStatement($parser, $list); } } } diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index 6365be6e3b..52a464e624 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -52,14 +52,18 @@ class TokensList implements \ArrayAccess } /** - * Gets the next token. + * Gets the next token. Skips any irrelevant token (whitespaces and + * comments). * * @return Token */ public function getNext() { - if ($this->idx < $this->count) { - return $this->tokens[$this->idx++]; + for (; $this->idx < $this->count; ++$this->idx) { + if (($this->tokens[$this->idx]->type !== Token::TYPE_WHITESPACE) + && ($this->tokens[$this->idx]->type !== Token::TYPE_COMMENT)) { + return $this->tokens[$this->idx++]; + } } return null; } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 0e44cc9c6c..6c767160ad 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -667,7 +667,7 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end) && count($analyzed_sql_results['select_tables'] <= 1) && (empty($analyzed_sql_results['statement']->where) || (count($analyzed_sql_results['statement']->where) == 1 - && $analyzed_sql_results['statement']->where[0]->condition ==='1')) + && $analyzed_sql_results['statement']->where[0]->expr ==='1')) && empty($analyzed_sql_results['group']) && ! isset($find_real_end) && ! $analyzed_sql_results['is_subquery'] diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 40f81a0ace..0e110f950f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -143,8 +143,13 @@ if (isset($_POST['zoom_submit']) } //Get unique condition on each row (will be needed for row update) $uniqueCondition = PMA_Util::getUniqueCondition( - $result, count($table_search->getColumnNames()), $fields_meta, $tmpRow, - true + $result, // handle + count($table_search->getColumnNames()), // fields_cnt + $fields_meta, // fields_meta + $tmpRow, // row + true, // force_unique + false, // restrict_to_table + null // analyzed_sql_results ); //Append it to row array as where_clause $row['where_clause'] = $uniqueCondition[0]; From c8993af15a6d15eca95a72823888bef4c46297a9 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 3 Jul 2015 00:20:44 +0300 Subject: [PATCH 36/57] Wrong query flags array was tested. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 4 ++-- libraries/sql.lib.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index da9e98fbe2..175dcf0f12 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -674,10 +674,10 @@ class PMA_DisplayResults || $this->__get('is_export') || $this->__get('is_func') || $this->__get('is_analyse')) - && !empty($analyzed_sql_results['queryflags']['select_from']) + && !empty($analyzed_sql_results['select_from']) && !empty($analyzed_sql_results['statement']->from) && (count($analyzed_sql_results['statement']->from) == 1) - && !empty($analyzed_sql_results['statement']->from[0]->table) == 1; + && !empty($analyzed_sql_results['statement']->from[0]->table); } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 6c767160ad..71704d6da6 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1195,7 +1195,7 @@ function PMA_countQueryResults( // stop the query as soon as the result that is required has been // computed. - if (empty($analyzed_sql_results['queryflags']['union'])) { + if (empty($analyzed_sql_results['union'])) { $count_query .= ' LIMIT 1'; } From 889b49ee135c03a96f38d74a48e62d07104d87a0 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 3 Jul 2015 21:28:45 +0300 Subject: [PATCH 37/57] Refactored Table.class.php. Updated sql-parser library to udan11/sql-parser@b3eff80. Fixed failing test. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 11 +- libraries/Table.class.php | 348 +++++++++--------- libraries/sql-parser/src/Builder.php | 87 ----- libraries/sql-parser/src/Context.php | 46 +++ .../src/Contexts/ContextMySql50000.php | 32 +- .../src/Contexts/ContextMySql50100.php | 32 +- .../src/Contexts/ContextMySql50500.php | 32 +- .../src/Contexts/ContextMySql50600.php | 32 +- .../src/Contexts/ContextMySql50700.php | 32 +- .../src/Fragments/AlterFragment.php | 201 ++++++++++ .../src/Fragments/CreateDefFragment.php | 125 ------- .../src/Fragments/DataTypeFragment.php | 38 +- .../src/Fragments/FieldDefFragment.php | 61 +++ .../src/Fragments/FieldFragment.php | 20 +- .../sql-parser/src/Fragments/KeyFragment.php | 25 ++ .../src/Fragments/OptionsFragment.php | 18 +- .../src/Fragments/ReferencesKeyword.php | 29 ++ libraries/sql-parser/src/Lexer.php | 18 + libraries/sql-parser/src/Parser.php | 5 +- libraries/sql-parser/src/Statement.php | 67 +++- .../src/Statements/AlterStatement.php | 143 +++---- .../src/Statements/CreateStatement.php | 92 +++-- .../src/Statements/DropStatement.php | 15 + .../Statements/NotImplementedStatement.php | 37 +- .../src/Statements/SelectStatement.php | 2 +- libraries/sql-parser/src/TokensList.php | 39 +- libraries/sql-parser/src/Utils/Query.php | 2 +- libraries/sql-parser/src/Utils/Table.php | 10 +- libraries/sql.lib.php | 10 +- test/classes/PMA_DisplayResults_test.php | 4 +- 30 files changed, 996 insertions(+), 617 deletions(-) delete mode 100644 libraries/sql-parser/src/Builder.php create mode 100644 libraries/sql-parser/src/Fragments/AlterFragment.php delete mode 100644 libraries/sql-parser/src/Fragments/CreateDefFragment.php diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 175dcf0f12..ac00642b8c 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3344,12 +3344,17 @@ class PMA_DisplayResults } $query = 'SELECT ' . SqlParser\Utils\Query::getClause( - $parser->statements[0], $parser->list, 'SELECT' + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'SELECT' ); $from_clause = SqlParser\Utils\Query::getClause( - $parser->statements[0], $parser->list, 'FROM' + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'FROM' ); + if (!empty($from_clause)) { $query .= ' FROM ' . $from_clause; } @@ -4345,7 +4350,7 @@ class PMA_DisplayResults } - if (($displayParts['nav_bar'] == '1') && (empty($statemet->limit))) { + if (($displayParts['nav_bar'] == '1') && (empty($statement->limit))) { $table_html .= $this->_getPlacedTableNavigations( $pos_next, $pos_prev, self::PLACE_TOP_DIRECTION_DROPDOWN, $is_innodb diff --git a/libraries/Table.class.php b/libraries/Table.class.php index f6eff4c8bb..ae76bca900 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -714,9 +714,10 @@ class PMA_Table static public function moveCopy($source_db, $source_table, $target_db, $target_table, $what, $move, $mode ) { + global $err_url; - /* Try moving table directly */ + // Try moving the tables directly, using native `RENAME` statement. if ($move && $what == 'data') { $tbl = new PMA_Table($source_table, $source_db); $result = $tbl->rename($target_table, $target_db); @@ -726,11 +727,11 @@ class PMA_Table } } - // set export settings we need + // Setting required export settings. $GLOBALS['sql_backquotes'] = 1; $GLOBALS['asfile'] = 1; - // Ensure the target is valid + // Ensuring the target database is valid. if (! $GLOBALS['pma']->databases->exists($source_db, $target_db)) { if (! $GLOBALS['pma']->databases->exists($source_db)) { $GLOBALS['message'] = PMA_Message::rawError( @@ -751,24 +752,40 @@ class PMA_Table return false; } + /** + * The full name of source table, quoted. + * @var string + */ $source = PMA_Util::backquote($source_db) . '.' . PMA_Util::backquote($source_table); + + // If the target database is not specified, the operation is taking + // place in the same database. if (! isset($target_db) || ! /*overload*/mb_strlen($target_db)) { $target_db = $source_db; } - // Doing a select_db could avoid some problems with replicated databases, - // when moving table from replicated one to not replicated one + // Selecting the database could avoid some problems with replicated + // databases, when moving table from replicated one to not replicated one. $GLOBALS['dbi']->selectDb($target_db); + /** + * The full name of target table, quoted. + * @var string + */ $target = PMA_Util::backquote($target_db) . '.' . PMA_Util::backquote($target_table); - // do not create the table if dataonly + // No table is created when this is a data-only operation. if ($what != 'dataonly') { + include_once "libraries/plugin_interface.lib.php"; - // get Export SQL instance - /* @var $export_sql_plugin ExportSql */ + + /** + * Instance used for exporting the current structure of the table. + * + * @var ExportSql + */ $export_sql_plugin = PMA_getPlugin( "export", "sql", @@ -786,141 +803,131 @@ class PMA_Table $GLOBALS['sql_auto_increment'] = $_POST['sql_auto_increment']; } + /** + * The old structure of the table.. + * @var string + */ $sql_structure = $export_sql_plugin->getTableDef( $source_db, $source_table, "\n", $err_url, false, false ); + unset($no_constraints_comments); - $parsed_sql = PMA_SQP_parse($sql_structure); - $analyzed_sql = PMA_SQP_analyze($parsed_sql); - $i = 0; - if (empty($analyzed_sql[0]['create_table_fields'])) { - // this is not a CREATE TABLE, so find the first VIEW - $target_for_view = PMA_Util::backquote($target_db); - while (true) { - if ($parsed_sql[$i]['type'] == 'alpha_reservedWord' - && $parsed_sql[$i]['data'] == 'VIEW' - ) { - break; - } - $i++; - } - } - unset($analyzed_sql); - if (PMA_DRIZZLE) { - $table_delimiter = 'quote_backtick'; - } else { - $server_sql_mode = $GLOBALS['dbi']->fetchValue( - "SHOW VARIABLES LIKE 'sql_mode'", - 0, - 1 + + // ----------------------------------------------------------------- + // Phase 0: Preparing structures used. + + /** + * The destination where the table is moved or copied to. + * @var SqlParser\Fragments\FieldFragment + */ + $destination = new SqlParser\Fragments\FieldFragment( + $target_db, $target_table, '' + ); + + // Find server's SQL mode so the builder can generate correct + // queries. + // One of the options that alters the behaviour is `ANSI_QUOTES`. + // This is not availabile for Drizzle. + if (!PMA_DRIZZLE) { + SqlParser\Context::setMode( + $GLOBALS['dbi']->fetchValue( + "SHOW VARIABLES LIKE 'sql_mode'", 0, 1 + ) ); - // ANSI_QUOTES might be a subset of sql_mode, for example - // REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI - if (false !== /*overload*/mb_strpos($server_sql_mode, 'ANSI_QUOTES') - ) { - $table_delimiter = 'quote_double'; - } else { - $table_delimiter = 'quote_backtick'; - } - unset($server_sql_mode); } - /* Find table name in query and replace it */ - while ($parsed_sql[$i]['type'] != $table_delimiter) { - $i++; - } + // ----------------------------------------------------------------- + // Phase 1: Dropping existent element of the same name (if exists + // and required). - /* no need to backquote() */ - if (isset($target_for_view)) { - // this a view definition; we just found the first db name - // that follows DEFINER VIEW - // so change it for the new db name - $parsed_sql[$i]['data'] = $target_for_view; - // then we have to find all references to the source db - // and change them to the target db, ensuring we stay into - // the $parsed_sql limits - $last = $parsed_sql['len'] - 1; - $backquoted_source_db = PMA_Util::backquote($source_db); - for (++$i; $i <= $last; $i++) { - if ($parsed_sql[$i]['type'] == $table_delimiter - && $parsed_sql[$i]['data'] == $backquoted_source_db - && $parsed_sql[$i - 1]['type'] != 'punct_qualifier' - ) { - $parsed_sql[$i]['data'] = $target_for_view; - } - } - unset($last,$backquoted_source_db); - } else { - $parsed_sql[$i]['data'] = $target; - } - - /* Generate query back */ - $sql_structure = PMA_SQP_format($parsed_sql, 'query_only'); - // If table exists, and 'add drop table' is selected: Drop it! if (isset($_REQUEST['drop_if_exists']) && $_REQUEST['drop_if_exists'] == 'true' ) { - if (PMA_Table::isView($target_db, $target_table)) { - $drop_query = 'DROP VIEW'; - } else { - $drop_query = 'DROP TABLE'; - } - $drop_query .= ' IF EXISTS ' - . PMA_Util::backquote($target_db) . '.' - . PMA_Util::backquote($target_table); + + /** + * Drop statement used for building the query. + * @var SqlParser\Statements\DropStatement + */ + $statement = new SqlParser\Statements\DropStatement(); + + $statement->options = new SqlParser\Fragments\OptionsFragment( + array( + PMA_Table::isView($target_db, $target_table) ? + 'VIEW' : 'TABLE', + 'IF EXISTS', + ) + ); + + $statement->fields = array($destination); + + // Building the query. + $drop_query = $statement->build() . ';'; + + // Executing it. $GLOBALS['dbi']->query($drop_query); + $GLOBALS['sql_query'] .= "\n" . $drop_query; - $GLOBALS['sql_query'] .= "\n" . $drop_query . ';'; - - // If an existing table gets deleted, maintain any - // entries for the PMA_* tables + // If an existing table gets deleted, maintain any entries for + // the PMA_* tables. $maintain_relations = true; } - @$GLOBALS['dbi']->query($sql_structure); - $GLOBALS['sql_query'] .= "\n" . $sql_structure . ';'; + // ----------------------------------------------------------------- + // Phase 2: Generating the new query of this structure. + + /** + * The parser responsible for parsing the old queries. + * @var SqlParser\Parser + */ + $parser = new SqlParser\Parser($sql_structure); + + /** + * The CREATE statement of this structure. + * @var SqlParser\Statements\CreateStatement + */ + $statement = $parser->statements[0]; + + // Changing the destination. + $statement->name = $destination; + + // Building back the query. + $sql_structure = $statement->build() . ';'; + + // Executing it. + $GLOBALS['dbi']->query($sql_structure); + $GLOBALS['sql_query'] .= "\n" . $sql_structure; + + // ----------------------------------------------------------------- + // Phase 3: Adding constraints. + // All constraint names are removed because they must be unique. if (($move || isset($GLOBALS['add_constraints'])) && !empty($GLOBALS['sql_constraints_query']) ) { - $parsed_sql = PMA_SQP_parse($GLOBALS['sql_constraints_query']); - $i = 0; - // find the first $table_delimiter, it must be the source - // table name - while ($parsed_sql[$i]['type'] != $table_delimiter) { - $i++; - // maybe someday we should guard against going over limit - //if ($i == $parsed_sql['len']) { - // break; - //} - } + $parser = new SqlParser\Parser($GLOBALS['sql_constraints_query']); - // replace it by the target table name, no need - // to backquote() - $parsed_sql[$i]['data'] = $target; + /** + * The ALTER statement that generates the constraints. + * @var SqlParser\Statements\AlterStatement + */ + $statement = $parser->statements[0]; - // now we must remove all $table_delimiter that follow a - // CONSTRAINT keyword, because a constraint name must be - // unique in a db + // Changing the altered table to the destination. + $statement->table = $destination; - $cnt = $parsed_sql['len'] - 1; - - for ($j = $i; $j < $cnt; $j++) { - $dataUpper = /*overload*/mb_strtoupper($parsed_sql[$j]['data']); - if ($parsed_sql[$j]['type'] == 'alpha_reservedWord' - && $dataUpper == 'CONSTRAINT' - ) { - if ($parsed_sql[$j+1]['type'] == $table_delimiter) { - $parsed_sql[$j+1]['data'] = ''; - } + // Removing the name of the constraints. + foreach ($statement->altered as $idx => $altered) { + // All constraint names are removed because they must be unique. + if ($altered->options->has('CONSTRAINT')) { + $altered->field = null; } } - // Generate query back - $GLOBALS['sql_constraints_query'] = PMA_SQP_format( - $parsed_sql, 'query_only' - ); + // Building back the query. + $GLOBALS['sql_constraints_query'] = $statement->build() . ';'; + + // Executing it. if ($mode == 'one_table') { $GLOBALS['dbi']->query($GLOBALS['sql_constraints_query']); } @@ -930,95 +937,70 @@ class PMA_Table } } - // add indexes to the table + // ----------------------------------------------------------------- + // Phase 4: Adding indexes. + // View phase 3. + if (!empty($GLOBALS['sql_indexes'])) { - $index_queries = array(); - $sql_indexes = $GLOBALS['sql_indexes']; - $GLOBALS['sql_indexes'] = ''; + $parser = new SqlParser\Parser($GLOBALS['sql_indexes']); - $parsed_sql = PMA_SQP_parse($sql_indexes); - $cnt = $parsed_sql['len'] - 1; - $k = 0; + /** + * The ALTER statement that generates the indexes. + * @var SqlParser\Statements\AlterStatement + */ + $statement = $parser->statements[0]; - for ($j = 0; $j < $cnt; $j++) { - if ($parsed_sql[$j]['type'] == 'punct_queryend') { - $index_queries[] = substr( - $sql_indexes, $k, $parsed_sql[$j]['pos'] - $k - ); - $k = $parsed_sql[$j]['pos']; + // Changing the altered table to the destination. + $statement->table = $destination; + + // Removing the name of the constraints. + foreach ($statement->altered as $idx => $altered) { + // All constraint names are removed because they must be unique. + if ($altered->options->has('CONSTRAINT')) { + $altered->field = null; } } - foreach ($index_queries as $index_query) { + // Building back the query. + $GLOBALS['sql_indexes'] = $statement->build() . ';'; - $parsed_sql = PMA_SQP_parse($index_query); - $i = 0; - - while ($parsed_sql[$i]['type'] != $table_delimiter) { - $i++; - } - - $parsed_sql[$i]['data'] = $target; - - $cnt = $parsed_sql['len'] - 1; - - for ($j = $i; $j < $cnt; $j++) { - $dataUpper = /*overload*/mb_strtoupper($parsed_sql[$j]['data']); - if ($parsed_sql[$j]['type'] == 'alpha_reservedWord' - && $dataUpper == 'CONSTRAINT' - ) { - if ($parsed_sql[$j+1]['type'] == $table_delimiter) { - $parsed_sql[$j+1]['data'] = ''; - } - } - } - - $sql_index = PMA_SQP_format($parsed_sql, 'query_only'); - if ($mode == 'one_table' || $mode == 'db_copy') { - $GLOBALS['dbi']->query($sql_index); - } - - $GLOBALS['sql_indexes'] .= $sql_index; + // Executing it. + if ($mode == 'one_table' || $mode == 'db_copy') { + $GLOBALS['dbi']->query($GLOBALS['sql_indexes']); } - $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_indexes']; if ($mode == 'one_table' || $mode == 'db_copy') { unset($GLOBALS['sql_indexes']); - } } - /* - * add AUTO_INCREMENT to the table - * - * @todo refactor with similar code above - */ + // ----------------------------------------------------------------- + // Phase 5: Adding AUTO_INCREMENT. + if (! empty($GLOBALS['sql_auto_increments'])) { if ($mode == 'one_table' || $mode == 'db_copy') { - $parsed_sql = PMA_SQP_parse($GLOBALS['sql_auto_increments']); - $i = 0; - // find the first $table_delimiter, it must be the source - // table name - while ($parsed_sql[$i]['type'] != $table_delimiter) { - $i++; - } + $parser = new SqlParser\Parser($GLOBALS['sql_auto_increments']); - // replace it by the target table name, no need - // to backquote() - $parsed_sql[$i]['data'] = $target; + /** + * The ALTER statement that alters the AUTO_INCREMENT value. + * @var SqlParser\Statements\AlterStatement + */ + $statement = $parser->statements[0]; - // Generate query back - $GLOBALS['sql_auto_increments'] = PMA_SQP_format( - $parsed_sql, 'query_only' - ); + // Changing the altered table to the destination. + $statement->table = $destination; + + // Building back the query. + $GLOBALS['sql_auto_increments'] = $statement->build() . ';'; + + // Executing it. $GLOBALS['dbi']->query($GLOBALS['sql_auto_increments']); $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_auto_increments']; unset($GLOBALS['sql_auto_increments']); } } - } else { $GLOBALS['sql_query'] = ''; } @@ -1036,7 +1018,7 @@ class PMA_Table $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; $GLOBALS['dbi']->query($sql_insert_data); - $GLOBALS['sql_query'] .= "\n\n" . $sql_insert_data . ';'; + $GLOBALS['sql_query'] .= "\n\n" . $sql_insert_data . ';'; } $GLOBALS['cfgRelation'] = PMA_getRelationsParam(); @@ -1062,7 +1044,7 @@ class PMA_Table $source_table, $target_table ); - $GLOBALS['sql_query'] .= "\n\n" . $sql_drop_query . ';'; + $GLOBALS['sql_query'] .= "\n\n" . $sql_drop_query . ';'; // end if ($move) } else { // we are copying @@ -1240,6 +1222,8 @@ class PMA_Table */ } } + +file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GLOBALS['sql_query'] . "\n", FILE_APPEND); return true; } diff --git a/libraries/sql-parser/src/Builder.php b/libraries/sql-parser/src/Builder.php deleted file mode 100644 index 5cb9d66fdb..0000000000 --- a/libraries/sql-parser/src/Builder.php +++ /dev/null @@ -1,87 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class Builder -{ - - /** - * Statement to be build. - * - * @var Statement - */ - public $statement; - - /** - * Built query. - * - * @var string - */ - public $query; - - /** - * Constructor. - * - * @param Statement $statement - */ - public function __construct($statement = null) - { - $this->statement = $statement; - - if ($this->statement != null) { - $this->build(); - } - } - - /** - * Builds the statement. - * - * @return void - */ - public function build() - { - $statement = $this->statement; - - foreach ($statement::$CLAUSES as $clause) { - $name = $clause[0]; - $type = $clause[1]; - - if (empty(Parser::$KEYWORD_PARSERS[$name])) { - continue; - } - - $class = Parser::$KEYWORD_PARSERS[$name]['class']; - $field = Parser::$KEYWORD_PARSERS[$name]['field']; - - if (empty($statement->$field)) { - continue; - } - - if ($type & 2) { - $this->query .= $name . ' '; - } - - if ($type & 1) { - $this->query .= $class::build($statement->$field) . ' '; - } - } - - return $this->qeury; - } -} diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index 699d800b87..d42211f639 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -110,6 +110,14 @@ abstract class Context '(' => 16, ')' => 16, '.' => 16, ',' => 16, ); + /** + * The mode of the MySQL server that will be used in lexing, parsing and + * building the statements. + * + * @var int + */ + public static $MODE = 0; + /* * Server SQL Modes * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html @@ -413,6 +421,44 @@ abstract class Context self::$loadedContext = $context; self::$KEYWORDS = $context::$KEYWORDS; } + + /** + * Sets the SQL mode. + * + * @param string $mode The list of modes. If empty, the mode is reset. + */ + public static function setMode($mode = '') + { + static::$MODE = 0; + if (empty($mode)) { + return; + } + $mode = explode(',', $mode); + foreach ($mode as $m) { + static::$MODE |= constant('static::' . $m); + } + } + + /** + * Escapes the symbol by adding surrounding backticks. + * + * @param array|string $str The string to be escaped. + * + * @return string + */ + public static function escape($str) + { + if (is_array($str)) { + foreach ($str as $key => $value) { + $str[$key] = static::escape($value); + } + return $str; + } + if (static::$MODE & Context::ANSI_QUOTES) { + return '"' . str_replace('"', '""', $str) . '"'; + } + return '`' . str_replace('`', '``', $str) . '`'; + } } // Initializng the default context. diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index 26afac1649..dc2759a30b 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -143,14 +143,14 @@ class ContextMySql50000 extends Context 'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3, 'SQL_CALC_FOUND_ROWS' => 3, - 'NOT NULL' => 5, 'SET NULL' => 5, - 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, - 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, - 'DATA DIRECTORY' => 5, - 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, - 'DEFAULT CHARACTER SET' => 5, - - 'GROUP BY' => 7, 'ORDER BY' => 7, + 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, + 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'OR REPLACE' => 7, + 'SQL SECURITY' => 7, + 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, + 'DATA DIRECTORY' => 7, + 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, 'ENUM' => 9, 'TEXT' => 9, @@ -168,18 +168,18 @@ class ContextMySql50000 extends Context 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, - 'BINARY VARYING' => 13, + 'BINARY VARYING' => 15, 'KEY' => 19, 'INDEX' => 19, 'UNIQUE' => 19, - 'INDEX KEY' => 21, - 'UNIQUE KEY' => 21, - 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, - 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, - 'SPATIAL INDEX' => 21, - 'FULLTEXT INDEX' => 21, + 'INDEX KEY' => 23, + 'UNIQUE KEY' => 23, + 'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23, + 'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23, + 'SPATIAL INDEX' => 23, + 'FULLTEXT INDEX' => 23, 'X' => 33, 'Y' => 33, 'LN' => 33, 'PI' => 33, @@ -258,7 +258,7 @@ class ContextMySql50000 extends Context 'LOCALTIMESTAMP' => 35, 'CURRENT_TIMESTAMP' => 35, - 'NOT IN' => 37, + 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index 23c619b797..82db6843ed 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -154,14 +154,14 @@ class ContextMySql50100 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, 'SET NULL' => 5, - 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, - 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, - 'DATA DIRECTORY' => 5, - 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, - 'DEFAULT CHARACTER SET' => 5, - - 'GROUP BY' => 7, 'ORDER BY' => 7, + 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, + 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'OR REPLACE' => 7, + 'SQL SECURITY' => 7, + 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, + 'DATA DIRECTORY' => 7, + 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, 'ENUM' => 9, 'TEXT' => 9, @@ -179,18 +179,18 @@ class ContextMySql50100 extends Context 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, - 'BINARY VARYING' => 13, + 'BINARY VARYING' => 15, 'KEY' => 19, 'INDEX' => 19, 'UNIQUE' => 19, - 'INDEX KEY' => 21, - 'UNIQUE KEY' => 21, - 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, - 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, - 'SPATIAL INDEX' => 21, - 'FULLTEXT INDEX' => 21, + 'INDEX KEY' => 23, + 'UNIQUE KEY' => 23, + 'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23, + 'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23, + 'SPATIAL INDEX' => 23, + 'FULLTEXT INDEX' => 23, 'X' => 33, 'Y' => 33, 'LN' => 33, 'PI' => 33, @@ -280,7 +280,7 @@ class ContextMySql50100 extends Context 'LOCALTIMESTAMP' => 35, 'CURRENT_TIMESTAMP' => 35, - 'NOT IN' => 37, + 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index 03105abd1b..e338232eb0 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -159,14 +159,14 @@ class ContextMySql50500 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, 'SET NULL' => 5, - 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, - 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, - 'DATA DIRECTORY' => 5, - 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, - 'DEFAULT CHARACTER SET' => 5, - - 'GROUP BY' => 7, 'ORDER BY' => 7, + 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, + 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'OR REPLACE' => 7, + 'SQL SECURITY' => 7, + 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, + 'DATA DIRECTORY' => 7, + 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, 'ENUM' => 9, 'TEXT' => 9, @@ -184,18 +184,18 @@ class ContextMySql50500 extends Context 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, - 'BINARY VARYING' => 13, + 'BINARY VARYING' => 15, 'KEY' => 19, 'INDEX' => 19, 'UNIQUE' => 19, - 'INDEX KEY' => 21, - 'UNIQUE KEY' => 21, - 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, - 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, - 'SPATIAL INDEX' => 21, - 'FULLTEXT INDEX' => 21, + 'INDEX KEY' => 23, + 'UNIQUE KEY' => 23, + 'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23, + 'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23, + 'SPATIAL INDEX' => 23, + 'FULLTEXT INDEX' => 23, 'X' => 33, 'Y' => 33, 'LN' => 33, 'PI' => 33, @@ -284,7 +284,7 @@ class ContextMySql50500 extends Context 'LOCALTIMESTAMP' => 35, 'CURRENT_TIMESTAMP' => 35, - 'NOT IN' => 37, + 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index 91978cbd82..780ea5208b 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -165,14 +165,14 @@ class ContextMySql50600 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, 'SET NULL' => 5, - 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, - 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, - 'DATA DIRECTORY' => 5, - 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, - 'DEFAULT CHARACTER SET' => 5, - - 'GROUP BY' => 7, 'ORDER BY' => 7, + 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, + 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'OR REPLACE' => 7, + 'SQL SECURITY' => 7, + 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, + 'DATA DIRECTORY' => 7, + 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, 'ENUM' => 9, 'TEXT' => 9, @@ -190,18 +190,18 @@ class ContextMySql50600 extends Context 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, - 'BINARY VARYING' => 13, + 'BINARY VARYING' => 15, 'KEY' => 19, 'INDEX' => 19, 'UNIQUE' => 19, - 'INDEX KEY' => 21, - 'UNIQUE KEY' => 21, - 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, - 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, - 'SPATIAL INDEX' => 21, - 'FULLTEXT INDEX' => 21, + 'INDEX KEY' => 23, + 'UNIQUE KEY' => 23, + 'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23, + 'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23, + 'SPATIAL INDEX' => 23, + 'FULLTEXT INDEX' => 23, 'X' => 33, 'Y' => 33, 'LN' => 33, 'PI' => 33, @@ -315,7 +315,7 @@ class ContextMySql50600 extends Context 'LOCALTIMESTAMP' => 35, 'CURRENT_TIMESTAMP' => 35, - 'NOT IN' => 37, + 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 083740996e..6a3cfd638b 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -173,14 +173,14 @@ class ContextMySql50700 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, - 'NOT NULL' => 5, 'SET NULL' => 5, - 'NO ACTION' => 5, 'ON DELETE' => 5, 'ON UPDATE' => 5, - 'CHARACTER SET' => 5, 'IF NOT EXISTS' => 5, - 'DATA DIRECTORY' => 5, - 'DEFAULT COLLATE' => 5, 'INDEX DIRECTORY' => 5, - 'DEFAULT CHARACTER SET' => 5, - - 'GROUP BY' => 7, 'ORDER BY' => 7, + 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, + 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'OR REPLACE' => 7, + 'SQL SECURITY' => 7, + 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, + 'DATA DIRECTORY' => 7, + 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, 'ENUM' => 9, 'TEXT' => 9, @@ -198,18 +198,18 @@ class ContextMySql50700 extends Context 'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11, 'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11, - 'BINARY VARYING' => 13, + 'BINARY VARYING' => 15, 'KEY' => 19, 'INDEX' => 19, 'UNIQUE' => 19, - 'INDEX KEY' => 21, - 'UNIQUE KEY' => 21, - 'FOREIGN KEY' => 21, 'PRIMARY KEY' => 21, 'SPATIAL KEY' => 21, - 'FULLTEXT KEY' => 21, 'UNIQUE INDEX' => 21, - 'SPATIAL INDEX' => 21, - 'FULLTEXT INDEX' => 21, + 'INDEX KEY' => 23, + 'UNIQUE KEY' => 23, + 'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23, + 'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23, + 'SPATIAL INDEX' => 23, + 'FULLTEXT INDEX' => 23, 'X' => 33, 'Y' => 33, 'LN' => 33, 'PI' => 33, @@ -327,7 +327,7 @@ class ContextMySql50700 extends Context 'LOCALTIMESTAMP' => 35, 'CURRENT_TIMESTAMP' => 35, - 'NOT IN' => 37, + 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, 'TIMESTAMP' => 41, diff --git a/libraries/sql-parser/src/Fragments/AlterFragment.php b/libraries/sql-parser/src/Fragments/AlterFragment.php new file mode 100644 index 0000000000..54338f9dab --- /dev/null +++ b/libraries/sql-parser/src/Fragments/AlterFragment.php @@ -0,0 +1,201 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class AlterFragment extends Fragment +{ + + /** + * All alter operations. + * + * @var array + */ + public static $OPTIONS = array( + 'ADD' => 3, + 'ALTER' => 3, + 'ANALYZE' => 3, + 'CHANGE' => 3, + 'CHECK' => 3, + 'COALESCE' => 3, + 'CONVERT' => 3, + 'DISABLE' => 3, + 'DISCARD' => 3, + 'DROP' => 3, + 'ENABLE' => 3, + 'IMPORT' => 3, + 'MODIFY' => 3, + 'OPTIMIZE' => 3, + 'ORDER' => 3, + 'PARTITION' => 3, + 'REBUILD' => 3, + 'REMOVE' => 3, + 'RENAME' => 3, + 'REORGANIZE' => 3, + 'REPAIR' => 3, + + 'COLUMN' => 4, + 'CONSTRAINT' => 4, + 'DEFAULT' => 4, + 'TO' => 4, + 'BY' => 4, + 'FOREIGN' => 4, + 'FULLTEXT' => 4, + 'KEY' => 4, + 'KEYS' => 4, + 'PARTITIONING' => 4, + 'PRIMARY KEY' => 4, + 'SPATIAL' => 4, + 'TABLESPACE' => 4, + 'INDEX' => 4, + + 'DEFAULT CHARACTER SET' => array(5, 'var'), + + 'COLLATE' => array(6, 'var'), + ); + + /** + * Options of this operation. + * + * @var OptionsFragment + */ + public $options; + + /** + * The altered field. + * + * @var FieldFragment + */ + public $field; + + /** + * Unparsed tokens. + * + * @var Token[] + */ + public $unknown = array(); + + /** + * @param Parser $parser The parser that serves as context. + * @param TokensList $list The list of tokens that are being parsed. + * @param array $options Parameters for parsing. + * + * @return AlterFragment + */ + public static function parse(Parser $parser, TokensList $list, array $options = array()) + { + $ret = new AlterFragment(); + + /** + * Counts brackets. + * @var int + */ + $brackets = 0; + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ---------------------[ options ]---------------------> 1 + * + * 1 ----------------------[ field ]----------------------> 2 + * + * 2 -------------------------[ , ]-----------------------> 0 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** + * Token parsed at this moment. + * @var Token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + if ($state !== 2) { + // State 2 parses the unknown part which must include whitespaces as well. + continue; + } + } + + if ($state === 0) { + $ret->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + $state = 1; + } elseif ($state === 1) { + $ret->field = FieldFragment::parse( + $parser, + $list, + array( + 'noAlias' => true, + 'noBrackets' => true, + ) + ); + if ($ret->field === null) { + // No field was read. We go back one token so the next + // iteration will parse the same on, but in state 2. + --$list->idx; + } + $state = 2; + } elseif ($state === 2) { + if ($token->type === Token::TYPE_OPERATOR) { + if ($token->value === '(') { + ++$brackets; + } elseif ($token->value === ')') { + --$brackets; + } elseif ($token->value === ',') { + break; + } + } + $ret->unknown[] = $token; + } + } + + --$list->idx; + return $ret; + } + + /** + * @param AlterFragment $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $ret = OptionsFragment::build($fragment->options) . ' '; + if (!empty($fragment->field)) { + $ret .= FieldFragment::build($fragment->field) . ' '; + } + foreach ($fragment->unknown as $token) { + $ret .= $token->token; + } + return $ret; + } +} diff --git a/libraries/sql-parser/src/Fragments/CreateDefFragment.php b/libraries/sql-parser/src/Fragments/CreateDefFragment.php deleted file mode 100644 index 933ea5ef5e..0000000000 --- a/libraries/sql-parser/src/Fragments/CreateDefFragment.php +++ /dev/null @@ -1,125 +0,0 @@ - - * @license http://opensource.org/licenses/GPL-2.0 GNU Public License - */ -class CreateDefFragment extends Fragment -{ - - /** - * All table options. - * - * @var array - */ - public static $TABLE_OPTIONS = array( - 'ENGINE' => array(1, 'var'), - 'AUTO_INCREMENT' => array(2, 'var'), - 'AVG_ROW_LENGTH' => array(3, 'var'), - 'DEFAULT CHARACTER SET' => array(4, 'var'), - 'CHARACTER SET' => array(4, 'var'), - 'CHECKSUM' => array(5, 'var'), - 'DEFAULT COLLATE' => array(5, 'var'), - 'COLLATE' => array(6, 'var'), - 'COMMENT' => array(7, 'var'), - 'CONNECTION' => array(8, 'var'), - 'DATA DIRECTORY' => array(9, 'var'), - 'DELAY_KEY_WRITE' => array(10, 'var'), - 'INDEX DIRECTORY' => array(11, 'var'), - 'INSERT_METHOD' => array(12, 'var'), - 'KEY_BLOCK_SIZE' => array(13, 'var'), - 'MAX_ROWS' => array(14, 'var'), - 'MIN_ROWS' => array(15, 'var'), - 'PACK_KEYS' => array(16, 'var'), - 'PASSWORD' => array(17, 'var'), - 'ROW_FORMAT' => array(18, 'var'), - 'TABLESPACE' => array(19, 'var'), - 'STORAGE' => array(20, 'var'), - 'UNION' => array(21, 'var'), - ); - - /** - * All function options. - * - * @var array - */ - public static $FUNC_OPTIONS = array( - 'COMMENT' => array(1, 'var'), - 'LANGUAGE SQL' => 2, - 'DETERMINISTIC' => 3, - 'NOT DETERMINISTIC' => 3, - 'CONSTAINS SQL' => 4, - 'NO SQL' => 4, - 'READS SQL DATA' => 4, - 'MODIFIES SQL DATA' => 4, - 'SQL SEQURITY DEFINER' => array(5, 'var'), - ); - - /** - * The name of the new table. - * - * @var string - */ - public $name; - - /** - * @param Parser $parser The parser that serves as context. - * @param TokensList $list The list of tokens that are being parsed. - * @param array $options Parameters for parsing. - * - * @return CreateDefFragment - */ - public static function parse(Parser $parser, TokensList $list, array $options = array()) - { - $ret = new CreateDefFragment(); - - for (; $list->idx < $list->count; ++$list->idx) { - /** - * Token parsed at this moment. - * @var Token - */ - $token = $list->tokens[$list->idx]; - - // End of statement. - if ($token->type === Token::TYPE_DELIMITER) { - break; - } - - // Skipping whitespaces and comments. - if (($token->type === Token::TYPE_WHITESPACE) - || ($token->type === Token::TYPE_COMMENT) - ) { - continue; - } - - if (($token->type === Token::TYPE_OPERATOR) - && ($token->value === '(') - ) { - break; - } - - $ret->name .= $token->value; - } - - --$list->idx; - return $ret; - } -} diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index 0b9e1a81b2..6a44b78b48 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -35,7 +35,7 @@ class DataTypeFragment extends Fragment 'BINARY' => 1, 'CHARACTER SET' => array(2, 'var'), 'CHARSET' => array(2, 'var'), - 'COLLATE' => 3, + 'COLLATE' => array(3, 'var'), 'UNSIGNED' => 4, 'ZEROFILL' => 5, ); @@ -69,6 +69,21 @@ class DataTypeFragment extends Fragment */ public $options; + /** + * Constructor. + * + * @param string $name The name of this data type. + * @param array $parameters The parameters (size or possible values). + * @param OptionsFragment $options The options of this data type. + */ + public function __construct($name = null, array $parameters = array(), + $options = null + ) { + $this->name = $name; + $this->parameters = $parameters; + $this->options = $options; + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -113,10 +128,10 @@ class DataTypeFragment extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $size = ArrayFragment::parse($parser, $list); + $parameters = ArrayFragment::parse($parser, $list); ++$list->idx; $ret->parameters = (($ret->name === 'ENUM') || ($ret->name === 'SET')) ? - $size->raw : $size->values; + $parameters->raw : $parameters->values; } $ret->options = OptionsFragment::parse($parser, $list, static::$DATA_TYPE_OPTIONS); ++$list->idx; @@ -132,4 +147,21 @@ class DataTypeFragment extends Fragment --$list->idx; return $ret; } + + /** + * @param DataTypeFragment $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $tmp = ''; + if (!empty($fragment->parameters)) { + $tmp = '('. implode(', ', $fragment->parameters) . ')'; + } + return trim( + $fragment->name . ' ' . $tmp . ' ' + . OptionsFragment::build($fragment->options) + ); + } } diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index 6c5771e95a..9f43fcc2fe 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -91,6 +91,29 @@ class FieldDefFragment extends Fragment */ public $options; + /** + * Constructor. + * + * @param string $name The name of the field. + * @param OptionsFragment $options The options of this field. + * @param DataTypeFragment|KeyFragment $type The data type of this field or the key. + * @param bool $isConstraint Whether this field is a constraint or not. + * @param ReferencesKeyword $references References. + */ + public function __construct($name = null, $options = null, $type = null, + $isConstraint = false, $references = null + ) { + $this->name = $name; + $this->options = $options; + if ($type instanceof DataTypeFragment) { + $this->type = $type; + } elseif ($type instanceof KeyFragment) { + $this->key = $type; + $this->isConstraint = $isConstraint; + $this->references = $references; + } + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -200,4 +223,42 @@ class FieldDefFragment extends Fragment return $ret; } + + /** + * @param FieldDefFragment[] $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $ret = array(); + foreach ($fragment as $f) { + $tmp = ''; + + if ($f->isConstraint) { + $tmp .= 'CONSTRAINT '; + } + + if (!empty($f->name)) { + $tmp .= Context::escape($f->name) . ' '; + } + + if (!empty($f->type)) { + $tmp .= DataTypeFragment::build($f->type) . ' '; + } + + if (!empty($f->key)) { + $tmp .= KeyFragment::build($f->key) . ' '; + } + + if (!empty($f->references)) { + $tmp .= 'REFERENCES ' . ReferencesKeyword::build($f->references) . ' '; + } + + $tmp .= OptionsFragment::build($f->options); + + $ret[] = trim($tmp); + } + return '(' . implode(', ', $ret) . ')'; + } } diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index edd0a2bbba..c33a7d7ea3 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -8,6 +8,7 @@ */ namespace SqlParser\Fragments; +use SqlParser\Context; use SqlParser\Fragment; use SqlParser\Parser; use SqlParser\Token; @@ -168,7 +169,7 @@ class FieldFragment extends Fragment if (($isExpr) && (!$alias)) { $ret->expr .= $token->token; } - if (($alias === 0) && (!$isExpr) && (!$period) && (!empty($ret->expr))) { + if (($alias === 0) && (empty($options['noAlias'])) && (!$isExpr) && (!$period) && (!empty($ret->expr))) { $alias = 1; } continue; @@ -194,14 +195,14 @@ class FieldFragment extends Fragment } if ($token->type === Token::TYPE_OPERATOR) { - if ((!empty($options['noBrackets'])) && - (($token->value === '(') || ($token->value === ')')) + if ((!empty($options['noBrackets'])) + && (($token->value === '(') || ($token->value === ')')) ) { break; } if ($token->value === '(') { ++$brackets; - // We don't check to see if `$prev` is `true` (open bracke + // We don't check to see if `$prev` is `true` (open bracket // was found before) because the brackets count is one (the // only bracket we found is this one). if (($brackets === 1) && (empty($ret->function)) && ($prev !== null) && ($prev !== true)) { @@ -246,13 +247,20 @@ class FieldFragment extends Fragment } $ret->database = $ret->table; $ret->table = $ret->column; + $ret->column = null; $period = true; } else { // We found the name of a column (or table if column // field should be skipped; used to parse table names). if (!empty($options['skipColumn'])) { + if (!empty($ret->table)) { + break; + } $ret->table = $token->value; } else { + if (!empty($ret->column)) { + break; + } $ret->column = $token->value; } $period = false; @@ -317,11 +325,11 @@ class FieldFragment extends Fragment if (!empty($fragment->column)) { $fields[] = $fragment->column; } - $ret = implode('.', $fields); + $ret = implode('.', Context::escape($fields)); } if (!empty($fragment->alias)) { - $ret .= ' AS ' . $fragment->alias; + $ret .= ' AS ' . Context::escape($fragment->alias); } return $ret; diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Fragments/KeyFragment.php index d84c9f6565..1964cd2bc7 100644 --- a/libraries/sql-parser/src/Fragments/KeyFragment.php +++ b/libraries/sql-parser/src/Fragments/KeyFragment.php @@ -67,6 +67,16 @@ class KeyFragment extends Fragment */ public $options; + + public function __construct($name = null, array $columns = array(), + $type = null, $options = null + ) { + $this->name = $name; + $this->columns = $columns; + $this->type = $type; + $this->options = $options; + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -131,6 +141,21 @@ class KeyFragment extends Fragment --$list->idx; return $ret; + } + /** + * @param KeyFragment $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $ret = $fragment->type . ' '; + if (!empty($fragment->name)) { + $ret .= Context::escape($fragment->name) . ' '; + } + $ret .= '(' . implode(', ', Context::escape($fragment->columns)) . ')'; + $ret .= OptionsFragment::build($fragment->options); + return trim($ret); } } diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index 00ac282c16..fa06b0d780 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -110,7 +110,12 @@ class OptionsFragment extends Fragment if (is_array($lastOption)) { if (empty($ret->options[$lastOptionId])) { - $ret->options[$lastOptionId] = array('name' => $token->value, 'value' => ''); + $ret->options[$lastOptionId] = array( + 'name' => $token->value, + 'equal' => $lastOption[1] === 'var=', + 'value' => '', + 'value_' => '', + ); } else { if ($token->value !== '=') { if ($token->value === '(') { @@ -118,7 +123,9 @@ class OptionsFragment extends Fragment } elseif ($token->value === ')') { --$brackets; } else { - $ret->options[$lastOptionId]['value'] .= $token->value; + // Raw and processed value. + $ret->options[$lastOptionId]['value'] .= $token->token; + $ret->options[$lastOptionId]['value_'] .= $token->value; } if ($brackets === 0) { $lastOption = null; @@ -144,10 +151,15 @@ class OptionsFragment extends Fragment */ public static function build($fragment) { + if ((empty($fragment)) || (!is_array($fragment->options))) { + return ''; + } $options = array(); foreach ($fragment->options as $option) { if (is_array($option)) { - $options[] = $option['name'] . '=' . $option['value']; + $options[] = $option['name'] + . (!empty($option['equal']) ? '=' : ' ') + . $option['value']; } else { $options[] = $option; } diff --git a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php index 8de0233a71..ea10d20267 100644 --- a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php @@ -8,6 +8,7 @@ */ namespace SqlParser\Fragments; +use SqlParser\Context; use SqlParser\Fragment; use SqlParser\Parser; use SqlParser\Token; @@ -57,6 +58,20 @@ class ReferencesKeyword extends Fragment */ public $options; + /** + * Constructor. + * + * @param string $table The name of the table referenced. + * @param array $columns The columns referenced. + * @param OptionsFragment $options The options. + */ + public function __construct($table = null, array $columns = array(), $options = null) + { + $this->table = $table; + $this->columns = $columns; + $this->options = $options; + } + /** * @param Parser $parser The parser that serves as context. * @param TokensList $list The list of tokens that are being parsed. @@ -117,4 +132,18 @@ class ReferencesKeyword extends Fragment --$list->idx; return $ret; } + + /** + * @param ReferencesKeyword $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + return trim( + Context::escape($fragment->table) + . ' (' . implode(', ', Context::escape($fragment->columns)) . ') ' + . OptionsFragment::build($fragment->options) + ); + } } diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index 0d0862d908..01d41d88c7 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -290,7 +290,25 @@ class Lexer */ $iEnd = $this->last; + /** + * Whether last parsed character is a whitespace. + * @var bool + */ + $lastSpace = false; + for ($j = 1; $j < Context::KEYWORD_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) { + // Composed keywords shouldn't have more than one whitespace between + // keywords. + if (Context::isWhitespace($this->str[$this->last])) { + if ($lastSpace) { + --$j; // The size of the keyword didn't increase. + continue; + } else { + $lastSpace = true; + } + } else { + $lastSpace = false; + } $token .= $this->str[$this->last]; if (($this->last + 1 === $this->len) || (Context::isSeparator($this->str[$this->last + 1]))) { if (($flags = Context::isKeyword($token))) { diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 11874fac61..ff55f5f7d1 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -337,10 +337,7 @@ class Parser * Processed statement. * @var Statement */ - $stmt = new $class(); - - // Parsing the actual statement. - $stmt->parse($this, $this->list); + $stmt = new $class($this, $this->list); // The first token that is a part of this token is the next token // unprocessed by the previous statement. diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 41fba6e117..5ef7aec4a4 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -38,7 +38,7 @@ abstract class Statement * * @var array */ - public static $CLAUSES; + public static $CLAUSES = array(); /** * The options of this query. @@ -76,6 +76,71 @@ abstract class Statement } } + /** + * Builds the statement. + * + * @return string + */ + public function build() + { + /** + * Query to be returned. + * @var string + */ + $query = ''; + + foreach (static::$CLAUSES as $clause) { + + /** + * The name of the clause. + * @var string + */ + $name = $clause[0]; + + /** + * The type of the clause. + * @see self::$CLAUSES + * @var int + */ + $type = $clause[1]; + + // Checking if there is any parser (builder) for this clause. + if (empty(Parser::$KEYWORD_PARSERS[$name])) { + continue; + } + + /** + * The builder (parser) of this clause. + * @var string + */ + $class = Parser::$KEYWORD_PARSERS[$name]['class']; + + /** + * The name of the field that is used as source for the builder. + * Same field is used to store the result of parsing. + * @var string + */ + $field = Parser::$KEYWORD_PARSERS[$name]['field']; + + // The field is empty, there is nothing to be built. + if (empty($this->$field)) { + continue; + } + + // Checking if the name of the clause should be added. + if ($type & 2) { + $query .= $name . ' '; + } + + // Checking if the result of the builder should be added. + if ($type & 1) { + $query .= $class::build($this->$field) . ' '; + } + } + + return $query; + } + /** * Parses the statements defined by the tokens list. * diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index 81bca056f9..92f3744a7d 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -9,11 +9,12 @@ namespace SqlParser\Statements; use SqlParser\Parser; +use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; +use SqlParser\Fragments\AlterFragment; use SqlParser\Fragments\FieldFragment; use SqlParser\Fragments\OptionsFragment; -use SqlParser\Statements\NotImplementedStatement; /** * `ALTER` statement. @@ -24,7 +25,7 @@ use SqlParser\Statements\NotImplementedStatement; * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class AlterStatement extends NotImplementedStatement +class AlterStatement extends Statement { /** @@ -37,9 +38,9 @@ class AlterStatement extends NotImplementedStatement /** * Column affected by this statement. * - * @var FieldFragment + * @var AlterFragment[] */ - public $altered; + public $altered = array(); /** * Options of this statement. @@ -47,83 +48,91 @@ class AlterStatement extends NotImplementedStatement * @var array */ public static $OPTIONS = array( - 'ONLINE' => 1, 'OFFLINE' => 1, - 'IGNORE' => 2, - - 'TABLE' => 3, - - 'ADD' => 4, - 'ALTER' => 4, - 'ANALYZE' => 4, - 'CHANGE' => 4, - 'CHECK' => 4, - 'COALESCE' => 4, - 'CONVERT' => 4, - 'DISABLE' => 4, - 'DISCARD' => 4, - 'DROP' => 4, - 'ENABLE' => 4, - 'IMPORT' => 4, - 'MODIFY' => 4, - 'OPTIMIZE' => 4, - 'ORDER' => 4, - 'PARTITION' => 4, - 'REBUILD' => 4, - 'REMOVE' => 4, - 'RENAME' => 4, - 'REORGANIZE' => 4, - 'REPAIR' => 4, - - 'COLUMN' => 5, - 'CONSTRAINT' => 5, - 'DEFAULT' => 5, - 'TO' => 5, - 'BY' => 5, - 'FOREIGN' => 5, - 'FULLTEXT' => 5, - 'KEYS' => 5, - 'PARTITIONING' => 5, - 'PRIMARY KEY' => 5, - 'SPATIAL' => 5, - 'TABLESPACE' => 5, - 'INDEX' => 5, - - 'DEFAULT CHARACTER SET' => array(6, 'var'), - - 'COLLATE' => array(7, 'var'), ); /** - * Function called after the token was processed. - * - * Extracts the name of affected column. - * * @param Parser $parser The instance that requests parsing. * @param TokensList $list The list of tokens to be parsed. - * @param Token $token The token that is being parsed. * * @return void */ - public function after(Parser $parser, TokensList $list, Token $token) + public function parse(Parser $parser, TokensList $list) { - // Parsing operation. - ++$list->idx; - $this->options->merge( - OptionsFragment::parse( - $parser, - $list, - static::$OPTIONS - ) + ++$list->idx; // Skipping `ALTER`. + $this->options = OptionsFragment::parse( + $parser, + $list, + static::$OPTIONS ); - // Parsing affected field. - ++$list->idx; - $this->altered = FieldFragment::parse($parser, $list); + // Skipping `TABLE`. + $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); - // - parent::after($parser, $list, $token); + // Parsing affected table. + $this->table = FieldFragment::parse( + $parser, $list, array( + 'noAlias' => true, + 'noBrackets' => true, + ) + ); + ++$list->idx; // Skipping field. + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 -----------------[ alter operation ]-----------------> 1 + * + * 1 -------------------------[ , ]-----------------------> 0 + * + * @var int + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** + * Token parsed at this moment. + * @var Token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + $this->altered[] = AlterFragment::parse($parser, $list); + $state = 1; + } else if ($state === 1) { + if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { + $state = 0; + } + } + } + } + + /** + * @return string + */ + public function build() + { + $tmp = array(); + foreach ($this->altered as $altered) { + $tmp[] = $altered::build($altered); + } + + return 'ALTER ' . OptionsFragment::build($this->options) + . ' TABLE ' . FieldFragment::build($this->table) + . ' ' . implode(', ', $tmp); } } diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 7fd8ef0501..306bfebceb 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -38,30 +38,30 @@ class CreateStatement extends Statement */ public static $OPTIONS = array( - 'DATABASE' => 1, - 'EVENT' => 1, - 'FUNCTION' => 1, - 'INDEX' => 1, - 'PROCEDURE' => 1, - 'SERVER' => 1, - 'TABLE' => 1, - 'TABLESPACE' => 1, - 'TRIGGER' => 1, - 'USER' => 1, - 'VIEW' => 1, - // CREATE TABLE - 'TEMPORARY' => 2, - 'IF NOT EXISTS' => 3, + 'TEMPORARY' => 1, + 'IF NOT EXISTS' => 2, // CREATE FUNCTION / PROCEDURE and CREATE VIEW - 'DEFINER' => array(2, 'var'), + 'DEFINER' => array(1, 'var='), // CREATE VIEW - 'OR REPLACE' => array(3, 'var'), - 'ALGORITHM' => array(4, 'var'), - 'DEFINER' => array(5, 'var'), - 'SQL SECURITY' => array(6, 'var'), + 'OR REPLACE' => array(2, 'var='), + 'ALGORITHM' => array(3, 'var='), + 'DEFINER' => array(4, 'var='), + 'SQL SECURITY' => array(5, 'var'), + + 'DATABASE' => 6, + 'EVENT' => 6, + 'FUNCTION' => 6, + 'INDEX' => 6, + 'PROCEDURE' => 6, + 'SERVER' => 6, + 'TABLE' => 6, + 'TABLESPACE' => 6, + 'TRIGGER' => 6, + 'USER' => 6, + 'VIEW' => 6, ); /** @@ -70,8 +70,8 @@ class CreateStatement extends Statement * @var array */ public static $TABLE_OPTIONS = array( - 'ENGINE' => array(1, 'var'), - 'AUTO_INCREMENT' => array(2, 'var'), + 'ENGINE' => array(1, 'var='), + 'AUTO_INCREMENT' => array(2, 'var='), 'AVG_ROW_LENGTH' => array(3, 'var'), 'DEFAULT CHARACTER SET' => array(4, 'var'), 'CHARACTER SET' => array(4, 'var'), @@ -143,15 +143,6 @@ class CreateStatement extends Statement */ public $fields; - /** - * The `SELECT` statement that defines this view. - * - * Used by `CREATE VIEW`. - * - * @var SelectStatement - */ - public $select; - /** * The return data type of this routine. * @@ -170,15 +161,36 @@ class CreateStatement extends Statement */ public $parameters; - /** - * The body of this function or procedure. + * The body of this function or procedure. For views, it is the select + * statement that gets the * - * Used by `CREATE FUNCTION` and `CREATE PROCEDURE`. + * Used by `CREATE FUNCTION`, `CREATE PROCEDURE` and `CREATE VIEW`. * * @var Token[] */ - public $body; + public $body = array(); + + /** + * @return string + */ + public function build() + { + $tmp = ''; + if ($this->options->has('TABLE')) { + $tmp = FieldDefFragment::build($this->fields); + } elseif ($this->options->has('VIEW')) { + if (!empty($this->fields)) { + $tmp .= ArrayFragment::build($this->fields) . ' '; + } + $tmp .= 'AS ' . TokensList::build($this->body); + } + return 'CREATE ' + . OptionsFragment::build($this->options) . ' ' + . FieldFragment::build($this->name) . ' ' + . $tmp . ' ' + . OptionsFragment::build($this->entityOptions); + } /** * @param Parser $parser The instance that requests parsing. @@ -258,11 +270,17 @@ class CreateStatement extends Statement --$list->idx; // getNext() also goes forward one field. $this->fields = ArrayFragment::parse($parser, $list); ++$list->idx; // Skipping last token from the array. - $token = $list->getNext(); + $list->getNext(); } - // Parsing the 'SELECT' statement. - $this->select = new SelectStatement($parser, $list); + // Parsing the `AS` keyword. + for (; $list->idx < $list->count; ++$list->idx) { + $token = $list->tokens[$list->idx]; + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + $this->body[] = $token; + } } } } diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php index babf18ac58..f0cd1ced87 100644 --- a/libraries/sql-parser/src/Statements/DropStatement.php +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -45,6 +45,21 @@ class DropStatement extends Statement 'IF EXISTS' => 3, ); + /** + * The clauses of this statement, in order. + * + * @see Statement::$CLAUSES + * + * @var array + */ + public static $CLAUSES = array( + 'DROP' => array('DROP', 2), + // Used for options. + '_OPTIONS' => array('_OPTIONS', 1), + // Used for select expressions. + 'DROP_' => array('DROP', 1), + ); + /** * Dropped elements. * diff --git a/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/libraries/sql-parser/src/Statements/NotImplementedStatement.php index b96c5583fd..f5f8b8f0a1 100644 --- a/libraries/sql-parser/src/Statements/NotImplementedStatement.php +++ b/libraries/sql-parser/src/Statements/NotImplementedStatement.php @@ -28,19 +28,40 @@ class NotImplementedStatement extends Statement { /** - * Function called after the token was processed. - * - * Jump to the end of the delimiter. - * + * The part of the statement that can't be parsed. + * @var Token[] + */ + public $unknown = array(); + + /** + * @return string + */ + public function build() + { + // Building the parsed part of the query (if any). + $query = parent::build() . ' '; + + // Rebuilding the unknown part from tokens. + foreach ($this->unknown as $token) { + $query .= $token->token; + } + + return $query; + } + + /** * @param Parser $parser The instance that requests parsing. * @param TokensList $list The list of tokens to be parsed. - * @param Token $token The token that is being parsed. * * @return void */ - public function after(Parser $parser, TokensList $list, Token $token) + public function parse(Parser $parser, TokensList $list) { - $list->getNextOfType(Token::TYPE_DELIMITER); - --$list->idx; + for (; $list->idx < $list->count; ++$list->idx) { + if ($list->tokens[$list->idx]->type === Token::TYPE_DELIMITER) { + break; + } + $this->unknown[] = $list->tokens[$list->idx]; + } } } diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 84ec5a29f3..e376b47a0a 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -57,7 +57,7 @@ class SelectStatement extends Statement 'DISTINCT' => 1, 'DISTINCTROW' => 1, 'HIGH_PRIORITY' => 2, - 'MAX_STATEMENT_TIME' => array(3, 'var'), + 'MAX_STATEMENT_TIME' => array(3, 'var='), 'STRAIGHT_JOIN' => 4, 'SQL_SMALL_RESULT' => 5, 'SQL_BIG_RESULT' => 6, diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index 52a464e624..229bebcec4 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -39,6 +39,42 @@ class TokensList implements \ArrayAccess */ public $idx = 0; + /** + * Constructor. + * + * @param array $tokens The initial array of tokens. + */ + public function __construct(array $tokens = array(), $count = -1) + { + if (!empty($tokens)) { + $this->tokens = $tokens; + if ($count === -1) { + $this->count = count($tokens); + } + } + } + + /** + * Builds an array of tokens by merging their raw value. + * + * @param array $tokens + * + * @return string + */ + public static function build($list) + { + if ($list instanceof TokensList) { + $list = $list->tokens; + } + $ret = ''; + if (is_array($list)) { + foreach ($list as $tok) { + $ret .= $tok->token; + } + } + return $ret; + } + /** * Adds a new token. * @@ -61,7 +97,8 @@ class TokensList implements \ArrayAccess { for (; $this->idx < $this->count; ++$this->idx) { if (($this->tokens[$this->idx]->type !== Token::TYPE_WHITESPACE) - && ($this->tokens[$this->idx]->type !== Token::TYPE_COMMENT)) { + && ($this->tokens[$this->idx]->type !== Token::TYPE_COMMENT) + ) { return $this->tokens[$this->idx++]; } } diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index 11a08d0212..f74162067f 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -531,7 +531,7 @@ class Query if ($onlyType) { return static::getClause($statement, $list, $old, -1, false) . ' ' . - $new . ' ' . static::getCLause($statement, $list, $old, 0) . ' ' . + $new . ' ' . static::getClause($statement, $list, $old, 0) . ' ' . static::getClause($statement, $list, $old, 1, false); } diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index 86ccbfb4d1..ba7f82fd80 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -36,7 +36,10 @@ class Table */ public static function getForeignKeys($statement) { - if ((empty($statement->fields)) || (!$statement->options->has('TABLE'))) { + if ((empty($statement->fields)) + || (!is_array($statement->fields)) + || (!$statement->options->has('TABLE')) + ) { return array(); } @@ -85,7 +88,10 @@ class Table */ public static function getFields($statement) { - if ((empty($statement->fields)) || (!$statement->options->has('TABLE'))) { + if ((empty($statement->fields)) + || (!is_array($statement->fields)) + || (!$statement->options->has('TABLE')) + ) { return array(); } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 71704d6da6..69dc46c1a9 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1311,9 +1311,13 @@ 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->options->has('DROP')) { - if (!empty($statement->altered->column)) { - PMA_clearTransformations($db, $table, $statement->altered->column); + if ($statement->altered[0]->options->has('DROP')) { + if (!empty($statement->altered[0]->field->column)) { + PMA_clearTransformations( + $db, + $table, + $statement->altered[0]->field->column + ); } } } elseif ($statement instanceof SqlParser\Statements\DropStatement) { diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 3485a80bf1..db8d10dcb5 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -101,9 +101,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase array( array( 'statement' => $parser->statements[0], - 'queryflags' => array( - 'select_from' => true, - ), + 'select_from' => true, ), ) ) From 88955f90fe5bf4872a8cffc1f39c82c3a8669507 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 5 Jul 2015 00:30:22 +0300 Subject: [PATCH 38/57] Fixed the bug which didn't allow remembering sorting order. Fixed coding style. Removed debug code. Signed-off-by: Dan Ungureanu --- libraries/Table.class.php | 20 +++++++++++--------- libraries/sql.lib.php | 7 ++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index ae76bca900..00baca889d 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1223,7 +1223,6 @@ class PMA_Table } } -file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GLOBALS['sql_query'] . "\n", FILE_APPEND); return true; } @@ -1920,7 +1919,8 @@ file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GL * * @return boolean True on update succeed or False on failure */ - public function updateDisplayField($disp, $display_field, $cfgRelation) { + public function updateDisplayField($disp, $display_field, $cfgRelation) + { $upd_query = false; if ($disp) { if ($display_field == '') { @@ -1973,8 +1973,9 @@ file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GL * @return boolean */ public function updateInternalRelations($multi_edit_columns_name, - $destination_db, $destination_table, $destination_column, - $cfgRelation, $existrel) { + $destination_db, $destination_table, $destination_column, + $cfgRelation, $existrel + ) { $updated = false; foreach ($destination_db as $master_field_md5 => $foreign_db) { $upd_query = null; @@ -2057,8 +2058,9 @@ file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GL * @return array */ public function updateForeignKeys($destination_foreign_db, - $multi_edit_columns_name, $destination_foreign_table, - $destination_foreign_column, $options_array, $table, $existrel_foreign) { + $multi_edit_columns_name, $destination_foreign_table, + $destination_foreign_column, $options_array, $table, $existrel_foreign + ) { $html_output = ''; $preview_sql_data = ''; $display_query = ''; @@ -2182,8 +2184,8 @@ file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GL ); } $html_output .= PMA_Util::showMySQLDocu( - 'InnoDB_foreign_key_constraints' - ) . "\n"; + 'InnoDB_foreign_key_constraints' + ) . "\n"; } } else { $preview_sql_data .= $create_query . "\n"; @@ -2238,7 +2240,7 @@ file_put_contents('/tmp/debug_table.txt', "-- GLOBALS[sql_query] (2) = \n" . $GL * @return string SQL query for foreign key constraint creation */ private function getSQLToCreateForeignKey($table, $field, $foreignDb, $foreignTable, - $foreignField, $name = null, $onDelete = null, $onUpdate = null + $foreignField, $name = null, $onDelete = null, $onUpdate = null ) { $sql_query = 'ALTER TABLE ' . PMA_Util::backquote($table) . ' ADD '; // if user entered a constraint name diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 69dc46c1a9..87cd49309d 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -111,7 +111,7 @@ function PMA_handleSortOrder( /** * Append limit clause to SQL query * - * @param array &$analyzed_sql_results the analyzed query results + * @param array &$analyzed_sql_results the analyzed query results * * @return string limit clause appended SQL query */ @@ -626,8 +626,9 @@ function PMA_isRememberSortingOrder($analyzed_sql_results) || $analyzed_sql_results['is_func'] || $analyzed_sql_results['is_analyse']) && $analyzed_sql_results['select_from'] - && empty($analyzed_sql_results['select_expr']) - && count($analyzed_sql_results['select_expr']) == 0 + && ((empty($analyzed_sql_results['select_expr'])) + || (count($analyzed_sql_results['select_expr'] == 1) + && ($analyzed_sql_results['select_expr'][0] == '*'))) && count($analyzed_sql_results['select_tables']) == 1; } From 11f42cd80ea60c44eca74ddae82414023f9cfce6 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sun, 5 Jul 2015 19:38:54 +0300 Subject: [PATCH 39/57] Using the new parser for exporting. Updated sql-parser library to udan11/sql-parser@06c0a64. Signed-off-by: Dan Ungureanu --- export.php | 20 +-- .../sql-parser/src/Fragments/WhereKeyword.php | 55 +++++-- libraries/sql-parser/src/Utils/Query.php | 149 ++++++++++++++++-- tbl_export.php | 105 ++++++------ 4 files changed, 229 insertions(+), 100 deletions(-) diff --git a/export.php b/export.php index d12976a482..865194ba25 100644 --- a/export.php +++ b/export.php @@ -284,15 +284,17 @@ 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 = SqlParser\Parser($sql_query); - if (!empty($_REQUEST['aliases'])) { - $aliases = PMA_mergeAliases( - SqlParser\Misc::getAliases($parser->statements[0], $db), - $_REQUEST['aliases'] - ); - $_SESSION['tmpval']['aliases'] = $_REQUEST['aliases']; - } else { - $aliases = SqlParser\Misc::getAliases($parser->statements[0], $db); + $parser = new SqlParser\Parser($sql_query); + if (!empty($parser->statements[0])) { + if (!empty($_REQUEST['aliases'])) { + $aliases = PMA_mergeAliases( + SqlParser\Utils\Misc::getAliases($parser->statements[0], $db), + $_REQUEST['aliases'] + ); + $_SESSION['tmpval']['aliases'] = $_REQUEST['aliases']; + } else { + $aliases = SqlParser\Utils\Misc::getAliases($parser->statements[0], $db); + } } /** diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index f5bec24040..4ce63a4885 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -26,11 +26,20 @@ class WhereKeyword extends Fragment { /** - * Logical operators that can be used to chain expressions. + * Logical operators that can be used to delimit expressions. * * @var array */ - public static $OPERATORS = array('&&', 'AND', 'OR', 'XOR', '||'); + public static $DELIMITERS = array('&&', 'AND', 'OR', 'XOR', '||'); + + /** + * Hashmap containing reserved keywords that are also operators. + * + * @var array + */ + public static $OPERATORS = array('AND' => 1, 'BETWEEN' => 1, 'LIKE' => 1, + 'OR' => 1, 'XOR' => 1 + ); /** * Identifiers recognized. @@ -82,6 +91,15 @@ class WhereKeyword extends Fragment */ $brackets = 0; + /** + * Whether there was a `BETWEEN` keyword before or not. + * It is required to keep track of them because their structure contains + * the keyword `AND`, which is also an operator that delimits + * expressions. + * @var bool + */ + $betweenBefore = false; + for (; $list->idx < $list->count; ++$list->idx) { /** @@ -101,20 +119,24 @@ class WhereKeyword extends Fragment } // Conditions are delimited by logical operators. - if (in_array($token->value, static::$OPERATORS, true)) { - $expr->expr = trim($expr->expr); - if (!empty($expr->expr)) { - // Adding the condition that is delimited by this operator. + if (in_array($token->value, static::$DELIMITERS, true)) { + if (($betweenBefore) && ($token->value === 'AND')) { + $betweenBefore = false; + } else { + $expr->expr = trim($expr->expr); + if (!empty($expr->expr)) { + // Adding the condition that is delimited by this operator. + $ret[] = $expr; + } + + // Adding the operator. + $expr = new WhereKeyword($token->value); + $expr->isOperator = true; $ret[] = $expr; + + $expr = new WhereKeyword(); + continue; } - - // Adding the operator. - $expr = new WhereKeyword($token->value); - $expr->isOperator = true; - $ret[] = $expr; - - $expr = new WhereKeyword(); - continue; } if ($token->type === Token::TYPE_OPERATOR) { @@ -127,7 +149,10 @@ class WhereKeyword extends Fragment // No keyword is expected. if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) { - if ($brackets == 0) { + if ($token->value === 'BETWEEN') { + $betweenBefore = true; + } + if (($brackets === 0) && (empty(static::$OPERATORS[$token->value]))) { break; } } diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index f74162067f..5c4553d2ab 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -354,7 +354,15 @@ class Query * * @param string $query The query to be parsed. * - * @return array + * @return array The array returned is the one returned by + * `static::getFlags()`, with the following keys added: + * - parser - the parser used to analyze the query; + * - statement - the first statement resulted from parsing; + * - select_tables - the real name of the tables selected; + * if there are no table names in the `SELECT` + * expressions, the table names are fetched from the + * `FROM` expressions + * - select_expr - selected expressions */ public static function getAll($query) { @@ -375,15 +383,33 @@ class Query $ret['select_tables'] = array(); $ret['select_expr'] = array(); + // Finding tables' aliases and their associated real names. + $tableAliases = array(); + foreach ($statement->from as $expr) { + if ((!empty($expr->table)) && (!empty($expr->alias))) { + $tableAliases[$expr->alias] = array( + $expr->table, + !empty($expr->database) ? $expr->database : null + ); + } + } + // Trying to find selected tables only from the select expression. // Sometimes, this is not possible because the tables aren't defined // explicitly (e.g. SELECT * FROM film, SELECT film_id FROM film). foreach ($statement->expr as $expr) { if (!empty($expr->table)) { - $ret['select_tables'][] = array( - $expr->table, - !empty($expr->database) ? $expr->database : null - ); + if (empty($tableAliases[$expr->table])) { + $arr = array( + $expr->table, + !empty($expr->database) ? $expr->database : null + ); + } else { + $arr = $tableAliases[$expr->table]; + } + if (!in_array($arr, $ret['select_tables'])) { + $ret['select_tables'][] = $arr; + } } else { $ret['select_expr'][] = $expr->expr; } @@ -391,14 +417,17 @@ class Query // If no tables names were found in the SELECT clause or if there // are expressions like * or COUNT(*), etc. tables names should be - // extracted from the FROM clause as well. - if ((empty($ret['select_tables'])) || (!$ret['select_expr'])) { + // extracted from the FROM clause. + if (empty($ret['select_tables'])) { foreach ($statement->from as $expr) { if (!empty($expr->table)) { - $ret['select_tables'][] = array( + $arr = array( $expr->table, !empty($expr->database) ? $expr->database : null ); + if (!in_array($arr, $ret['select_tables'])) { + $ret['select_tables'][] = $arr; + } } } } @@ -413,10 +442,13 @@ class Query * @param Statement $statement The parsed query that has to be modified. * @param TokensList $list The list of tokens. * @param string $clause The clause to be returned. - * @param int $type The type of the search. - * -1 for everything that was before - * 0 only for the clause - * 1 for everything after + * @param int|string $type The type of the search. + * If int, + * -1 for everything that was before + * 0 only for the clause + * 1 for everything after + * If string, the name of the first clause that + * shouldn't be included. * @param bool $skipFirst Whether to skip the first keyword in clause. * * @return string @@ -467,6 +499,32 @@ class Query */ $clauseIdx = $clauses[$clauseType]; + $firstClauseIdx = $clauseIdx; + + $lastClauseIdx = $clauseIdx + 1; + + // Determining the behaviour of this function. + if ($type === -1) { + $firstClauseIdx = -1; // Something small enough. + $lastClauseIdx = $clauseIdx - 1; + } elseif ($type === 1) { + $firstClauseIdx = $clauseIdx + 1; + $lastClauseIdx = 10000; // Something big enough. + } elseif (is_string($type)) { + if ($clauses[$type] > $clauseIdx) { + $firstClauseIdx = $clauseIdx + 1; + $lastClauseIdx = $clauses[$type] - 1 ; + } else { + $firstClauseIdx = $clauses[$type] + 1; + $lastClauseIdx = $clauseIdx - 1 ; + } + } + + // This option is unavailable for multiple clauses. + if ($type !== 0) { + $skipFirst = false; + } + for ($i = $statement->first; $i <= $statement->last; ++$i) { $token = $list->tokens[$i]; @@ -493,10 +551,7 @@ class Query } } - if ((($type === -1) && ($currIdx < $clauseIdx)) - || (($type === 0) && ($currIdx === $clauseIdx)) - || (($type === 1) && ($currIdx > $clauseIdx)) - ) { + if (($firstClauseIdx <= $currIdx) && ($currIdx <= $lastClauseIdx)) { $ret .= $token->token; } } @@ -538,4 +593,66 @@ class Query return static::getClause($statement, $list, $old, -1, false) . ' ' . $new . ' ' . static::getClause($statement, $list, $old, 1, false); } + + /** + * Builds a query by rebuilding the statement from the tokens list supplied + * and replaces multiple clauses. + * + * @param Statement $statement The parsed query that has to be modified. + * @param TokensList $list The list of tokens. + * @param array $ops Clauses to be replaced. Contains multiple + * arrays having two values: array($old, $new). + * Clauses must be sorted. + * + * @return string + */ + public static function replaceClauses($statement, $list, array $ops) + { + $count = count($ops); + + // Nothing to do. + if ($count === 0) { + return ''; + } + + /** + * Value to be returned. + * @var string + */ + $ret = ''; + + /** + * The clauses of this type of statement and their index. + * @var array + */ + $clauses = array_keys($statement::$CLAUSES); + + // If there is only one clause, `replaceClause()` should be used. + if ($count === 1) { + return static::replaceClause( + $statement, + $list, + $ops[0][0], + $ops[0][1] + ); + } + + // Adding everything before first replacement. + $ret .= static::getClause($statement, $list, $ops[0][0], -1) . ' '; + + // Doing replacements. + for ($i = 0; $i < $count; ++$i) { + $ret .= $ops[$i][1] . ' '; + + // Adding everything between this and next replacement. + if ($i + 1 !== $count) { + $ret .= static::getClause($statement, $list, $ops[$i][0], $ops[$i + 1][0], -1) . ' '; + } + } + + // Adding everything after the last replacement. + $ret .= static::getClause($statement, $list, $ops[$count - 1][0], 1); + + return $ret; + } } diff --git a/tbl_export.php b/tbl_export.php index 5eeaa8be3d..f1f5e8d838 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -105,74 +105,59 @@ $export_page_title = __('View dump (schema) of table'); // generate WHERE clause (if we are asked to export specific rows) if (! empty($sql_query)) { - // Parse query so we can work with tokens - $parsed_sql = PMA_SQP_parse($sql_query); - $analyzed_sql = PMA_SQP_analyze($parsed_sql); + $parser = new SqlParser\Parser($sql_query); - // Need to generate WHERE clause? - if (isset($where_clause)) { + if (!empty($parser->statements[0])) { - // If a table alias is used, get rid of it since - // where clauses are on real table name - if ($analyzed_sql[0]['table_ref'][0]['table_alias']) { - // Exporting selected rows is only allowed for queries involving - // a single table. So we can safely assume that there is only one - // table in 'table_ref' array. - $temp_sql_array = preg_split('/\bfrom\b/i', $sql_query); - $sql_query = $temp_sql_array[0] . 'FROM '; - if (! empty($analyzed_sql[0]['table_ref'][0]['db'])) { - $sql_query .= PMA_Util::backquote( - $analyzed_sql[0]['table_ref'][0]['db'] - ); - $sql_query .= '.'; + // Finding aliases and removing them, but we keep track of them to be + // able to replace them in select expression too. + $aliases = array(); + foreach ($parser->statements[0]->from as $from) { + if ((!empty($from->table)) && (!empty($from->alias))) { + $aliases[$from->alias] = $from->table; + // We remove the alias of the table because they are going to + // be replaced anyway. + $from->alias = null; + $from->expr = null; // Force rebuild. } - $sql_query .= PMA_Util::backquote( - $analyzed_sql[0]['table_ref'][0]['table_name'] + } + + // Replacing the aliases in select expressions. + foreach ($parser->statements[0]->expr as $expr) { + if ((!empty($expr->table)) && (!empty($aliases[$expr->table]))) { + // Changing the table to null (leave the MySQL to find the + // right table). + // This is possible because exporting selected rows is only + // allowed for queries involing a single table. + $expr->table = null; + $expr->expr = null; // Force rebuild. + } + } + + // Rebuilding the SELECT and FROM clauses. + $replaces = array( + array('SELECT', 'SELECT ' . SqlParser\Fragments\FieldListFragment::build($parser->statements[0]->expr)), + array('FROM', 'FROM ' . SqlParser\Fragments\FieldListFragment::build($parser->statements[0]->from)), + ); + + // Checking if the WHERE clause has to be replaced. + if ((!empty($where_clause)) && (is_array($where_clause))) { + $replaces[] = array( + 'WHERE', 'WHERE (' . implode(') OR (', $where_clause) . ')' ); } - unset($temp_sql_array); - // Regular expressions which can appear in sql query, - // before the sql segment which remains as it is. - $regex_array = array( - '/\bwhere\b/i', '/\bgroup by\b/i', '/\bhaving\b/i', '/\border by\b/i' + // Preparing to remove the LIMIT clause. + $replaces[] = array('LIMIT', ''); + + // Replacing the clauses. + $sql_query = SqlParser\Utils\Query::replaceClauses( + $parser->statements[0], + $parser->list, + $replaces ); - - $first_occurring_regex = PMA_Util::getFirstOccurringRegularExpression( - $regex_array, $sql_query - ); - unset($regex_array); - - // The part "SELECT `id`, `name` FROM `customers`" - // is not modified by the next code segment, when exporting - // the result set from a query such as - // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN - // ( SELECT id FROM companies WHERE name LIKE '%u%')" - if (! is_null($first_occurring_regex)) { - $temp_sql_array = preg_split($first_occurring_regex, $sql_query); - $sql_query = $temp_sql_array[0]; - } - unset($first_occurring_regex, $temp_sql_array); - - // Append the where clause using the primary key of each row - if (is_array($where_clause) && (count($where_clause) > 0)) { - $sql_query .= ' WHERE (' . implode(') OR (', $where_clause) . ')'; - } - - if (!empty($analyzed_sql[0]['group_by_clause'])) { - $sql_query .= ' GROUP BY ' . $analyzed_sql[0]['group_by_clause']; - } - if (!empty($analyzed_sql[0]['having_clause'])) { - $sql_query .= ' HAVING ' . $analyzed_sql[0]['having_clause']; - } - if (!empty($analyzed_sql[0]['order_by_clause'])) { - $sql_query .= ' ORDER BY ' . $analyzed_sql[0]['order_by_clause']; - } - } else { - // Just crop LIMIT clause - $sql_query = $analyzed_sql[0]['section_before_limit'] - . $analyzed_sql[0]['section_after_limit']; } + echo PMA_Util::getMessage(PMA_Message::success()); } From eeafcad986917b581292a1c7ac0c27cf98f67787 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 7 Jul 2015 03:21:38 +0300 Subject: [PATCH 40/57] Using the new parser to simulate queries. Updated sql-parser library to udan11/sql-parser@e58d230. Signed-off-by: Dan Ungureanu --- libraries/import.lib.php | 421 ++++-------------- .../src/Contexts/ContextMySql50000.php | 2 +- .../src/Contexts/ContextMySql50100.php | 2 +- .../src/Contexts/ContextMySql50500.php | 2 +- .../src/Contexts/ContextMySql50600.php | 2 +- .../src/Contexts/ContextMySql50700.php | 2 +- .../src/Fragments/AlterFragment.php | 2 +- .../src/Fragments/FieldDefFragment.php | 1 - .../sql-parser/src/Fragments/IntoKeyword.php | 18 +- .../src/Fragments/ParamDefFragment.php | 21 + .../src/Fragments/RenameKeyword.php | 28 +- .../sql-parser/src/Fragments/SetKeyword.php | 9 +- libraries/sql-parser/src/Parser.php | 9 +- .../src/Statements/CheckStatement.php | 7 - .../src/Statements/ChecksumStatement.php | 7 - .../src/Statements/CreateStatement.php | 126 +++++- .../src/Statements/DeleteStatement.php | 18 + .../src/Statements/RepairStatement.php | 7 - .../src/Statements/RestoreStatement.php | 7 - .../src/Statements/SelectStatement.php | 2 +- .../src/Statements/TruncateStatement.php | 49 ++ .../src/Statements/UpdateStatement.php | 21 +- libraries/sql-parser/src/TokensList.php | 7 +- libraries/sql-parser/src/Utils/Query.php | 51 +++ test/libraries/PMA_import_test.php | 41 +- 25 files changed, 433 insertions(+), 429 deletions(-) create mode 100644 libraries/sql-parser/src/Statements/TruncateStatement.php diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 9656e97503..9f379e6026 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1388,33 +1388,33 @@ function PMA_handleSimulateDMLRequest() continue; } - // Parse and Analyze the query. - $parsed_sql = PMA_SQP_parse($sql_query); - $analyzed_sql = PMA_SQP_analyze($parsed_sql); + // Parsing the query. + $parser = new SqlParser\Parser($sql_query); + + if (empty($parser->statements[0])) { + continue; + } + + $statement = $parser->statements[0]; + $analyzed_sql_results = array( - 'parsed_sql' => $parsed_sql, - 'analyzed_sql' => $analyzed_sql + 'query' => $sql_query, + 'parser' => $parser, + 'statement' => $statement, ); - // Only UPDATE/DELETE queries accepted. - $query_type = $analyzed_sql_results['analyzed_sql'][0]['querytype']; - if ($query_type != 'UPDATE' && $query_type != 'DELETE') { + if ((!(($statement instanceof SqlParser\Statements\UpdateStatement) || + ($statement instanceof SqlParser\Statements\DeleteStatement))) || + (!empty($statement->join)) + ) { $error = $error_msg; break; } - // Only single-table queries accepted. - $table_references = PMA_getTableReferences($analyzed_sql_results); - $table_references = $table_references ? $table_references : ''; - if (preg_match('/JOIN/i', $table_references)) { + $tables = SqlParser\Utils\Query::getTables($statement); + if (count($tables) > 1) { $error = $error_msg; break; - } else { - $tables = explode(',', $table_references); - if (count($tables) > 1) { - $error = $error_msg; - break; - } } // Get the matched rows for the query. @@ -1444,20 +1444,18 @@ function PMA_handleSimulateDMLRequest() */ function PMA_getMatchedRows($analyzed_sql_results = array()) { - // Get the query type. - $query_type = (isset($analyzed_sql_results['analyzed_sql'][0]['querytype'])) - ? $analyzed_sql_results['analyzed_sql'][0]['querytype'] - : ''; + $statement = $analyzed_sql_results['statement']; $matched_row_query = ''; - if ($query_type == 'DELETE') { + if ($statement instanceof SqlParser\Statements\DeleteStatement) { $matched_row_query = PMA_getSimulatedDeleteQuery($analyzed_sql_results); - } else if ($query_type == 'UPDATE') { + } elseif ($statement instanceof SqlParser\Statements\UpdateStatement) { $matched_row_query = PMA_getSimulatedUpdateQuery($analyzed_sql_results); } // Execute the query and get the number of matched rows. $matched_rows = PMA_executeMatchedRowQuery($matched_row_query); + // URL to matched rows. $_url_params = array( 'db' => $GLOBALS['db'], @@ -1466,9 +1464,7 @@ function PMA_getMatchedRows($analyzed_sql_results = array()) $matched_rows_url = 'sql.php' . PMA_URL_getCommon($_url_params); return array( - 'sql_query' => PMA_Util::formatSql( - $analyzed_sql_results['parsed_sql']['raw'] - ), + 'sql_query' => PMA_Util::formatSql($analyzed_sql_results['query']), 'matched_rows' => $matched_rows, 'matched_rows_url' => $matched_rows_url ); @@ -1483,95 +1479,50 @@ function PMA_getMatchedRows($analyzed_sql_results = array()) */ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) { - $where_clause = ''; - $extra_where_clause = array(); - $target_cols = array(); + $table_references = SqlParser\Utils\Query::getTables( + $analyzed_sql_results['statement'] + ); - $prev_term = ''; - $i = 0; - $in_function = 0; - foreach ($analyzed_sql_results['parsed_sql'] as $key => $term) { - if (! isset($get_set_expr) - && preg_match( - '/\bSET\b/i', - isset($term['data']) ? $term['data'] : '' - ) - ) { - $get_set_expr = true; - continue; - } + $where = SqlParser\Utils\Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'WHERE' + ); - if (isset($get_set_expr)) { - if (preg_match( - '/\bWHERE\b|\bORDER BY\b|\bLIMIT\b/i', - isset($term['data']) ? $term['data'] : '' - ) - ) { - break; - } - if (!$in_function) { - if ($term['type'] == 'punct_listsep') { - $extra_where_clause[] = ' OR '; - } else if ($term['type'] == 'punct') { - $extra_where_clause[] = ' <> '; - } else if ($term['type'] == 'alpha_functionName') { - array_pop($extra_where_clause); - array_pop($extra_where_clause); - } else { - $extra_where_clause[] = $term['data']; - } - } else if ($term['type'] == 'punct_bracket_close_round') { - $in_function--; - } - - if ($term['type'] == 'alpha_functionName') { - $in_function++; - } - - // Get columns in SET expression. - if ($prev_term != 'punct') { - if ($term['type'] != 'punct_listsep' - && $term['type'] != 'punct' - && $term['type'] != 'punct_bracket_open_round' - && $term['type'] != 'punct_bracket_close_round' - && !$in_function - && isset($term['data']) - ) { - if (isset($target_cols[$i])) { - $target_cols[$i] .= $term['data']; - } else { - $target_cols[$i] = $term['data']; - } - } - } else { - $i++; - } - - $prev_term = $term['type']; - continue; - } + if (empty($where)) { + $where = '1'; } - // Get table_references. - $table_references = PMA_getTableReferences($analyzed_sql_results); - $target_cols = implode(', ', $target_cols); - - // Get WHERE clause. - $where_clause .= $analyzed_sql_results['analyzed_sql'][0]['where_clause']; - if (empty($where_clause)) { - $where_clause = (!empty($extra_where_clause) && $extra_where_clause[0]) - ? implode(' ', $extra_where_clause) - : '1'; + $diff = array(); + foreach ($analyzed_sql_results['statement']->set as $set) { + $columns[] = $set->column; + $diff[] = $set->column . ' <> ' . $set->value; + } + if (!empty($diff)) { + $where .= ' AND (' . implode(' OR ', $diff) . ')'; } - $matched_row_query = 'SELECT ' - . $target_cols - . ' FROM ' - . $table_references - . ' WHERE ' - . $where_clause; + $order_and_limit = ''; - return $matched_row_query; + if (!empty($analyzed_sql_results['statement']->order)) { + $order_and_limit .= ' ORDER BY ' . SqlParser\Utils\Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'ORDER BY' + ); + } + + if (!empty($analyzed_sql_results['statement']->limit)) { + $order_and_limit .= ' LIMIT ' . SqlParser\Utils\Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'LIMIT' + ); + } + + return 'SELECT ' . implode(', ', $columns) . + ' FROM ' . implode(', ', $table_references) . + ' WHERE ' . $where . $order_and_limit; } /** @@ -1583,115 +1534,40 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) */ function PMA_getSimulatedDeleteQuery($analyzed_sql_results) { - $where_clause = ''; + $table_references = SqlParser\Utils\Query::getTables( + $analyzed_sql_results['statement'] + ); - $where_clause .= $analyzed_sql_results['analyzed_sql'][0]['where_clause']; - if (empty($where_clause)) { - $where_clause = '1'; + $where = SqlParser\Utils\Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'WHERE' + ); + + if (empty($where)) { + $where = '1'; } - // Get the table_references. - $table_references = PMA_getTableReferences($analyzed_sql_results); + $order_and_limit = ''; - $matched_row_query = 'SELECT * ' - . ' FROM ' - . $table_references - . ' WHERE ' - . $where_clause; - - return $matched_row_query; -} - -/** - * Finds table_references from a given query. - * Queries Supported: INSERT, UPDATE, DELETE, REPLACE, ALTER, DROP, TRUNCATE - * and RENAME. - * - * @param array $analyzed_sql_results Analyzed SQL results from parser - * - * @return string table_references - */ -function PMA_getTableReferences($analyzed_sql_results) -{ - $table_references = ''; - foreach ($analyzed_sql_results['parsed_sql'] as $key => $term) { - // Skip first KeyWord and other invalid keys. - if ($key == 0 || ! isset($term['data'])) { - continue; - } - - // Get the query type. - $query_type = (isset($analyzed_sql_results['analyzed_sql'][0]['querytype'])) - ? $analyzed_sql_results['analyzed_sql'][0]['querytype'] - : ''; - - // Terms to 'ignore' from query for table_references. - $ignore_re = '/'; - // Terminating condition for table_references. - $terminate_re = '/'; - - // Create relevant Regular Expressions. - switch ($query_type) { - case 'REPLACE': - case 'INSERT': - $ignore_re .= '\bINSERT\b|\bREPLACE\b|\bLOW_PRIORITY\b|\bDELAYED\b' - . '|\bHIGH_PRIORITY\b|\bIGNORE\b|\bINTO\b'; - $terminate_re .= '\bPARTITION\b|\(|\bVALUE\b|\bVALUES\b|\bSELECT\b'; - break; - case 'UPDATE': - $ignore_re .= '\bUPDATE\b|\bLOW_PRIORITY\b|\bIGNORE\b'; - $terminate_re .= '\bSET\b|\bUSING\b'; - break; - case 'DELETE': - $ignore_re .= '\bDELETE\b|\bLOW_PRIORITY\b|\bQUICK\b|\bIGNORE\b' - . '|\bFROM\b'; - $terminate_re .= '\bPARTITION\b|\bWHERE\b|\bORDER\b|\bLIMIT\b|\bUSING\b'; - break; - case 'ALTER': - $ignore_re .= '\bALTER\b|\bONLINE\b|\bOFFLINE\b|\bIGNORE\b|\bTABLE\b'; - $terminate_re .= '\bADD\b|\bALTER\b|\bCHANGE\b|\bMODIFY\b|\bDROP\b' - . '|\bDISABLE\b|\bENABLE\b|\bRENAME\b|\bORDER\b|\bCONVERT\b' - . '|\bDEFAULT\b|\bDISCARD\b|\bIMPORT\b|\bCOALESCE\b|\bREORGANIZE\b' - . '|\bANALYZE\b|\bCHECK\b|\bOPTIMIZE\b|\bREBUILD\b|\bREPAIR\b' - . '|\bPARTITION\b|\bREMOVE\b|\bCHARACTER\b'; - break; - case 'DROP': - $ignore_re .= '\bDROP\b|\bTEMPORARY\b|\bTABLE\b|\bIF\b|\bEXISTS\b'; - $terminate_re .= '\bRESTRICT\b|\bCASCADE\b'; - break; - case 'TRUNCATE': - $ignore_re .= '\bTRUNCATE\b|\bTABLE\b'; - $terminate_re .= ''; - break; - case 'RENAME': - $ignore_re .= '\bRENAME\b|\bTABLE\b'; - $terminate_re .= '\bTO\b'; - break; - default: - return false; - } - - // Ignore 'case' in RegEx. - $ignore_re .= '/i'; - $terminate_re .= '/i'; - - if ($query_type != 'TRUNCATE' - && preg_match($terminate_re, $term['data']) - ) { - break; - } - - if (preg_match($ignore_re, $term['data']) - || ! is_numeric($key) - || $key == 0 - ) { - continue; - } - - $table_references .= ' ' . $term['data']; + if (!empty($analyzed_sql_results['statement']->order)) { + $order_and_limit .= ' ORDER BY ' . SqlParser\Utils\Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'ORDER BY' + ); } - return $table_references; + if (!empty($analyzed_sql_results['statement']->limit)) { + $order_and_limit .= ' LIMIT ' . SqlParser\Utils\Query::getClause( + $analyzed_sql_results['statement'], + $analyzed_sql_results['parser']->list, + 'LIMIT' + ); + } + + return 'SELECT * FROM ' . implode(', ', $table_references) . + ' WHERE ' . $where . $order_and_limit; } /** @@ -1712,93 +1588,6 @@ function PMA_executeMatchedRowQuery($matched_row_query) return $result; } -/** - * Extracts unique table names from table_references. - * - * @param string $table_references table_references - * - * @return array $table_names - */ -function PMA_getTableNamesFromTableReferences($table_references) -{ - $table_names = array(); - $parsed_data = PMA_SQP_parse($table_references); - - $prev_term = array( - 'data' => '', - 'type' => '' - ); - $on_encountered = false; - $qualifier_encountered = false; - $i = 0; - foreach ($parsed_data as $key => $term) { - // To skip first 'raw' key and other invalid keys. - if (! is_numeric($key) - || ! isset($term['data']) - || ! isset($term['type']) - ) { - continue; - } - - $add_to_table_names = true; - - // Un-quote the data, if any. - if ($term['type'] == 'quote_backtick') { - $term['data'] = PMA_Util::unQuote($term['data']); - $term['type'] = 'alpha_identifier'; - } - - // New table name expected after 'JOIN' keyword. - if (preg_match('/\bJOIN\b/i', $term['data'])) { - $on_encountered = false; - } - - // If term is a qualifier, set flag. - if ($term['type'] == 'punct_qualifier') { - $qualifier_encountered = true; - } - - // Skip the JOIN conditions after 'ON' keyword. - if (preg_match('/\bON\b/i', $term['data'])) { - $on_encountered = true; - } - - // If the word is not an 'identifier', skip it. - if ($term['type'] != 'alpha_identifier') { - $add_to_table_names = false; - } - - // Skip table 'alias'. - if (preg_match('/\bAS\b/i', $prev_term['data']) - || $prev_term['type'] == 'alpha_identifier' - ) { - $add_to_table_names = false; - } - - // Everything fine up to now, add name to list if 'unique'. - if ($add_to_table_names - && ! $on_encountered - && ! in_array($term['data'], $table_names) - ) { - if (! $qualifier_encountered) { - $table_names[] = PMA_Util::backquote($term['data']); - $i++; - } else { - // If qualifier encountered, concatenate DB name and table name. - $table_names[$i-1] = $table_names[$i-1] - . '.' - . PMA_Util::backquote($term['data']); - $qualifier_encountered = false; - } - } - - // Update previous term. - $prev_term = $term; - } - - return $table_names; -} - /** * Handles request for ROLLBACK. * @@ -1853,37 +1642,25 @@ function PMA_handleRollbackRequest($sql_query) */ function PMA_checkIfRollbackPossible($sql_query) { - // Supported queries. - $supported_queries = array( - 'INSERT', - 'UPDATE', - 'DELETE', - 'REPLACE' - ); + $parser = new SqlParser\Parser($sql_query); - // Parse and Analyze the query. - $parsed_sql = PMA_SQP_parse($sql_query); - $analyzed_sql = PMA_SQP_analyze($parsed_sql); - $analyzed_sql_results = array( - 'parsed_sql' => $parsed_sql, - 'analyzed_sql' => $analyzed_sql - ); + if (empty($parser->statements[0])) { + return false; + } - // Get the query type. - $query_type = (isset($analyzed_sql_results['analyzed_sql'][0]['querytype'])) - ? $analyzed_sql_results['analyzed_sql'][0]['querytype'] - : ''; + $statement = $parser->statements[0]; // Check if query is supported. - if (! in_array($query_type, $supported_queries)) { + if (!(($statement instanceof SqlParser\Statements\InsertStatement) + || ($statement instanceof SqlParser\Statements\UpdateStatement) + || ($statement instanceof SqlParser\Statements\DeleteStatement) + || ($statement instanceof SqlParser\Statements\ReplaceStatement)) + ) { return false; } // Get table_references from the query. - $table_references = PMA_getTableReferences($analyzed_sql_results); - $table_references = $table_references ? $table_references : ''; - // Get table names from table_references. - $tables = PMA_getTableNamesFromTableReferences($table_references); + $tables = SqlParser\Utils\Query::getTables($statement); // Check if each table is 'InnoDB'. foreach ($tables as $table) { diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index dc2759a30b..7db5fc3a76 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -146,7 +146,7 @@ class ContextMySql50000 extends Context 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, 'OR REPLACE' => 7, - 'SQL SECURITY' => 7, + 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index 82db6843ed..a5c4bef0bf 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -157,7 +157,7 @@ class ContextMySql50100 extends Context 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, 'OR REPLACE' => 7, - 'SQL SECURITY' => 7, + 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index e338232eb0..3faf785315 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -162,7 +162,7 @@ class ContextMySql50500 extends Context 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, 'OR REPLACE' => 7, - 'SQL SECURITY' => 7, + 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index 780ea5208b..6a1af74921 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -168,7 +168,7 @@ class ContextMySql50600 extends Context 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, 'OR REPLACE' => 7, - 'SQL SECURITY' => 7, + 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 6a3cfd638b..ac81e8a8d8 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -176,7 +176,7 @@ class ContextMySql50700 extends Context 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, 'OR REPLACE' => 7, - 'SQL SECURITY' => 7, + 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Fragments/AlterFragment.php b/libraries/sql-parser/src/Fragments/AlterFragment.php index 54338f9dab..b5c66e81e9 100644 --- a/libraries/sql-parser/src/Fragments/AlterFragment.php +++ b/libraries/sql-parser/src/Fragments/AlterFragment.php @@ -160,7 +160,7 @@ class AlterFragment extends Fragment ); if ($ret->field === null) { // No field was read. We go back one token so the next - // iteration will parse the same on, but in state 2. + // iteration will parse the same token, but in state 2. --$list->idx; } $state = 2; diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index 9f43fcc2fe..a4c21d79a1 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -221,7 +221,6 @@ class FieldDefFragment extends Fragment --$list->idx; return $ret; - } /** diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index 0b515319e3..cf65da6e5a 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -33,11 +33,11 @@ class IntoKeyword extends Fragment public $type; /** - * The name of the table or file. + * The destination, which can be a table or a file. * - * @var string + * @var string|FieldFragment */ - public $name; + public $dest; /** * The name of the columns. @@ -102,7 +102,15 @@ class IntoKeyword extends Fragment } if ($state === 0) { - $ret->name = $token->value; + $ret->dest = FieldFragment::parse( + $parser, + $list, + array( + 'noAlias' => true, + 'noBrackets' => true, + 'skipColumn' => true, + ) + ); $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { @@ -111,7 +119,7 @@ class IntoKeyword extends Fragment } break; } elseif ($state === 2) { - $ret->name = $token->value; + $ret->dest = $token->value; ++$list->idx; break; } diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php index 583c3abbcd..23b84e3220 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -135,6 +135,27 @@ class ParamDefFragment extends Fragment --$list->idx; return $ret; + } + /** + * @param ParamDefFragment[] $fragment The fragment to be built. + * + * @return string + */ + public static function build($fragment) + { + $ret = array(); + foreach ($fragment as $f) { + $tmp = ''; + if (!empty($f->inOut)) { + $tmp .= $f->inOut . ' '; + } + + $ret[] = trim( + $tmp . Context::escape($f->name) . ' ' . + DataTypeFragment::build($f->type) + ); + } + return '(' . implode(', ', $ret) . ')'; } } diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Fragments/RenameKeyword.php index 077982aafb..de81848584 100644 --- a/libraries/sql-parser/src/Fragments/RenameKeyword.php +++ b/libraries/sql-parser/src/Fragments/RenameKeyword.php @@ -26,16 +26,16 @@ class RenameKeyword extends Fragment { /** - * The old name. + * The old table name. * - * @var string + * @var FieldFragment */ public $old; /** - * The new name. + * The new table name. * - * @var string + * @var FieldFragment */ public $new; @@ -110,10 +110,26 @@ class RenameKeyword extends Fragment } if ($state == 0) { - $expr->old = $token->value; + $expr->old = FieldFragment::parse( + $parser, + $list, + array( + 'noAlias' => true, + 'noBrackets' => true, + 'skipColumn' => true, + ) + ); $state = 1; } elseif ($state == 2) { - $expr->new = $token->value; + $expr->new = FieldFragment::parse( + $parser, + $list, + array( + 'noBrackets' => true, + 'skipColumn' => true, + 'noAlias' => true, + ) + ); $state = 3; } diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Fragments/SetKeyword.php index bced45fb43..713a179c84 100644 --- a/libraries/sql-parser/src/Fragments/SetKeyword.php +++ b/libraries/sql-parser/src/Fragments/SetKeyword.php @@ -90,24 +90,29 @@ class SetKeyword extends Fragment if ($token->type === Token::TYPE_OPERATOR) { if ($token->value === ',') { + $expr->column = trim($expr->column); + $expr->value = trim($expr->value); $ret[] = $expr; $expr = new SetKeyword(); $state = 0; continue; } elseif ($token->value === '=') { $state = 1; + continue; } } if ($state === 0) { - $expr->column .= $token->value; + $expr->column .= $token->token; } else { // } else if ($state === 1) { - $expr->value = $token->value; + $expr->value .= $token->token; } } // Last iteration was not saved. if (!empty($expr->column)) { + $expr->column = trim($expr->column); + $expr->value = trim($expr->value); $ret[] = $expr; } diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index ff55f5f7d1..3c574063d1 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -54,7 +54,7 @@ class Parser 'CREATE' => 'SqlParser\\Statements\\CreateStatement', 'DROP' => 'SqlParser\\Statements\\DropStatement', 'RENAME' => 'SqlParser\\Statements\\RenameStatement', - 'TRUNCATE' => '', + 'TRUNCATE' => 'SqlParser\\Statements\\TruncateStatement', // Data Manipulation Statements. // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-data-manipulation.html @@ -185,9 +185,14 @@ class Parser 'class' => 'SqlParser\\Fragments\\FieldListFragment', 'field' => 'expr', ), + 'TRUNCATE' => array( + 'class' => 'SqlParser\\Fragments\\FieldFragment', + 'field' => 'table', + 'options' => array('skipColumn' => true), + ), 'UPDATE' => array( 'class' => 'SqlParser\\Fragments\\FieldListFragment', - 'field' => 'from', + 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'VALUE' => array( diff --git a/libraries/sql-parser/src/Statements/CheckStatement.php b/libraries/sql-parser/src/Statements/CheckStatement.php index 38764ff869..2e0e5a37b7 100644 --- a/libraries/sql-parser/src/Statements/CheckStatement.php +++ b/libraries/sql-parser/src/Statements/CheckStatement.php @@ -40,11 +40,4 @@ class CheckStatement extends MaintenanceStatement 'EXTENDED' => 6, 'CHANGED' => 7, ); - - /** - * Checked tables. - * - * @var FieldFragment[] - */ - public $tables; } diff --git a/libraries/sql-parser/src/Statements/ChecksumStatement.php b/libraries/sql-parser/src/Statements/ChecksumStatement.php index e2c6371c12..0495932702 100644 --- a/libraries/sql-parser/src/Statements/ChecksumStatement.php +++ b/libraries/sql-parser/src/Statements/ChecksumStatement.php @@ -36,11 +36,4 @@ class ChecksumStatement extends MaintenanceStatement 'QUICK' => 2, 'EXTENDED' => 3, ); - - /** - * Checked tables. - * - * @var FieldFragment[] - */ - public $tables; } diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 306bfebceb..71557c7e10 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -101,15 +101,28 @@ class CreateStatement extends Statement * @var array */ public static $FUNC_OPTIONS = array( - 'COMMENT' => array(1, 'var'), - 'LANGUAGE SQL' => 2, - 'DETERMINISTIC' => 3, - 'NOT DETERMINISTIC' => 3, - 'CONSTAINS SQL' => 4, - 'NO SQL' => 4, - 'READS SQL DATA' => 4, - 'MODIFIES SQL DATA' => 4, - 'SQL SEQURITY DEFINER' => array(5, 'var'), + 'COMMENT' => array(1, 'var'), + 'LANGUAGE SQL' => 2, + 'DETERMINISTIC' => 3, + 'NOT DETERMINISTIC' => 3, + 'CONSTAINS SQL' => 4, + 'NO SQL' => 4, + 'READS SQL DATA' => 4, + 'MODIFIES SQL DATA' => 4, + 'SQL SEQURITY DEFINER' => array(5, 'var'), + ); + + /** + * All trigger options. + * + * @var array + */ + public static $TRIGGER_OPTIONS = array( + 'BEFORE' => 1, + 'AFTER' => 1, + 'INSERT' => 2, + 'UPDATE' => 2, + 'DELETE' => 2, ); /** @@ -130,6 +143,7 @@ class CreateStatement extends Statement * * @see static::$TABLE_OPTIONS * @see static::$FUNC_OPTIONS + * @see static::$TRIGGER_OPTIONS */ public $entityOptions; @@ -143,6 +157,15 @@ class CreateStatement extends Statement */ public $fields; + /** + * If `CREATE TRIGGER` the name of the table. + * + * Used by `CREATE TRIGGER`. + * + * @var FieldFragment + */ + public $table; + /** * The return data type of this routine. * @@ -167,7 +190,7 @@ class CreateStatement extends Statement * * Used by `CREATE FUNCTION`, `CREATE PROCEDURE` and `CREATE VIEW`. * - * @var Token[] + * @var Token[]|string */ public $body = array(); @@ -176,20 +199,43 @@ class CreateStatement extends Statement */ public function build() { - $tmp = ''; if ($this->options->has('TABLE')) { - $tmp = FieldDefFragment::build($this->fields); + return 'CREATE ' + . OptionsFragment::build($this->options) . ' ' + . FieldFragment::build($this->name) . ' ' + . FieldDefFragment::build($this->fields) . ' ' + . OptionsFragment::build($this->entityOptions); } elseif ($this->options->has('VIEW')) { + $tmp = ''; if (!empty($this->fields)) { - $tmp .= ArrayFragment::build($this->fields) . ' '; + $tmp = ArrayFragment::build($this->fields); } - $tmp .= 'AS ' . TokensList::build($this->body); + return 'CREATE ' + . OptionsFragment::build($this->options) . ' ' + . FieldFragment::build($this->name) . ' ' + . $tmp . ' AS ' . TokensList::build($this->body) . ' ' + . OptionsFragment::build($this->entityOptions); + } elseif ($this->options->has('TRIGGER')) { + return 'CREATE ' + . OptionsFragment::build($this->options) . ' ' + . FieldFragment::build($this->name) . ' ' + . OptionsFragment::build($this->entityOptions) . ' ' + . 'ON ' . FieldFragment::build($this->table) . ' ' + . 'FOR EACH ROW ' . TokensList::build($this->body); + } elseif (($this->options->has('PROCEDURE')) + || ($this->options->has('FUNCTION')) + ) { + $tmp = ''; + if ($this->options->has('FUNCTION')) { + $tmp = 'RETURNS ' . DataTypeFragment::build($this->return); + } + return 'CREATE ' + . OptionsFragment::build($this->options) . ' ' + . FieldFragment::build($this->name) . ' ' + . ParamDefFragment::build($this->parameters) . ' ' + . $tmp . ' ' . TokensList::build($this->body); } - return 'CREATE ' - . OptionsFragment::build($this->options) . ' ' - . FieldFragment::build($this->name) . ' ' - . $tmp . ' ' - . OptionsFragment::build($this->entityOptions); + return ''; } /** @@ -221,6 +267,7 @@ class CreateStatement extends Statement if ($this->options->has('TABLE')) { $this->fields = FieldDefFragment::parse($parser, $list); ++$list->idx; + $this->entityOptions = OptionsFragment::parse( $parser, $list, @@ -246,13 +293,14 @@ class CreateStatement extends Statement } } ++$list->idx; + $this->entityOptions = OptionsFragment::parse( $parser, $list, static::$FUNC_OPTIONS ); ++$list->idx; - $this->body = array(); + for (; $list->idx < $list->count; ++$list->idx) { $token = $list->tokens[$list->idx]; $this->body[] = $token; @@ -263,7 +311,7 @@ class CreateStatement extends Statement } } } else if ($this->options->has('VIEW')) { - $token = $list->getNext(); + $token = $list->getNext(); // Skipping whitespaces and comments. // Parsing columns list. if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { @@ -281,6 +329,42 @@ class CreateStatement extends Statement } $this->body[] = $token; } + } else if ($this->options->has('TRIGGER')) { + // Parsing the time and the event. + $this->entityOptions = OptionsFragment::parse( + $parser, + $list, + static::$TRIGGER_OPTIONS + ); + ++$list->idx; + + $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'ON'); + ++$list->idx; // Skipping `ON`. + + // Parsing the name of the table. + $this->fields = FieldFragment::parse( + $parser, + $list, + array( + 'skipColumn' => true, + 'noAlias' => true, + 'noBrackets' => true, + ) + ); + ++$list->idx; + + $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'FOR EACH ROW'); + ++$list->idx; // Skipping `FOR EACH ROW`. + + for (; $list->idx < $list->count; ++$list->idx) { + $token = $list->tokens[$list->idx]; + $this->body[] = $token; + if (($token->type === Token::TYPE_KEYWORD) + && ($token->value === 'END') + ) { + break; + } + } } } } diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php index 9016da37de..04208fc094 100644 --- a/libraries/sql-parser/src/Statements/DeleteStatement.php +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -39,6 +39,24 @@ class DeleteStatement extends Statement 'IGNORE' => 3, ); + /** + * The clauses of this statement, in order. + * + * @see Statement::$CLAUSES + * + * @var array + */ + public static $CLAUSES = array( + 'DELETE' => array('DELETE', 2), + // Used for options. + '_OPTIONS' => array('_OPTIONS', 1), + 'FROM' => array('FROM', 3), + 'PARTITION' => array('PARTITION', 3), + 'WHERE' => array('WHERE', 3), + 'ORDER BY' => array('ORDER BY', 3), + 'LIMIT' => array('LIMIT', 3), + ); + /** * Tables used as sources for this statement. * diff --git a/libraries/sql-parser/src/Statements/RepairStatement.php b/libraries/sql-parser/src/Statements/RepairStatement.php index 933d2c0d08..e340dd12e0 100644 --- a/libraries/sql-parser/src/Statements/RepairStatement.php +++ b/libraries/sql-parser/src/Statements/RepairStatement.php @@ -42,11 +42,4 @@ class RepairStatement extends MaintenanceStatement 'EXTENDED' => 5, 'USE_FRM' => 6, ); - - /** - * Repaired tables. - * - * @var FieldFragment[] - */ - public $tables; } diff --git a/libraries/sql-parser/src/Statements/RestoreStatement.php b/libraries/sql-parser/src/Statements/RestoreStatement.php index 996b41eb0b..1c03e29df1 100644 --- a/libraries/sql-parser/src/Statements/RestoreStatement.php +++ b/libraries/sql-parser/src/Statements/RestoreStatement.php @@ -35,11 +35,4 @@ class RestoreStatement extends MaintenanceStatement 'FROM' => array(2, 'var'), ); - - /** - * Restored tables. - * - * @var FieldFragment[] - */ - public $tables; } diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index e376b47a0a..b5d0b0a840 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -78,7 +78,7 @@ class SelectStatement extends Statement 'SELECT' => array('SELECT', 2), // Used for options. '_OPTIONS' => array('_OPTIONS', 1), - // Used for select expressions. + // Used for selected expressions. '_SELECT' => array('SELECT', 1), 'FROM' => array('FROM', 3), 'PARTITION' => array('PARTITION', 3), diff --git a/libraries/sql-parser/src/Statements/TruncateStatement.php b/libraries/sql-parser/src/Statements/TruncateStatement.php new file mode 100644 index 0000000000..9313204b5e --- /dev/null +++ b/libraries/sql-parser/src/Statements/TruncateStatement.php @@ -0,0 +1,49 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class TruncateStatement extends Statement +{ + + /** + * Options for `TRUNCATE` statements. + * + * @var array + */ + public static $OPTIONS = array( + 'TABLE' => 1, + ); + + /** + * The name of the truncated table. + * + * @var FieldFragment + */ + public $table; +} diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php index d100560b30..ab445dc34a 100644 --- a/libraries/sql-parser/src/Statements/UpdateStatement.php +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -44,12 +44,31 @@ class UpdateStatement extends Statement 'IGNORE' => 2, ); + /** + * The clauses of this statement, in order. + * + * @see Statement::$CLAUSES + * + * @var array + */ + public static $CLAUSES = array( + 'UPDATE' => array('UPDATE', 2), + // Used for options. + '_OPTIONS' => array('_OPTIONS', 1), + // Used for updated tables. + '_UPDATE' => array('UPDATE', 1), + 'SET' => array('SET', 3), + 'WHERE' => array('WHERE', 3), + 'ORDER BY' => array('ORDER BY', 3), + 'LIMIT' => array('LIMIT', 3), + ); + /** * Tables used as sources for this statement. * * @var FieldFragment[] */ - public $from; + public $tables; /** * The updated values. diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index 229bebcec4..be9124c0de 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -57,15 +57,20 @@ class TokensList implements \ArrayAccess /** * Builds an array of tokens by merging their raw value. * - * @param array $tokens + * @param string|array|TokensList $tokens * * @return string */ public static function build($list) { + if (is_string($list)) { + return $list; + } + if ($list instanceof TokensList) { $list = $list->tokens; } + $ret = ''; if (is_array($list)) { foreach ($list as $tok) { diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index 5c4553d2ab..d4c01afa64 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -12,6 +12,7 @@ use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; +use SqlParser\Fragments\FieldFragment; use SqlParser\Statements\AlterStatement; use SqlParser\Statements\AnalyzeStatement; use SqlParser\Statements\CallStatement; @@ -23,10 +24,12 @@ 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; /** @@ -436,6 +439,54 @@ class Query return $ret; } + /** + * Gets a list of all tables used in this statement. + * + * @param Statement $statement Statement to be scanned. + * + * @return array + */ + public static function getTables($statement) + { + $fields = array(); + + if (($statement instanceof InsertStatement) + || ($statement instanceof ReplaceStatement) + ) { + $fields = array($statement->into->dest); + } elseif ($statement instanceof UpdateStatement) { + $fields = $statement->tables; + } elseif (($statement instanceof SelectStatement) + || ($statement instanceof DeleteStatement) + ) { + $fields = $statement->from; + } elseif (($statement instanceof AlterStatement) + || ($statement instanceof TruncateStatement) + ) { + $fields = array($statement->table); + } elseif ($statement instanceof DropStatement) { + if (!$statement->options->has('TABLE')) { + // No tables are dropped. + return array(); + } + $fields = $statement->fields; + } elseif ($statement instanceof RenameStatement) { + foreach ($statement->renames as $rename) { + $fields[] = $rename->old; + } + } + + $ret = array(); + foreach ($fields as $field) { + if (!empty($field->table)) { + $field->expr = null; // Force rebuild. + $field->alias = null; // Aliases are not required. + $ret[] = FieldFragment::build($field); + } + } + return $ret; + } + /** * Gets a specific clause. * diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php index d47e11caa6..96472e08e2 100644 --- a/test/libraries/PMA_import_test.php +++ b/test/libraries/PMA_import_test.php @@ -328,32 +328,6 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase ); } - /** - * Test for PMA_getTableReferences - * - * @return void - */ - function testPMAGetTableReferences() - { - $sql_query = 'UPDATE `table_1` AS t1, `table_2` t2, `table_3` AS t3 ' - . 'SET `table_1`.`id` = `table_2`.`id` ' - . 'WHERE 1'; - - $parsed_sql = PMA_SQP_parse($sql_query); - $analyzed_sql = PMA_SQP_analyze($parsed_sql); - $analyzed_sql_results = array( - 'parsed_sql' => $parsed_sql, - 'analyzed_sql' => $analyzed_sql - ); - - $table_references = PMA_getTableReferences($analyzed_sql_results); - - $this->assertEquals( - ' `table_1` AS t1 , `table_2` t2 , `table_3` AS t3', - $table_references - ); - } - /** * Test for PMA_getMatchedRows. * @@ -370,10 +344,11 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase $update_query = 'UPDATE `table_1` ' . 'SET `id` = 20 ' . 'WHERE `id` > 10'; - $simulated_update_query = 'SELECT `id` FROM `table_1` WHERE `id` > 10 '; + $simulated_update_query = 'SELECT `id` FROM `table_1` WHERE `id` > 10 AND (`id` <> 20)'; + $delete_query = 'DELETE FROM `table_1` ' . 'WHERE `id` > 10'; - $simulated_delete_query = 'SELECT * FROM `table_1` WHERE `id` > 10 '; + $simulated_delete_query = 'SELECT * FROM `table_1` WHERE `id` > 10'; $dbi->expects($this->any()) ->method('numRows') @@ -411,11 +386,11 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase */ function simulatedQueryTest($sql_query, $simulated_query) { - $parsed_sql = PMA_SQP_parse($sql_query); - $analyzed_sql = PMA_SQP_analyze($parsed_sql); + $parser = new SqlParser\Parser($sql_query); $analyzed_sql_results = array( - 'parsed_sql' => $parsed_sql, - 'analyzed_sql' => $analyzed_sql + 'query' => $sql_query, + 'parser' => $parser, + 'statement' => $parser->statements[0], ); $simulated_data = PMA_getMatchedRows($analyzed_sql_results); @@ -430,7 +405,7 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase $this->assertEquals( array( 'sql_query' => PMA_Util::formatSql( - $analyzed_sql_results['parsed_sql']['raw'] + $analyzed_sql_results['query'] ), 'matched_rows' => 2, 'matched_rows_url' => $matched_rows_url From d4cbb51d0455d5230fe82a7675eb095af28767a4 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 8 Jul 2015 00:11:04 +0300 Subject: [PATCH 41/57] Using the new parser for replacing aliases for export. Updated sql-parser library to udan11/sql-parser@2833495. Signed-off-by: Dan Ungureanu --- libraries/plugins/export/ExportSql.class.php | 334 ++++++++---------- .../src/Contexts/ContextMySql50000.php | 2 +- .../src/Contexts/ContextMySql50100.php | 2 +- .../src/Contexts/ContextMySql50500.php | 2 +- .../src/Contexts/ContextMySql50600.php | 2 +- .../src/Contexts/ContextMySql50700.php | 2 +- .../src/Fragments/AlterFragment.php | 1 + .../sql-parser/src/Fragments/KeyFragment.php | 9 +- .../src/Statements/CreateStatement.php | 36 +- .../plugin/export/PMA_ExportSql_test.php | 113 ++---- 10 files changed, 195 insertions(+), 308 deletions(-) diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 510140cf2d..428f0e590d 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -2541,216 +2541,164 @@ class ExportSql extends ExportPlugin $sql_query, $aliases, $db, $table = '', &$flag = null ) { $flag = false; - // Return original sql query if no aliases are provided. - if (!is_array($aliases) || empty($aliases) || empty($sql_query)) { + + /** + * The parser of this query. + * @var SqlParser\Parser + */ + $parser = new SqlParser\Parser($sql_query); + + if (empty($parser->statements[0])) { return $sql_query; } - $supported_query_types = array( - 'CREATE' => true, - ); - $supported_query_ons = array( - 'TABLE' => true, - 'VIEW' => true, - 'TRIGGER' => true, - 'FUNCTION' => true, - 'PROCEDURE' => true - ); - $identifier_types = array( - 'alpha_identifier', - 'quote_backtick' - ); - $query_type = ''; - $query_on = ''; - // Adjustment value for each pos value - // of token after replacement - $offset = 0; - $open_braces = 0; - $in_create_table_fields = false; - // flag to force end query parsing - $query_end = false; - // Convert all line feeds to Unix style - $sql_query = str_replace("\r\n", "\n", $sql_query); - $sql_query = str_replace("\r", "\n", $sql_query); - $tokens = PMA_SQP_parse($sql_query); - $ref_seen = false; - $ref_table_seen = false; - $old_table = $table; - $on_seen = false; - $size = $tokens['len']; - for ($i = 0; $i < $size && !$query_end; $i++) { - $type = $tokens[$i]['type']; - $data = $tokens[$i]['data']; - $data_next = isset($tokens[$i+1]['data']) - ? $tokens[$i+1]['data'] : ''; - $data_prev = ($i > 0) ? $tokens[$i-1]['data'] : ''; - $d_unq = PMA_Util::unQuote($data); - $d_unq_next = PMA_Util::unQuote($data_next); - $d_unq_prev = PMA_Util::unQuote($data_prev); - $d_upper = /*overload*/mb_strtoupper($d_unq); - $d_upper_next = /*overload*/mb_strtoupper($d_unq_next); - $d_upper_prev = /*overload*/mb_strtoupper($d_unq_prev); - $pos = $tokens[$i]['pos'] + $offset; - if ($type === 'alpha_reservedWord') { - if ($query_type === '' - && !empty($supported_query_types[$d_upper]) - ) { - $query_type = $d_upper; - } elseif ($query_on === '' - && !empty($supported_query_ons[$d_upper]) - ) { - $query_on = $d_upper; + /** + * The statement that represents the query. + * @var SqlParser\CreateStatement + */ + $statement = $parser->statements[0]; + + /** + * Old database name. + * @var string + */ + $old_database = $db; + + /** + * Old table name. + * @var string + */ + $old_table = $table; + + // Replacing aliases in `CREATE TABLE` statement. + if ($statement->options->has('TABLE')) { + + // Extracting the name of the old database and table from the + // statement to make sure the parameters are corect. + if (!empty($statement->name->database)) { + $old_database = $statement->name->database; + } + file_put_contents('/tmp/tests.txt', "------------\n", FILE_APPEND); + file_put_contents('/tmp/tests.txt', $sql_query . "\n", FILE_APPEND); + file_put_contents('/tmp/tests.txt', print_r($statement, true), FILE_APPEND); + file_put_contents('/tmp/tests.txt', "------------\n", FILE_APPEND); + $old_table = $statement->name->table; + + // Finding the aliased database name. + // The database might be empty so we have to add a few checks. + $new_database = null; + if (!empty($statement->name->database)) { + $new_database = $statement->name->database; + if (!empty($aliases[$old_database]['alias'])) { + $new_database = $aliases[$old_database]['alias']; } } - // CREATE TABLE - Alias replacement - if ($query_type === 'CREATE' && $query_on === 'TABLE') { - // replace create table name - if (!$in_create_table_fields - && in_array($type, $identifier_types) - && !empty($aliases[$db]['tables'][$table]['alias']) - ) { - $sql_query = $this->substituteAlias( - $sql_query, $data, - $aliases[$db]['tables'][$table]['alias'], - $pos, $offset - ); - $flag = true; - } elseif ($type === 'punct_bracket_open_round') { - // CREATE TABLE fields started - if (!$in_create_table_fields) { - $in_create_table_fields = true; - } - $open_braces++; - } elseif ($type === 'punct_bracket_close_round') { - // end our parsing after last ) - // no columns appear after that - if ($in_create_table_fields && $open_braces === 0) { - $query_end = true; - } - // End of Foreign key reference - if ($ref_seen) { - $ref_seen = $ref_table_seen = false; - $table = $old_table; - } - $open_braces--; - // handles Foreign key references - } elseif ($type === 'alpha_reservedWord' - && $d_upper === 'REFERENCES' - ) { - $ref_seen = true; - } elseif (in_array($type, $identifier_types) - && $ref_seen === true && !$ref_table_seen - ) { - $table = $d_unq; - $ref_table_seen = true; - if (!empty($aliases[$db]['tables'][$table]['alias'])) { - $sql_query = $this->substituteAlias( - $sql_query, $data, - $aliases[$db]['tables'][$table]['alias'], - $pos, $offset - ); + + // Finding the aliases table name. + $new_table = $old_table; + if (!empty($aliases[$old_database]['tables'][$old_table]['alias'])) { + $new_table = $aliases[$old_database]['tables'][$old_table]['alias']; + } + + // Replacing new values. + if (($statement->name->database !== $new_database) + || ($statement->name->table !== $new_table) + ) { + $statement->name->database = $new_database; + $statement->name->table = $new_table; + $statement->name->expr = null; // Force rebuild. + $flag = true; + } + + foreach ($statement->fields as $field) { + + // Column name. + if (!empty($field->type)) { + if (!empty($aliases[$old_database]['tables'][$old_table]['columns'][$field->name])) { + $field->name = $aliases[$old_database]['tables'] + [$old_table]['columns'][$field->name]; $flag = true; } - // Replace column names - } elseif (in_array($type, $identifier_types) - && !empty($aliases[$db]['tables'][$table]['columns'][$d_unq]) - ) { - $sql_query = $this->substituteAlias( - $sql_query, $data, - $aliases[$db]['tables'][$table]['columns'][$d_unq], - $pos, $offset - ); - $flag = true; } - // CREATE TRIGGER - Alias replacement - } elseif ($query_type === 'CREATE' && $query_on === 'TRIGGER') { - // Skip till 'ON' in encountered - if (!$on_seen && $type === 'alpha_reservedWord' - && $d_upper === 'ON' - ) { - $on_seen = true; - } elseif ($on_seen && in_array($type, $identifier_types)) { - if (!$ref_table_seen - && !empty($aliases[$db]['tables'][$d_unq]['alias']) - ) { - $ref_table_seen = true; - $sql_query = $this->substituteAlias( - $sql_query, $data, - $aliases[$db]['tables'][$d_unq]['alias'], - $pos, $offset - ); - $flag = true; - } else { - // search for identifier alias - $alias = $this->getAlias($aliases, $d_unq); - if (!empty($alias)) { - $sql_query = $this->substituteAlias( - $sql_query, $data, $alias, $pos, $offset - ); + + // Key's columns. + if (!empty($field->key)) { + foreach ($field->key->columns as $key => $column) { + if (!empty($aliases[$old_database]['tables'][$old_table]['columns'][$column])) { + $field->key->columns[$key] = $aliases[$old_database] + ['tables'][$old_table]['columns'][$column]; $flag = true; } } } - // CREATE PROCEDURE|FUNCTION|VIEW - Alias replacement - } elseif ($query_type === 'CREATE' - && ($query_on === 'FUNCTION' - || $query_on === 'PROCEDURE' - || $query_on === 'VIEW') - ) { - // LANGUAGE SQL | (READS|MODIFIES) SQL DATA - // characteristics are skipped - if ($type === 'alpha_identifier' - && (($d_upper === 'LANGUAGE' && $d_upper_next === 'SQL') - || ($d_upper === 'DATA' && $d_upper_prev === 'SQL')) - ) { - continue; - // No need to process further in case of VIEW - // when 'WITH' keyword has been detected - } elseif ($query_on === 'VIEW' - && $type === 'alpha_reservedWord' && $d_upper === 'WITH' - ) { - $query_end = true; - } elseif (in_array($type, $identifier_types)) { - // search for identifier alias - $alias = $this->getAlias($aliases, $d_unq); - if (!empty($alias)) { - $sql_query = $this->substituteAlias( - $sql_query, $data, $alias, $pos, $offset - ); + + // References. + if (!empty($field->references)) { + $ref_table = $field->references->table; + // Replacing table. + if (!empty($aliases[$old_database]['tables'][$ref_table]['alias'])) { + $field->references->table = $aliases[$old_database]['tables'][$ref_table]['alias']; $flag = true; - }; + } + // Replacing column names. + foreach ($field->references->columns as $key => $column) { + if (!empty($aliases[$old_database]['tables'][$ref_table]['columns'][$column])) { + $field->references->columns[$key] = $aliases[$old_database]['tables'][$ref_table]['columns'][$column]; + $flag = true; + } + } + } + } + } elseif ($statement->options->has('TRIGGER')) { + + // Extracting the name of the old database and table from the + // statement to make sure the parameters are corect. + if (!empty($statement->table->database)) { + $old_database = $statement->table->database; + } + $old_table = $statement->table->table; + + if (!empty($aliases[$old_database]['tables'][$old_table]['alias'])) { + $statement->table->table = $aliases[$old_database]['tables'][$old_table]['alias']; + $statement->table->expr = null; // Force rebuild. + $flag = true; + } + } + + if (($statement->options->has('TRIGGER')) + || ($statement->options->has('PROCEDURE')) + || ($statement->options->has('FUNCTION')) + || ($statement->options->has('VIEW')) + ) { + + // Repalcing the body. + for ($i = 0, $count = count($statement->body); $i < $count; ++$i) { + + /** + * Token parsed at this moment. + * @var Token + */ + $token = $statement->body[$i]; + + // Replacing only symbols (that are not variables) and unknown + // identifiers. + if ((($token->type === SqlParser\Token::TYPE_SYMBOL) + && (!($token->flags & SqlParser\Token::FLAG_SYMBOL_VARIABLE))) + || ((($token->type === SqlParser\Token::TYPE_KEYWORD) + && (!($token->flags & SqlParser\Token::FLAG_KEYWORD_RESERVED))) + || ($token->type === SqlParser\Token::TYPE_NONE)) + ) { + $alias = $this->getAlias($aliases, $token->value); + if (!empty($alias)) { + // Replacing the token. + $token->token = SqlParser\Context::escape($alias); + $flag = true; + } } } } - return $sql_query; - } - /** - * substitutes alias in query at given position - * Note: pos is the value from PMA_SQP_parse() + offset - * - * @param string $sql_query the SQL query - * @param string $data the data to be replaced - * @param string $alias the replacement - * @param string $pos the position of alias - * @param string &$offset the change in pos occurred after substitution - * - * @return string replaced query with alias - */ - public function substituteAlias($sql_query, $data, $alias, $pos, &$offset = null) - { - if (!empty($GLOBALS['sql_backquotes'])) { - $alias = PMA_Util::backquote($alias); - } - $alias_len = /*overload*/mb_strlen($alias); - $data_len = /*overload*/mb_strlen($data); - if (isset($offset)) { - $offset += ($alias_len - $data_len); - } - $sql_query = substr_replace( - $sql_query, $alias, $pos - $data_len, $data_len - ); - return $sql_query; + return $statement->build(); } /** diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index 7db5fc3a76..312a53e81d 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -149,7 +149,7 @@ class ContextMySql50000 extends Context 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, - 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index a5c4bef0bf..0e5a574a82 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -160,7 +160,7 @@ class ContextMySql50100 extends Context 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, - 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index 3faf785315..426bd5233e 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -165,7 +165,7 @@ class ContextMySql50500 extends Context 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, - 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index 6a1af74921..e091314ca2 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -171,7 +171,7 @@ class ContextMySql50600 extends Context 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, - 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index ac81e8a8d8..207ffd2837 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -179,7 +179,7 @@ class ContextMySql50700 extends Context 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, - 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, + 'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7, 'DEFAULT CHARACTER SET' => 7, 'XML' => 9, diff --git a/libraries/sql-parser/src/Fragments/AlterFragment.php b/libraries/sql-parser/src/Fragments/AlterFragment.php index b5c66e81e9..fbcce4ce21 100644 --- a/libraries/sql-parser/src/Fragments/AlterFragment.php +++ b/libraries/sql-parser/src/Fragments/AlterFragment.php @@ -69,6 +69,7 @@ class AlterFragment extends Fragment 'INDEX' => 4, 'DEFAULT CHARACTER SET' => array(5, 'var'), + 'DEFAULT CHARSET' => array(5, 'var'), 'COLLATE' => array(6, 'var'), ); diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Fragments/KeyFragment.php index 1964cd2bc7..c27d7450de 100644 --- a/libraries/sql-parser/src/Fragments/KeyFragment.php +++ b/libraries/sql-parser/src/Fragments/KeyFragment.php @@ -67,7 +67,14 @@ class KeyFragment extends Fragment */ public $options; - + /** + * Constructor. + * + * @param string $name The name of the key. + * @param array $columns The columns covered by this key. + * @param string $type The type of this key. + * @param OptionsFragment $options The options of this key. + */ public function __construct($name = null, array $columns = array(), $type = null, $options = null ) { diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 71557c7e10..0fb51932bd 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -40,7 +40,6 @@ class CreateStatement extends Statement // CREATE TABLE 'TEMPORARY' => 1, - 'IF NOT EXISTS' => 2, // CREATE FUNCTION / PROCEDURE and CREATE VIEW 'DEFINER' => array(1, 'var='), @@ -62,6 +61,9 @@ class CreateStatement extends Statement 'TRIGGER' => 6, 'USER' => 6, 'VIEW' => 6, + + // CREATE TABLE + 'IF NOT EXISTS' => 7, ); /** @@ -73,12 +75,14 @@ class CreateStatement extends Statement 'ENGINE' => array(1, 'var='), 'AUTO_INCREMENT' => array(2, 'var='), 'AVG_ROW_LENGTH' => array(3, 'var'), - 'DEFAULT CHARACTER SET' => array(4, 'var'), - 'CHARACTER SET' => array(4, 'var'), + 'CHARACTER SET' => array(4, 'var='), + 'CHARSET' => array(4, 'var='), + 'DEFAULT CHARACTER SET' => array(4, 'var='), + 'DEFAULT CHARSET' => array(4, 'var='), 'CHECKSUM' => array(5, 'var'), - 'DEFAULT COLLATE' => array(5, 'var'), - 'COLLATE' => array(6, 'var'), - 'COMMENT' => array(7, 'var'), + 'DEFAULT COLLATE' => array(5, 'var='), + 'COLLATE' => array(6, 'var='), + 'COMMENT' => array(7, 'var='), 'CONNECTION' => array(8, 'var'), 'DATA DIRECTORY' => array(9, 'var'), 'DELAY_KEY_WRITE' => array(10, 'var'), @@ -101,7 +105,7 @@ class CreateStatement extends Statement * @var array */ public static $FUNC_OPTIONS = array( - 'COMMENT' => array(1, 'var'), + 'COMMENT' => array(1, 'var='), 'LANGUAGE SQL' => 2, 'DETERMINISTIC' => 3, 'NOT DETERMINISTIC' => 3, @@ -257,9 +261,9 @@ class CreateStatement extends Statement $parser, $list, array( - 'skipColumn' => true, - 'noBrackets' => true, 'noAlias' => true, + 'noBrackets' => true, + 'skipColumn' => true, ) ); ++$list->idx; // Skipping field. @@ -304,11 +308,6 @@ class CreateStatement extends Statement for (; $list->idx < $list->count; ++$list->idx) { $token = $list->tokens[$list->idx]; $this->body[] = $token; - if (($token->type === Token::TYPE_KEYWORD) - && ($token->value === 'END') - ) { - break; - } } } else if ($this->options->has('VIEW')) { $token = $list->getNext(); // Skipping whitespaces and comments. @@ -342,13 +341,13 @@ class CreateStatement extends Statement ++$list->idx; // Skipping `ON`. // Parsing the name of the table. - $this->fields = FieldFragment::parse( + $this->table = FieldFragment::parse( $parser, $list, array( - 'skipColumn' => true, 'noAlias' => true, 'noBrackets' => true, + 'skipColumn' => true, ) ); ++$list->idx; @@ -359,11 +358,6 @@ class CreateStatement extends Statement for (; $list->idx < $list->count; ++$list->idx) { $token = $list->tokens[$list->idx]; $this->body[] = $token; - if (($token->type === Token::TYPE_KEYWORD) - && ($token->value === 'END') - ) { - break; - } } } } diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index 7d18c2ba6d..a646f8a3b8 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -2226,56 +2226,6 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); } - /** - * Test for ExportSql::substituteAlias - * - * @return void - */ - public function testSubstituteAlias() - { - $GLOBALS['sql_backquotes'] = '`'; - $sql_query = 'CREATE TABLE `data` ( xyz int )'; - $data = '`data`'; - $alias = 'sample'; - $pos = 19; - $offset = 0; - $result =$this->object->substituteAlias( - $sql_query, $data, $alias, $pos, $offset - ); - - $this->assertEquals( - 'CREATE TABLE `sample` ( xyz int )', - $result - ); - $this->assertEquals(2, $offset); - - $GLOBALS['sql_backquotes'] = false; - $result =$this->object->substituteAlias( - $sql_query, $data, $alias, $pos - ); - - $this->assertEquals( - 'CREATE TABLE sample ( xyz int )', - $result - ); - - $GLOBALS['sql_backquotes'] = '`'; - $sql_query = 'CREATE TABLE `sample` ( qwerty int )'; - $data = 'qwerty'; - $alias = 'f'; - $offset = 2; - $pos = 28 + 2; - $result =$this->object->substituteAlias( - $sql_query, $data, $alias, $pos, $offset - ); - - $this->assertEquals( - 'CREATE TABLE `sample` ( `f` int )', - $result - ); - $this->assertEquals(-1, $offset); - } - /** * Test for ExportSql::replaceWithAlias * @@ -2304,7 +2254,6 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ) ); - $GLOBALS['sql_backquotes'] = '`'; $db = 'a'; $table = 'foo'; $sql_query = "CREATE TABLE IF NOT EXISTS foo (" @@ -2314,7 +2263,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase . "pqr varchar(10) COLLATE latin1_general_ci NOT NULL " . "COMMENT 'pqr'," . "CONSTRAINT fk_om_dept FOREIGN KEY (baz) " - . "REFERENCES dept_master (baz)," + . "REFERENCES dept_master (baz)" . ") ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=" . "latin1_general_ci COMMENT='List' AUTO_INCREMENT=5"; $result = $this->object->replaceWithAliases( @@ -2322,60 +2271,48 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertEquals( - "CREATE TABLE IF NOT EXISTS `bartest` (" - . "`p` tinyint(3) unsigned NOT NULL COMMENT 'Primary Key'," - . "xyz varchar(255) COLLATE latin1_general_ci NOT NULL " - . "COMMENT 'xyz'," - . "`pphymdain` varchar(10) COLLATE latin1_general_ci NOT NULL " - . "COMMENT 'pqr'," - . "CONSTRAINT fk_om_dept FOREIGN KEY (`p`) " - . "REFERENCES dept_master (baz)," - . ") ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=" - . "latin1_general_ci COMMENT='List' AUTO_INCREMENT=5", + "CREATE TABLE IF NOT EXISTS `bartest` (" . + "`p` TINYINT (3) UNSIGNED NOT NULL COMMENT 'Primary Key', " . + "`xyz` VARCHAR (255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz', " . + "`pphymdain` VARCHAR (10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr', " . + "CONSTRAINT `fk_om_dept` FOREIGN KEY (`p`) REFERENCES `dept_master` (`baz`)" . + ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'", $result ); $result = $this->object->replaceWithAliases($sql_query, array(), '', ''); $this->assertEquals( - "CREATE TABLE IF NOT EXISTS foo (" - . "baz tinyint(3) unsigned NOT NULL COMMENT 'Primary Key'," - . "xyz varchar(255) COLLATE latin1_general_ci NOT NULL " - . "COMMENT 'xyz'," - . "pqr varchar(10) COLLATE latin1_general_ci NOT NULL " - . "COMMENT 'pqr'," - . "CONSTRAINT fk_om_dept FOREIGN KEY (baz) " - . "REFERENCES dept_master (baz)," - . ") ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=" - . "latin1_general_ci COMMENT='List' AUTO_INCREMENT=5", + "CREATE TABLE IF NOT EXISTS foo (" . + "`baz` TINYINT (3) UNSIGNED NOT NULL COMMENT 'Primary Key', " . + "`xyz` VARCHAR (255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz', " . + "`pqr` VARCHAR (10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr', " . + "CONSTRAINT `fk_om_dept` FOREIGN KEY (`baz`) REFERENCES `dept_master` (`baz`)" . + ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'", $result ); - $GLOBALS['sql_backquotes'] = null; $table = 'bar'; $sql_query = "CREATE TRIGGER `BEFORE_bar_INSERT` " - . "BEFORE INSERT ON `bar`\r\n" - . "FOR EACH ROW BEGIN\r\n" + . "BEFORE INSERT ON `bar` " + . "FOR EACH ROW BEGIN " . "SET @cnt=(SELECT count(*) FROM bar WHERE " . "xy=NEW.xy AND id=NEW.id AND " - . "abc=NEW.xy LIMIT 1);\r\n" - . "IF @cnt<>0 THEN\n" - . "SET NEW.xy=1;\r\n" - . "END IF;\nEND\n$$"; + . "abc=NEW.xy LIMIT 1); " + . "IF @cnt<>0 THEN " + . "SET NEW.xy=1; " + . "END IF; END"; $result = $this->object->replaceWithAliases( $sql_query, $aliases, $db, $table ); $this->assertEquals( - "CREATE TRIGGER `BEFORE_bar_INSERT` " - . "BEFORE INSERT ON f\n" - . "FOR EACH ROW BEGIN\n" - . "SET @cnt=(SELECT count(*) FROM f WHERE " - . "n=NEW.n AND id=NEW.id AND " - . "abc=NEW.n LIMIT 1);\n" - . "IF @cnt<>0 THEN\n" - . "SET NEW.n=1;\n" - . "END IF;\nEND\n$$", + "CREATE TRIGGER `BEFORE_bar_INSERT` BEFORE INSERT ON `f` FOR EACH ROW BEGIN " . + "SET @cnt=(SELECT count(*) FROM `f` WHERE `n`=NEW.`n` AND id=NEW.id AND abc=NEW.`n` LIMIT 1); " . + "IF @cnt<>0 THEN " . + "SET NEW.`n`=1; " . + "END IF; " . + "END", $result ); } From 51876a097c3bb3420acf2d2be6ce6713f2008229 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 8 Jul 2015 00:46:51 +0300 Subject: [PATCH 42/57] Coding style fixes. Signed-off-by: Dan Ungureanu --- libraries/import.lib.php | 7 ++++--- libraries/plugins/export/ExportSql.class.php | 6 +----- libraries/sql-parser/src/Context.php | 2 ++ libraries/sql-parser/src/Fragments/DataTypeFragment.php | 2 +- libraries/sql-parser/src/Fragments/FieldListFragment.php | 5 +++++ libraries/sql-parser/src/TokensList.php | 3 ++- libraries/sql-parser/src/Utils/Misc.php | 9 ++++++--- libraries/sql-parser/src/Utils/Query.php | 9 ++------- tbl_export.php | 4 +++- 9 files changed, 26 insertions(+), 21 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 9f379e6026..4eeacb2aa3 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1403,9 +1403,9 @@ function PMA_handleSimulateDMLRequest() 'statement' => $statement, ); - if ((!(($statement instanceof SqlParser\Statements\UpdateStatement) || - ($statement instanceof SqlParser\Statements\DeleteStatement))) || - (!empty($statement->join)) + if ((!(($statement instanceof SqlParser\Statements\UpdateStatement) + || ($statement instanceof SqlParser\Statements\DeleteStatement))) + || (!empty($statement->join)) ) { $error = $error_msg; break; @@ -1493,6 +1493,7 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results) $where = '1'; } + $columns = array(); $diff = array(); foreach ($analyzed_sql_results['statement']->set as $set) { $columns[] = $set->column; diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 428f0e590d..6db07faec7 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -2554,7 +2554,7 @@ class ExportSql extends ExportPlugin /** * The statement that represents the query. - * @var SqlParser\CreateStatement + * @var SqlParser\Statements\CreateStatement */ $statement = $parser->statements[0]; @@ -2578,10 +2578,6 @@ class ExportSql extends ExportPlugin if (!empty($statement->name->database)) { $old_database = $statement->name->database; } - file_put_contents('/tmp/tests.txt', "------------\n", FILE_APPEND); - file_put_contents('/tmp/tests.txt', $sql_query . "\n", FILE_APPEND); - file_put_contents('/tmp/tests.txt', print_r($statement, true), FILE_APPEND); - file_put_contents('/tmp/tests.txt', "------------\n", FILE_APPEND); $old_table = $statement->name->table; // Finding the aliased database name. diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index d42211f639..03fc0d1a4e 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -426,6 +426,8 @@ abstract class Context * Sets the SQL mode. * * @param string $mode The list of modes. If empty, the mode is reset. + * + * @return void */ public static function setMode($mode = '') { diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index 6a44b78b48..6ef4fde8e3 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -157,7 +157,7 @@ class DataTypeFragment extends Fragment { $tmp = ''; if (!empty($fragment->parameters)) { - $tmp = '('. implode(', ', $fragment->parameters) . ')'; + $tmp = '(' . implode(', ', $fragment->parameters) . ')'; } return trim( $fragment->name . ' ' . $tmp . ' ' diff --git a/libraries/sql-parser/src/Fragments/FieldListFragment.php b/libraries/sql-parser/src/Fragments/FieldListFragment.php index cc769e00e8..cc070c1c64 100644 --- a/libraries/sql-parser/src/Fragments/FieldListFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldListFragment.php @@ -80,6 +80,11 @@ class FieldListFragment extends Fragment return $ret; } + /** + * @param FieldFragment[] $fragment The fragment to be built. + * + * @return string + */ public static function build($fragment) { $ret = array(); diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index be9124c0de..93fb7c0779 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -43,6 +43,7 @@ class TokensList implements \ArrayAccess * Constructor. * * @param array $tokens The initial array of tokens. + * @param int $count The count of tokens in the initial array. */ public function __construct(array $tokens = array(), $count = -1) { @@ -57,7 +58,7 @@ class TokensList implements \ArrayAccess /** * Builds an array of tokens by merging their raw value. * - * @param string|array|TokensList $tokens + * @param string|Token[]|TokensList $list * * @return string */ diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 85c2399b9d..41c62ed623 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -26,14 +26,17 @@ class Misc /** * Gets a list of all aliases and their original names. * - * @param SelectStatement $statement The statement to be processed. - * @param string $database The name of the database. + * @param Statement $statement The statement to be processed. + * @param string $database The name of the database. * * @return array */ public static function getAliases($statement, $database) { - if ((empty($statement->from)) || (empty($statement->expr))) { + if (!($statement instanceof SelectStatement) + || (empty($statement->from)) + || (empty($statement->expr)) + ) { return array(); } diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index d4c01afa64..1f05711d36 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -12,6 +12,7 @@ use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; +use SqlParser\TokensList; use SqlParser\Fragments\FieldFragment; use SqlParser\Statements\AlterStatement; use SqlParser\Statements\AnalyzeStatement; @@ -672,12 +673,6 @@ class Query */ $ret = ''; - /** - * The clauses of this type of statement and their index. - * @var array - */ - $clauses = array_keys($statement::$CLAUSES); - // If there is only one clause, `replaceClause()` should be used. if ($count === 1) { return static::replaceClause( @@ -697,7 +692,7 @@ class Query // Adding everything between this and next replacement. if ($i + 1 !== $count) { - $ret .= static::getClause($statement, $list, $ops[$i][0], $ops[$i + 1][0], -1) . ' '; + $ret .= static::getClause($statement, $list, $ops[$i][0], $ops[$i + 1][0]) . ' '; } } diff --git a/tbl_export.php b/tbl_export.php index f1f5e8d838..c88864e6b4 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -107,7 +107,9 @@ $export_page_title = __('View dump (schema) of table'); if (! empty($sql_query)) { $parser = new SqlParser\Parser($sql_query); - if (!empty($parser->statements[0])) { + if ((!empty($parser->statements[0])) + && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement) + ) { // Finding aliases and removing them, but we keep track of them to be // able to replace them in select expression too. From fc6212b922bbfa44eb62fd199cd4e3d28ef6b65b Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 8 Jul 2015 01:57:55 +0300 Subject: [PATCH 43/57] Improved documentation. Updated sql-parser library to udan11/sql-parser@0bff48a. Signed-off-by: Dan Ungureanu --- libraries/DisplayResults.class.php | 2 +- libraries/Table.class.php | 18 +++++----- libraries/plugins/export/ExportSql.class.php | 10 +++--- libraries/sql-parser/src/Context.php | 10 +++--- .../src/Exceptions/LexerException.php | 2 -- .../src/Fragments/AlterFragment.php | 4 +-- .../src/Fragments/ArrayFragment.php | 2 +- .../sql-parser/src/Fragments/CallKeyword.php | 2 +- .../src/Fragments/DataTypeFragment.php | 7 ++-- .../src/Fragments/FieldDefFragment.php | 2 +- .../src/Fragments/FieldFragment.php | 12 +++---- .../src/Fragments/FieldListFragment.php | 2 +- .../sql-parser/src/Fragments/IntoKeyword.php | 2 +- .../sql-parser/src/Fragments/JoinKeyword.php | 2 +- .../sql-parser/src/Fragments/KeyFragment.php | 2 +- .../sql-parser/src/Fragments/LimitKeyword.php | 6 ++-- .../src/Fragments/OptionsFragment.php | 8 ++--- .../sql-parser/src/Fragments/OrderKeyword.php | 2 +- .../src/Fragments/ParamDefFragment.php | 2 +- .../src/Fragments/ReferencesKeyword.php | 2 +- .../src/Fragments/RenameKeyword.php | 2 +- .../sql-parser/src/Fragments/SetKeyword.php | 2 +- .../src/Fragments/ValuesKeyword.php | 2 +- .../sql-parser/src/Fragments/WhereKeyword.php | 6 ++-- libraries/sql-parser/src/Lexer.php | 35 +++++++++++-------- libraries/sql-parser/src/Parser.php | 24 +++++++------ libraries/sql-parser/src/Statement.php | 25 ++++++------- .../src/Statements/AlterStatement.php | 2 +- .../src/Statements/AnalyzeStatement.php | 1 + .../src/Statements/BackupStatement.php | 2 -- .../src/Statements/CallStatement.php | 1 + .../src/Statements/CheckStatement.php | 2 -- .../src/Statements/ChecksumStatement.php | 2 -- .../src/Statements/CreateStatement.php | 8 ++--- .../src/Statements/DeleteStatement.php | 5 +++ .../src/Statements/DropStatement.php | 1 + .../src/Statements/ExplainStatement.php | 2 -- .../src/Statements/InsertStatement.php | 2 ++ .../src/Statements/MaintenanceStatement.php | 1 + .../Statements/NotImplementedStatement.php | 1 + .../src/Statements/OptimizeStatement.php | 1 + .../src/Statements/RenameStatement.php | 1 + .../src/Statements/RepairStatement.php | 2 -- .../src/Statements/ReplaceStatement.php | 3 ++ .../src/Statements/RestoreStatement.php | 2 -- .../src/Statements/SelectStatement.php | 8 +++++ .../src/Statements/ShowStatement.php | 2 -- .../src/Statements/TruncateStatement.php | 8 ----- .../src/Statements/UpdateStatement.php | 5 +++ libraries/sql-parser/src/Token.php | 4 +-- libraries/sql-parser/src/UtfString.php | 8 +++-- libraries/sql-parser/src/Utils/Misc.php | 5 ++- libraries/sql-parser/src/Utils/Query.php | 18 +++++----- libraries/sql-parser/src/Utils/Routine.php | 1 - libraries/sql-parser/src/Utils/Table.php | 5 --- 55 files changed, 153 insertions(+), 145 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index ac00642b8c..edab28ad0f 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4233,7 +4233,7 @@ class PMA_DisplayResults /** * The statement this table is built for. - * @var SelectStatement + * @var SqlParser\Statements\SelectStatement */ $statement = $analyzed_sql_results['statement']; diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 00baca889d..069b827e8f 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -754,7 +754,7 @@ class PMA_Table /** * The full name of source table, quoted. - * @var string + * @var string $source */ $source = PMA_Util::backquote($source_db) . '.' . PMA_Util::backquote($source_table); @@ -771,7 +771,7 @@ class PMA_Table /** * The full name of target table, quoted. - * @var string + * @var string $target */ $target = PMA_Util::backquote($target_db) . '.' . PMA_Util::backquote($target_table); @@ -805,7 +805,7 @@ class PMA_Table /** * The old structure of the table.. - * @var string + * @var string $sql_structure */ $sql_structure = $export_sql_plugin->getTableDef( $source_db, $source_table, "\n", $err_url, false, false @@ -846,7 +846,7 @@ class PMA_Table /** * Drop statement used for building the query. - * @var SqlParser\Statements\DropStatement + * @var SqlParser\Statements\DropStatement $statement */ $statement = new SqlParser\Statements\DropStatement(); @@ -877,13 +877,13 @@ class PMA_Table /** * The parser responsible for parsing the old queries. - * @var SqlParser\Parser + * @var SqlParser\Parser $parser */ $parser = new SqlParser\Parser($sql_structure); /** * The CREATE statement of this structure. - * @var SqlParser\Statements\CreateStatement + * @var SqlParser\Statements\CreateStatement $statement */ $statement = $parser->statements[0]; @@ -909,7 +909,7 @@ class PMA_Table /** * The ALTER statement that generates the constraints. - * @var SqlParser\Statements\AlterStatement + * @var SqlParser\Statements\AlterStatement $statement */ $statement = $parser->statements[0]; @@ -947,7 +947,7 @@ class PMA_Table /** * The ALTER statement that generates the indexes. - * @var SqlParser\Statements\AlterStatement + * @var SqlParser\Statements\AlterStatement $statement */ $statement = $parser->statements[0]; @@ -985,7 +985,7 @@ class PMA_Table /** * The ALTER statement that alters the AUTO_INCREMENT value. - * @var SqlParser\Statements\AlterStatement + * @var SqlParser\Statements\AlterStatement $statement */ $statement = $parser->statements[0]; diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 6db07faec7..cc3acdef63 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -2544,7 +2544,7 @@ class ExportSql extends ExportPlugin /** * The parser of this query. - * @var SqlParser\Parser + * @var SqlParser\Parser $parser */ $parser = new SqlParser\Parser($sql_query); @@ -2554,19 +2554,19 @@ class ExportSql extends ExportPlugin /** * The statement that represents the query. - * @var SqlParser\Statements\CreateStatement + * @var SqlParser\Statements\CreateStatement $statement */ $statement = $parser->statements[0]; /** * Old database name. - * @var string + * @var string $old_database */ $old_database = $db; /** * Old table name. - * @var string + * @var string $old_table */ $old_table = $table; @@ -2672,7 +2672,7 @@ class ExportSql extends ExportPlugin /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $statement->body[$i]; diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index 03fc0d1a4e..99137d1f6d 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -84,7 +84,7 @@ abstract class Context */ public static $OPERATORS = array( - // Some operators (*, =) may have ambigous flags, because they depend on + // Some operators (*, =) may have ambiguous flags, because they depend on // the context they are being used in. // For example: 1. SELECT * FROM table; # SQL specific (wildcard) // SELECT 2 * 3; # arithmetic @@ -385,7 +385,7 @@ abstract class Context // Delimiter. /** - * Checks if the given character can be a separator for two lexems. + * Checks if the given character can be a separator for two lexeme. * * @param string $str String to be checked. * @@ -404,6 +404,8 @@ abstract class Context * @param string $context Name of the context or full class name that * defines the context. * + * @throws \Exception If the specified context doesn't exist. + * * @return void */ public static function load($context = '') @@ -416,7 +418,7 @@ abstract class Context $context = self::$contextPrefix . $context; } if (!class_exists($context)) { - throw new \Exception('Specified context ("' . $context . '") doesn\'t exist.'); + throw new \Exception('Specified context ("' . $context . '") does not exist.'); } self::$loadedContext = $context; self::$KEYWORDS = $context::$KEYWORDS; @@ -463,5 +465,5 @@ abstract class Context } } -// Initializng the default context. +// Initialing the default context. Context::load(); diff --git a/libraries/sql-parser/src/Exceptions/LexerException.php b/libraries/sql-parser/src/Exceptions/LexerException.php index 886e662939..3bbc0c72cd 100644 --- a/libraries/sql-parser/src/Exceptions/LexerException.php +++ b/libraries/sql-parser/src/Exceptions/LexerException.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Exceptions; -use SqlParser\Token; - /** * Exception thrown by the lexer. * diff --git a/libraries/sql-parser/src/Fragments/AlterFragment.php b/libraries/sql-parser/src/Fragments/AlterFragment.php index fbcce4ce21..3b71773925 100644 --- a/libraries/sql-parser/src/Fragments/AlterFragment.php +++ b/libraries/sql-parser/src/Fragments/AlterFragment.php @@ -108,7 +108,7 @@ class AlterFragment extends Fragment /** * Counts brackets. - * @var int + * @var int $brackets */ $brackets = 0; @@ -130,7 +130,7 @@ class AlterFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Fragments/ArrayFragment.php index 8c91fc2b55..592775160b 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Fragments/ArrayFragment.php @@ -81,7 +81,7 @@ class ArrayFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Fragments/CallKeyword.php index e56940b295..aae2b52ef3 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Fragments/CallKeyword.php @@ -82,7 +82,7 @@ class CallKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php index 6ef4fde8e3..d17cfa9ca6 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Fragments/DataTypeFragment.php @@ -8,7 +8,6 @@ */ namespace SqlParser\Fragments; -use SqlParser\Context; use SqlParser\Fragment; use SqlParser\Parser; use SqlParser\Token; @@ -53,7 +52,7 @@ class DataTypeFragment extends Fragment * Some data types have no parameters. * Numeric types might have parameters for the maximum number of digits, * precision, etc. - * String ypes might have parameters for the maxium length stored. + * String types might have parameters for the maximum length stored. * `ENUM` and `SET` have parameters for possible values. * * For more information, check the MySQL manual. @@ -89,7 +88,7 @@ class DataTypeFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return DataTypeFragment[] + * @return DataTypeFragment */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { @@ -111,7 +110,7 @@ class DataTypeFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index a4c21d79a1..947a8813df 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -154,7 +154,7 @@ class FieldDefFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Fragments/FieldFragment.php index c33a7d7ea3..a0bfc6d67d 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldFragment.php @@ -120,25 +120,25 @@ class FieldFragment extends Fragment /** * Whether current tokens make an expression or a table reference. - * @var bool + * @var bool $isExpr */ $isExpr = false; /** * Whether a period was previously found. - * @var bool + * @var bool $period */ $period = false; /** * Whether an alias is expected. Is 2 if `AS` keyword was found. - * @var int + * @var int $alias */ $alias = 0; /** * Counts brackets. - * @var int + * @var int $brackets */ $brackets = 0; @@ -148,14 +148,14 @@ class FieldFragment extends Fragment * string, if function was previously found; * true, if open bracket was previously found; * null, in any other case. - * @var string|bool + * @var string|bool $prev */ $prev = null; for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/FieldListFragment.php b/libraries/sql-parser/src/Fragments/FieldListFragment.php index cc070c1c64..cdf6428972 100644 --- a/libraries/sql-parser/src/Fragments/FieldListFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldListFragment.php @@ -41,7 +41,7 @@ class FieldListFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Fragments/IntoKeyword.php index cf65da6e5a..9117dce787 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Fragments/IntoKeyword.php @@ -76,7 +76,7 @@ class IntoKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/JoinKeyword.php b/libraries/sql-parser/src/Fragments/JoinKeyword.php index f8e1a57963..4d47ec409d 100644 --- a/libraries/sql-parser/src/Fragments/JoinKeyword.php +++ b/libraries/sql-parser/src/Fragments/JoinKeyword.php @@ -68,7 +68,7 @@ class JoinKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Fragments/KeyFragment.php index c27d7450de..7c165fe306 100644 --- a/libraries/sql-parser/src/Fragments/KeyFragment.php +++ b/libraries/sql-parser/src/Fragments/KeyFragment.php @@ -114,7 +114,7 @@ class KeyFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Fragments/LimitKeyword.php index 36efa0208e..06db20b692 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Fragments/LimitKeyword.php @@ -1,7 +1,7 @@ idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index fa06b0d780..5384a77414 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -56,13 +56,13 @@ class OptionsFragment extends Fragment /** * The ID that will be assigned to duplicate options. - * @var int + * @var int $lastAssignedId */ $lastAssignedId = count($options) + 1; /** * The option that was processed last time. - * @var array + * @var array $lastOption */ $lastOption = null; $lastOptionId = 0; @@ -72,7 +72,7 @@ class OptionsFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; @@ -95,7 +95,7 @@ class OptionsFragment extends Fragment // For example, in `SELECT` statements the keywords `ALL` and `DISTINCT` // conflict and if used together, they produce an invalid query. // Usually, tokens can be identified in the array by the option ID, - // but if conflicts occur, a psuedo option ID is used. + // but if conflicts occur, a generated option ID is used. // The first pseudo duplicate ID is the maximum value of the real // options (e.g. if there are 5 options, the first fake ID is 6). if (isset($ret->options[$lastOptionId])) { diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Fragments/OrderKeyword.php index 7a760841c1..710aff80f3 100644 --- a/libraries/sql-parser/src/Fragments/OrderKeyword.php +++ b/libraries/sql-parser/src/Fragments/OrderKeyword.php @@ -69,7 +69,7 @@ class OrderKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php index 23b84e3220..d766cff6a3 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Fragments/ParamDefFragment.php @@ -82,7 +82,7 @@ class ParamDefFragment extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php index ea10d20267..95e3d92bff 100644 --- a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ReferencesKeyword.php @@ -101,7 +101,7 @@ class ReferencesKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Fragments/RenameKeyword.php index de81848584..10cf7fd281 100644 --- a/libraries/sql-parser/src/Fragments/RenameKeyword.php +++ b/libraries/sql-parser/src/Fragments/RenameKeyword.php @@ -73,7 +73,7 @@ class RenameKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Fragments/SetKeyword.php index 713a179c84..d9e0871d15 100644 --- a/libraries/sql-parser/src/Fragments/SetKeyword.php +++ b/libraries/sql-parser/src/Fragments/SetKeyword.php @@ -69,7 +69,7 @@ class SetKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/ValuesKeyword.php b/libraries/sql-parser/src/Fragments/ValuesKeyword.php index c867551599..bed0c5fe3c 100644 --- a/libraries/sql-parser/src/Fragments/ValuesKeyword.php +++ b/libraries/sql-parser/src/Fragments/ValuesKeyword.php @@ -67,7 +67,7 @@ class ValuesKeyword extends Fragment for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Fragments/WhereKeyword.php index 4ce63a4885..90fc0fa484 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Fragments/WhereKeyword.php @@ -33,7 +33,7 @@ class WhereKeyword extends Fragment public static $DELIMITERS = array('&&', 'AND', 'OR', 'XOR', '||'); /** - * Hashmap containing reserved keywords that are also operators. + * Hash map containing reserved keywords that are also operators. * * @var array */ @@ -87,7 +87,7 @@ class WhereKeyword extends Fragment /** * Counts brackets. - * @var int + * @var int $brackets */ $brackets = 0; @@ -104,7 +104,7 @@ class WhereKeyword extends Fragment /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index 01d41d88c7..17b3f35df9 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -36,7 +36,7 @@ class Lexer public static $PARSER_METHODS = array( // It is best to put the parsers in order of their complexity - // (ascending) and their occurance rate (descending). + // (ascending) and their occurrence rate (descending). // // Conflicts: // @@ -112,7 +112,7 @@ class Lexer /** * The length of the delimiter. * - * Because `parseDelimter` can be called a lot, it would perform a lot of + * Because `parseDelimiter` can be called a lot, it would perform a lot of * calls to `strlen`, which might affect performance when the delimiter is * big. * @@ -121,11 +121,11 @@ class Lexer public $delimiterLen = 1; /** - * List of errors that occured during lexing. + * List of errors that occurred during lexing. * - * Usually, the lexing does not stop once an error occured because that - * error might be misdetected or a partial result (even a bad one) might be - * needed. + * Usually, the lexing does not stop once an error occurred because that + * error might be false positive or a partial result (even a bad one) + * might be needed. * * @var LexerException[] * @@ -149,7 +149,7 @@ class Lexer } /** - * Parses the string and extracts lexems. + * Parses the string and extracts lexemes. * * @return void */ @@ -165,12 +165,17 @@ class Lexer // Another example is `parseComment`. $list = new TokensList(); + + /** + * Last processed token. + * @var Token $lastToken + */ $lastToken = null; for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) { /** * The new token. - * @var Token + * @var Token $token */ $token = null; @@ -243,7 +248,7 @@ class Lexer $lastToken = $token; } - // Adding a final delimite at the end to mark the ending. + // Adding a final delimiter to mark the ending. $list->tokens[$list->count++] = new Token(null, Token::TYPE_DELIMITER); // Saving the tokens list. @@ -258,6 +263,8 @@ class Lexer * @param int $pos The position of the character. * @param int $code The code of the error. * + * @throws LexerException Throws the exception, if strict mode is enabled. + * * @return void */ public function error($msg = '', $str = '', $pos = 0, $code = 0) @@ -280,19 +287,19 @@ class Lexer /** * Value to be returned. - * @var Token + * @var Token $ret */ $ret = null; /** * The value of `$this->last` where `$token` ends in `$this->str`. - * @var int + * @var int $iEnd */ $iEnd = $this->last; /** * Whether last parsed character is a whitespace. - * @var bool + * @var bool $lastSpace */ $lastSpace = false; @@ -336,13 +343,13 @@ class Lexer /** * Value to be returned. - * @var Token|bool + * @var Token $ret */ $ret = null; /** * The value of `$this->last` where `$token` ends in `$this->str`. - * @var int + * @var int $iEnd */ $iEnd = $this->last; diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 3c574063d1..124848f320 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -227,11 +227,11 @@ class Parser public $strict = false; /** - * List of errors that occured during parsing. + * List of errors that occurred during parsing. * - * Usually, the parsing does not stop once an error occured because that - * error might be misdetected or a partial result (even a bad one) might be - * needed. + * Usually, the parsing does not stop once an error occurred because that + * error might be a false positive or a partial result (even a bad one) + * might be needed. * * @var ParserException[] * @@ -278,25 +278,25 @@ class Parser /** * Last parsed statement. - * @var Statement + * @var Statement $lastStatement */ $lastStatement = null; /** * Whether a union is parsed or not. - * @var bool + * @var bool $inUnion */ $inUnion = true; /** * The index of the last token from the last statement. - * @var int + * @var int $prevLastIdx */ $prevLastIdx = -1; /** * The list of tokens. - * @var TokensList + * @var TokensList $list */ $list = &$this->list; @@ -304,7 +304,7 @@ class Parser /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; @@ -334,13 +334,13 @@ class Parser /** * The name of the class that is used for parsing. - * @var string + * @var string $class */ $class = static::$STATEMENT_PARSERS[$token->value]; /** * Processed statement. - * @var Statement + * @var Statement $stmt */ $stmt = new $class($this, $this->list); @@ -377,6 +377,8 @@ class Parser * @param Token $token The token that produced the error. * @param int $code The code of the error. * + * @throws ParserException Throws the exception, if strict mode is enabled. + * * @return void */ public function error($msg = '', Token $token = null, $code = 0) diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 5ef7aec4a4..16b1819879 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -10,9 +10,6 @@ */ namespace SqlParser; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Token; use SqlParser\Fragments\OptionsFragment; /** @@ -85,7 +82,7 @@ abstract class Statement { /** * Query to be returned. - * @var string + * @var string $query */ $query = ''; @@ -93,14 +90,14 @@ abstract class Statement /** * The name of the clause. - * @var string + * @var string $name */ $name = $clause[0]; /** * The type of the clause. * @see self::$CLAUSES - * @var int + * @var int $type */ $type = $clause[1]; @@ -111,14 +108,14 @@ abstract class Statement /** * The builder (parser) of this clause. - * @var string + * @var string $class */ $class = Parser::$KEYWORD_PARSERS[$name]['class']; /** * The name of the field that is used as source for the builder. * Same field is used to store the result of parsing. - * @var string + * @var string $field */ $field = Parser::$KEYWORD_PARSERS[$name]['field']; @@ -158,14 +155,14 @@ abstract class Statement * Whether options were parsed or not. * For statements that do not have any options this is set to `true` by * default. - * @var bool + * @var bool $parsedOptions */ $parsedOptions = isset(static::$OPTIONS) ? false : true; for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; @@ -188,19 +185,19 @@ abstract class Statement /** * The name of the class that is used for parsing. - * @var string + * @var string $class */ $class = null; /** * The name of the field where the result of the parsing is stored. - * @var string + * @var string $field */ $field = null; /** * Parser's options. - * @var array + * @var array $options */ $options = array(); @@ -223,7 +220,7 @@ abstract class Statement $parsedOptions = true; } } elseif ($class === null) { - // There is no parser for this keyword and isn't the beggining + // There is no parser for this keyword and isn't the beginning // of a statement (so no options) either. $parser->error( 'Unrecognized keyword "' . $token->value . '".', diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index 92f3744a7d..24de371d63 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -96,7 +96,7 @@ class AlterStatement extends Statement for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. - * @var Token + * @var Token $token */ $token = $list->tokens[$list->idx]; diff --git a/libraries/sql-parser/src/Statements/AnalyzeStatement.php b/libraries/sql-parser/src/Statements/AnalyzeStatement.php index 850a27aa4f..be3a4f36db 100644 --- a/libraries/sql-parser/src/Statements/AnalyzeStatement.php +++ b/libraries/sql-parser/src/Statements/AnalyzeStatement.php @@ -9,6 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\FieldFragment; /** * `ANALYZE` statement. diff --git a/libraries/sql-parser/src/Statements/BackupStatement.php b/libraries/sql-parser/src/Statements/BackupStatement.php index c8e0977a2c..5a58a2acb4 100644 --- a/libraries/sql-parser/src/Statements/BackupStatement.php +++ b/libraries/sql-parser/src/Statements/BackupStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\MaintenanceStatement; - /** * `BACKUP` statement. * diff --git a/libraries/sql-parser/src/Statements/CallStatement.php b/libraries/sql-parser/src/Statements/CallStatement.php index 0e83282007..4ad8f708a2 100644 --- a/libraries/sql-parser/src/Statements/CallStatement.php +++ b/libraries/sql-parser/src/Statements/CallStatement.php @@ -9,6 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\CallKeyword; /** * `CALL` statement. diff --git a/libraries/sql-parser/src/Statements/CheckStatement.php b/libraries/sql-parser/src/Statements/CheckStatement.php index 2e0e5a37b7..8ffa9460f5 100644 --- a/libraries/sql-parser/src/Statements/CheckStatement.php +++ b/libraries/sql-parser/src/Statements/CheckStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\MaintenanceStatement; - /** * `CHECK` statement. * diff --git a/libraries/sql-parser/src/Statements/ChecksumStatement.php b/libraries/sql-parser/src/Statements/ChecksumStatement.php index 0495932702..7c66bed786 100644 --- a/libraries/sql-parser/src/Statements/ChecksumStatement.php +++ b/libraries/sql-parser/src/Statements/ChecksumStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\MaintenanceStatement; - /** * `CHECKSUM` statement. * diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 0fb51932bd..ede120e893 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -41,12 +41,10 @@ class CreateStatement extends Statement // CREATE TABLE 'TEMPORARY' => 1, - // CREATE FUNCTION / PROCEDURE and CREATE VIEW - 'DEFINER' => array(1, 'var='), - // CREATE VIEW 'OR REPLACE' => array(2, 'var='), 'ALGORITHM' => array(3, 'var='), + // `DEFINER` is also used for `CREATE FUNCTION / PROCEDURE` 'DEFINER' => array(4, 'var='), 'SQL SECURITY' => array(5, 'var'), @@ -109,11 +107,11 @@ class CreateStatement extends Statement 'LANGUAGE SQL' => 2, 'DETERMINISTIC' => 3, 'NOT DETERMINISTIC' => 3, - 'CONSTAINS SQL' => 4, + 'CONTAINS SQL' => 4, 'NO SQL' => 4, 'READS SQL DATA' => 4, 'MODIFIES SQL DATA' => 4, - 'SQL SEQURITY DEFINER' => array(5, 'var'), + 'SQL SECURITY DEFINER' => array(5, 'var'), ); /** diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php index 04208fc094..4d9dbceb08 100644 --- a/libraries/sql-parser/src/Statements/DeleteStatement.php +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -9,6 +9,11 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\ArrayFragment; +use SqlParser\Fragments\FieldFragment; +use SqlParser\Fragments\LimitKeyword; +use SqlParser\Fragments\OrderKeyword; +use SqlParser\Fragments\WhereKeyword; /** * `DELETE` statement. diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php index f0cd1ced87..2c4faaf686 100644 --- a/libraries/sql-parser/src/Statements/DropStatement.php +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -9,6 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\FieldFragment; /** * `DROP` statement. diff --git a/libraries/sql-parser/src/Statements/ExplainStatement.php b/libraries/sql-parser/src/Statements/ExplainStatement.php index 2a34b0d77e..eb869643cb 100644 --- a/libraries/sql-parser/src/Statements/ExplainStatement.php +++ b/libraries/sql-parser/src/Statements/ExplainStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\NotImplementedStatement; - /** * `EXPLAIN` statement. * diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php index 385e4bf03e..fbb96cb024 100644 --- a/libraries/sql-parser/src/Statements/InsertStatement.php +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -9,6 +9,8 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\IntoKeyword; +use SqlParser\Fragments\ValuesKeyword; /** * `INSERT` statement. diff --git a/libraries/sql-parser/src/Statements/MaintenanceStatement.php b/libraries/sql-parser/src/Statements/MaintenanceStatement.php index 97c87b94b1..3d21538e83 100644 --- a/libraries/sql-parser/src/Statements/MaintenanceStatement.php +++ b/libraries/sql-parser/src/Statements/MaintenanceStatement.php @@ -12,6 +12,7 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; +use SqlParser\Fragments\FieldFragment; use SqlParser\Fragments\OptionsFragment; /** diff --git a/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/libraries/sql-parser/src/Statements/NotImplementedStatement.php index f5f8b8f0a1..0a1dc338eb 100644 --- a/libraries/sql-parser/src/Statements/NotImplementedStatement.php +++ b/libraries/sql-parser/src/Statements/NotImplementedStatement.php @@ -29,6 +29,7 @@ class NotImplementedStatement extends Statement /** * The part of the statement that can't be parsed. + * * @var Token[] */ public $unknown = array(); diff --git a/libraries/sql-parser/src/Statements/OptimizeStatement.php b/libraries/sql-parser/src/Statements/OptimizeStatement.php index f163b8705e..242979cc6d 100644 --- a/libraries/sql-parser/src/Statements/OptimizeStatement.php +++ b/libraries/sql-parser/src/Statements/OptimizeStatement.php @@ -9,6 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\FieldFragment; /** * `OPTIMIZE` statement. diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php index 473efe0ad2..fc7a1480c4 100644 --- a/libraries/sql-parser/src/Statements/RenameStatement.php +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -12,6 +12,7 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; +use SqlParser\Fragments\RenameKeyword; /** * `RENAME` statement. diff --git a/libraries/sql-parser/src/Statements/RepairStatement.php b/libraries/sql-parser/src/Statements/RepairStatement.php index e340dd12e0..b1d840b624 100644 --- a/libraries/sql-parser/src/Statements/RepairStatement.php +++ b/libraries/sql-parser/src/Statements/RepairStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\MaintenanceStatement; - /** * `REPAIR` statement. * diff --git a/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index 8df7cb462a..f88b2295ca 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -9,6 +9,9 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\IntoKeyword; +use SqlParser\Fragments\SetKeyword; +use SqlParser\Fragments\ValuesKeyword; /** * `REPLACE` statement. diff --git a/libraries/sql-parser/src/Statements/RestoreStatement.php b/libraries/sql-parser/src/Statements/RestoreStatement.php index 1c03e29df1..be83dd64e1 100644 --- a/libraries/sql-parser/src/Statements/RestoreStatement.php +++ b/libraries/sql-parser/src/Statements/RestoreStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\MaintenanceStatement; - /** * `RESTORE` statement. * diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index b5d0b0a840..5066989c75 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -9,6 +9,14 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\ArrayFragment; +use SqlParser\Fragments\CallKeyword; +use SqlParser\Fragments\FieldFragment; +use SqlParser\Fragments\IntoKeyword; +use SqlParser\Fragments\JoinKeyword; +use SqlParser\Fragments\LimitKeyword; +use SqlParser\Fragments\OrderKeyword; +use SqlParser\Fragments\WhereKeyword; /** * `SELECT` statement. diff --git a/libraries/sql-parser/src/Statements/ShowStatement.php b/libraries/sql-parser/src/Statements/ShowStatement.php index 02da79d54a..ae8cb3f55c 100644 --- a/libraries/sql-parser/src/Statements/ShowStatement.php +++ b/libraries/sql-parser/src/Statements/ShowStatement.php @@ -8,8 +8,6 @@ */ namespace SqlParser\Statements; -use SqlParser\Statements\NotImplementedStatement; - /** * `SHOW` statement. * diff --git a/libraries/sql-parser/src/Statements/TruncateStatement.php b/libraries/sql-parser/src/Statements/TruncateStatement.php index 9313204b5e..5a08a79bf2 100644 --- a/libraries/sql-parser/src/Statements/TruncateStatement.php +++ b/libraries/sql-parser/src/Statements/TruncateStatement.php @@ -8,16 +8,8 @@ */ namespace SqlParser\Statements; -use SqlParser\Parser; use SqlParser\Statement; -use SqlParser\Token; -use SqlParser\TokensList; -use SqlParser\Fragments\ArrayFragment; -use SqlParser\Fragments\DataTypeFragment; -use SqlParser\Fragments\FieldDefFragment; use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\OptionsFragment; -use SqlParser\Fragments\ParamDefFragment; /** * `TRUNCATE` statement. diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php index ab445dc34a..7418d64e51 100644 --- a/libraries/sql-parser/src/Statements/UpdateStatement.php +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -9,6 +9,11 @@ namespace SqlParser\Statements; use SqlParser\Statement; +use SqlParser\Fragments\FieldFragment; +use SqlParser\Fragments\LimitKeyword; +use SqlParser\Fragments\OrderKeyword; +use SqlParser\Fragments\SetKeyword; +use SqlParser\Fragments\WhereKeyword; /** * `UPDATE` statement. diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php index fa23d2870f..c57b907eca 100644 --- a/libraries/sql-parser/src/Token.php +++ b/libraries/sql-parser/src/Token.php @@ -25,7 +25,7 @@ class Token /** * This type is used when the token is invalid or its type cannot be - * determiend because of the ambigous context. Further analysis might be + * determined because of the ambiguous context. Further analysis might be * required to detect its type. * * @var int @@ -186,7 +186,7 @@ class Token public $flags; /** - * The position in the inial string where this token started. + * The position in the initial string where this token started. * * @var int */ diff --git a/libraries/sql-parser/src/UtfString.php b/libraries/sql-parser/src/UtfString.php index bab15afe1d..27e3f93008 100644 --- a/libraries/sql-parser/src/UtfString.php +++ b/libraries/sql-parser/src/UtfString.php @@ -28,7 +28,7 @@ class UtfString implements \ArrayAccess { /** - * The raw, multibyte string. + * The raw, multi-byte string. * * @var string */ @@ -143,6 +143,8 @@ class UtfString implements \ArrayAccess * @param int $offset The offset to be set. * @param string $value The value to be set. * + * @throws \Exception Not implemented. + * * @return void */ public function offsetSet($offset, $value) @@ -155,6 +157,8 @@ class UtfString implements \ArrayAccess * * @param int $offset The value to be unset. * + * @throws \Exception Not implemented. + * * @return void */ public function offsetUnset($offset) @@ -166,7 +170,7 @@ class UtfString implements \ArrayAccess * Gets the length of an UTF-8 character. * * According to RFC 3629, a UTF-8 character can have at most 4 bytes. - * However, this implemenation supports UTF-8 characters containing up to 6 + * However, this implementation supports UTF-8 characters containing up to 6 * bytes. * * @param string $byte The byte to be analyzed. diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index 41c62ed623..e0fbb959c2 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -8,7 +8,6 @@ */ namespace SqlParser\Utils; -use SqlParser\Statement; use SqlParser\Statements\SelectStatement; /** @@ -26,8 +25,8 @@ class Misc /** * Gets a list of all aliases and their original names. * - * @param Statement $statement The statement to be processed. - * @param string $database The name of the database. + * @param SelectStatement $statement The statement to be processed. + * @param string $database The name of the database. * * @return array */ diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index 1f05711d36..ba0d384680 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -500,7 +500,7 @@ class Query * 0 only for the clause * 1 for everything after * If string, the name of the first clause that - * shouldn't be included. + * should not be included. * @param bool $skipFirst Whether to skip the first keyword in clause. * * @return string @@ -510,44 +510,44 @@ class Query /** * The index of the current clause. - * @var int + * @var int $currIdx */ $currIdx = 0; /** * The count of brackets. * We keep track of them so we won't insert the clause in a subquery. - * @var int + * @var int $brackets */ $brackets = 0; /** * The string to be returned. - * @var string + * @var string $ret */ $ret = ''; /** * The clauses of this type of statement and their index. - * @var array + * @var array $clauses */ $clauses = array_flip(array_keys($statement::$CLAUSES)); /** * Lexer used for lexing the clause. - * @var Lexer + * @var Lexer $lexer */ $lexer = new Lexer($clause); /** * The type of this clause. - * @var string + * @var string $clauseType */ $clauseType = $lexer->list->getNextOfType(Token::TYPE_KEYWORD)->value; /** * The index of this clause. - * @var int + * @var int $clauseIdx */ $clauseIdx = $clauses[$clauseType]; @@ -669,7 +669,7 @@ class Query /** * Value to be returned. - * @var string + * @var string $ret */ $ret = ''; diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 8298d8d73f..f75d0d931a 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -10,7 +10,6 @@ namespace SqlParser\Utils; use SqlParser\Lexer; use SqlParser\Parser; -use SqlParser\Statement; use SqlParser\Fragments\DataTypeFragment; use SqlParser\Fragments\ParamDefFragment; use SqlParser\Statements\CreateStatement; diff --git a/libraries/sql-parser/src/Utils/Table.php b/libraries/sql-parser/src/Utils/Table.php index ba7f82fd80..aa8cea69f3 100644 --- a/libraries/sql-parser/src/Utils/Table.php +++ b/libraries/sql-parser/src/Utils/Table.php @@ -8,11 +8,6 @@ */ namespace SqlParser\Utils; -use SqlParser\Lexer; -use SqlParser\Parser; -use SqlParser\Statement; -use SqlParser\Fragments\DataTypeFragment; -use SqlParser\Fragments\ParamDefFragment; use SqlParser\Statements\CreateStatement; /** From c123e0f7b470856578a6db0cc4e314475fc6b45e Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 9 Jul 2015 00:55:32 +0300 Subject: [PATCH 44/57] Replaced the old parser in utilities. Updated sql-parser library to udan11/sql-parser@9478c9a. Signed-off-by: Dan Ungureanu --- libraries/Util.class.php | 234 +++++++++---------- libraries/plugins/export/ExportSql.class.php | 16 +- libraries/sql-parser/src/Utils/Error.php | 94 ++++++++ 3 files changed, 214 insertions(+), 130 deletions(-) create mode 100644 libraries/sql-parser/src/Utils/Error.php diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 4076bfc5f5..9d6499cc0b 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -585,68 +585,105 @@ class PMA_Util * Displays a MySQL error message in the main panel when $exit is true. * Returns the error message otherwise. * - * @param string|bool $error_message the error message - * @param string $the_query the sql query that failed - * @param bool $is_modify_link whether to show a "modify" link or not - * @param string $back_url the "back" link url (full path is not - * required) - * @param bool $exit EXIT the page? + * @param string|bool $esrver_msg Server's error message. + * @param string $sql_query The SQL query that failed. + * @param bool $is_modify_link Whether to show a "modify" link or not. + * @param string $back_url URL for the "back" link (full path is + * not required). + * @param bool $exit Whether execution should be stopped or + * the error message should be returned. * * @return string * - * @global string $table the current table - * @global string $db the current db + * @global string $table The current table. + * @global string $db The current database. * * @access public */ public static function mysqlDie( - $error_message = '', $the_query = '', + $server_msg = '', $sql_query = '', $is_modify_link = true, $back_url = '', $exit = true ) { global $table, $db; + /** + * Error message to be built. + * @var string $error_msg + */ $error_msg = ''; - if (! $error_message) { - $error_message = $GLOBALS['dbi']->getError(); - } - if (! $the_query && ! empty($GLOBALS['sql_query'])) { - $the_query = $GLOBALS['sql_query']; + // Checking for any server errors. + if (empty($server_msg)) { + $server_msg = $GLOBALS['dbi']->getError(); } - // --- Added to solve bug #641765 - if (! function_exists('PMA_SQP_isError') || PMA_SQP_isError()) { - $formatted_sql = htmlspecialchars($the_query); - } elseif (empty($the_query) || (trim($the_query) == '')) { - $formatted_sql = ''; + // Finding the query that failed, if not specified. + if ((empty($sql_query) && (!empty($GLOBALS['sql_query'])))) { + $sql_query = $GLOBALS['sql_query']; + } + $sql_query = trim($sql_query); + + /** + * The lexer used for analysis. + * @var SqlParser\Lexer $lexer + */ + $lexer = new SqlParser\Lexer($sql_query); + + /** + * The parser used for analysis. + * @var SqlParser\Parser $parser + */ + $parser = new SqlParser\Parser($lexer->list); + + /** + * The errors found by the lexer and the parser. + * @var array $errors + */ + $errors = SqlParser\Utils\Error::get(array($lexer, $parser)); + + if (empty($sql_query)) { + $formated_sql = ''; + } elseif (count($errors)) { + $formatted_sql = htmlspecialchars($sql_query); } else { - $formatted_sql = self::formatSql($the_query, true); + $formatted_sql = self::formatSql($sql_query, true); } - // --- - $error_msg .= "\n" . '' . "\n"; - $error_msg .= '

' . __('Error') - . '

' . "\n"; - // if the config password is wrong, or the MySQL server does not - // respond, do not show the query that would reveal the - // username/password - if (! empty($the_query) && ! /*overload*/mb_strstr($the_query, 'connect')) { - // --- Added to solve bug #641765 - if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) { - $error_msg .= PMA_SQP_getErrorString() . "\n"; - $error_msg .= '
' . "\n"; + $error_msg .= '

' . __('Error') . '

'; + + // For security reasons, if the MySQL refuses the connection, the query + // is hidden so no details are revealed. + if ((!empty($sql_query)) && (!(mb_strstr($sql_query, 'connect')))) { + + // Static analysis errors. + if (!empty($errors)) { + $error_msg .= '

' . __('Static analysis:') . '

'; + $error_msg .= '

' . sprintf( + __('%d errors were found during analysis.'), count($errors) + ) . '

'; + $error_msg .= '

    '; + $error_msg .= implode( + SqlParser\Utils\Error::format( + $errors, + '
  1. %2$s (near "%4$s" at position %5$d)
    2. ' + ) + ); + $error_msg .= '

'; } - // --- - // modified to show the help on sql errors + + // Display the SQL query and link to MySQL documentation. $error_msg .= '

' . __('SQL query:') . '' . "\n"; $formattedSqlToLower = /*overload*/mb_strtolower($formatted_sql); + + // TODO: Show documentation for all statement types. if (/*overload*/mb_strstr($formattedSqlToLower, 'select')) { // please show me help to the error on select $error_msg .= self::showMySQLDocu('SELECT'); } + if ($is_modify_link) { $_url_params = array( - 'sql_query' => $the_query, + 'sql_query' => $sql_query, 'show_query' => 1, ); if (/*overload*/mb_strlen($table)) { @@ -666,46 +703,47 @@ class PMA_Util $error_msg .= $doedit_goto . self::getIcon('b_edit.png', __('Edit')) . ''; - } // end if + } + $error_msg .= '

' . "\n" . '

' . "\n" . $formatted_sql . "\n" . '

' . "\n"; - } // end if + } - if (! empty($error_message)) { - $error_message = preg_replace( + // Display server's error. + if (!empty($server_msg)) { + $server_msg = preg_replace( "@((\015\012)|(\015)|(\012)){3,}@", "\n\n", - $error_message + $server_msg ); + + // Adds a link to MySQL documentation. + $error_msg .= '

' . "\n" + . ' ' . __('MySQL said: ') . '' + . self::showMySQLDocu('Error-messages-server') + . "\n" + . '

' . "\n"; + + // The error message will be displayed within a CODE segment. + // To preserve original formatting, but allow word-wrapping, + // a couple of replacements are done. + // All non-single blanks and TAB-characters are replaced with their + // HTML-counterpart + $server_msg = str_replace( + array(' ', "\t"), + array('  ', '    '), + $server_msg + ); + + // Replace line breaks + $server_msg = nl2br($server_msg); + + $error_msg .= '' . $server_msg . '
'; } - // modified to show the help on error-returns - // (now error-messages-server) - $error_msg .= '

' . "\n" - . ' ' . __('MySQL said: ') . '' - . self::showMySQLDocu('Error-messages-server') - . "\n" - . '

' . "\n"; - // The error message will be displayed within a CODE segment. - // To preserve original formatting, but allow wordwrapping, - // we do a couple of replacements - - // Replace all non-single blanks with their HTML-counterpart - $error_message = str_replace(' ', '  ', $error_message); - // Replace TAB-characters with their HTML-counterpart - $error_message = str_replace( - "\t", '    ', $error_message - ); - // Replace line breaks - $error_message = nl2br($error_message); - - $error_msg .= '' . "\n" - . $error_message . "\n" - . '
' . "\n"; $error_msg .= '
'; - $_SESSION['Import_message']['message'] = $error_msg; if (!$exit) { @@ -713,19 +751,17 @@ class PMA_Util } /** - * If in an Ajax request - * - avoid displaying a Back link - * - use PMA_Response() to transmit the message and exit + * If this is an AJAX request, there is no "Back" link and + * `PMA_Response()` is used to send the response. */ - if (isset($GLOBALS['is_ajax_request']) - && $GLOBALS['is_ajax_request'] == true - ) { + if (!empty($GLOBALS['is_ajax_request'])) { $response = PMA_Response::getInstance(); $response->isSuccess(false); $response->addJSON('message', $error_msg); exit; } - if (! empty($back_url)) { + + if (!empty($back_url)) { if (/*overload*/mb_strstr($back_url, '?')) { $back_url .= '&no_history=true'; } else { @@ -738,9 +774,9 @@ class PMA_Util . '[ ' . __('Back') . ' ]' . '' . "\n\n"; } - echo $error_msg; - exit; - } // end of the 'mysqlDie()' function + + exit($error_msg); + } /** * Check the correct row count @@ -1087,56 +1123,6 @@ class PMA_Util ) . '[...]' ) ); - } elseif (! empty($GLOBALS['parsed_sql']) - && $query_base == $GLOBALS['parsed_sql']['raw'] - ) { - // (here, use "! empty" because when deleting a bookmark, - // $GLOBALS['parsed_sql'] is set but empty - $parsed_sql = $GLOBALS['parsed_sql']; - } else { - // Parse SQL if needed - $parsed_sql = PMA_SQP_parse($query_base); - } - - // Analyze it - if (isset($parsed_sql) && ! PMA_SQP_isError()) { - $analyzed_display_query = PMA_SQP_analyze($parsed_sql); - - // Same as below (append LIMIT), append the remembered ORDER BY - if ($GLOBALS['cfg']['RememberSorting'] - && isset($analyzed_display_query[0]['queryflags']['select_from']) - && isset($GLOBALS['sql_order_to_append']) - ) { - $query_base = $analyzed_display_query[0]['section_before_limit'] - . "\n" . $GLOBALS['sql_order_to_append'] - . $analyzed_display_query[0]['limit_clause'] . ' ' - . $analyzed_display_query[0]['section_after_limit']; - // update the $analyzed_display_query - $analyzed_display_query[0]['section_before_limit'] - .= $GLOBALS['sql_order_to_append']; - $analyzed_display_query[0]['order_by_clause'] - = $GLOBALS['sorted_col']; - } - - // Here we append the LIMIT added for navigation, to - // enable its display. Adding it higher in the code - // to $sql_query would create a problem when - // using the Refresh or Edit links. - - // Only append it on SELECTs. - - /** - * @todo what would be the best to do when someone hits Refresh: - * use the current LIMITs ? - */ - - if (isset($analyzed_display_query[0]['queryflags']['select_from']) - && ! empty($GLOBALS['sql_limit_to_append']) - ) { - $query_base = $analyzed_display_query[0]['section_before_limit'] - . "\n" . $GLOBALS['sql_limit_to_append'] - . $analyzed_display_query[0]['section_after_limit']; - } } if (! empty($GLOBALS['show_as_php'])) { diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index cc3acdef63..08233d288d 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -2564,12 +2564,6 @@ class ExportSql extends ExportPlugin */ $old_database = $db; - /** - * Old table name. - * @var string $old_table - */ - $old_table = $table; - // Replacing aliases in `CREATE TABLE` statement. if ($statement->options->has('TABLE')) { @@ -2578,6 +2572,11 @@ class ExportSql extends ExportPlugin if (!empty($statement->name->database)) { $old_database = $statement->name->database; } + + /** + * Old table name. + * @var string $old_table + */ $old_table = $statement->name->table; // Finding the aliased database name. @@ -2652,6 +2651,11 @@ class ExportSql extends ExportPlugin if (!empty($statement->table->database)) { $old_database = $statement->table->database; } + + /** + * Old table name. + * @var string $old_table + */ $old_table = $statement->table->table; if (!empty($aliases[$old_database]['tables'][$old_table]['alias'])) { diff --git a/libraries/sql-parser/src/Utils/Error.php b/libraries/sql-parser/src/Utils/Error.php new file mode 100644 index 0000000000..c1bfee1c0a --- /dev/null +++ b/libraries/sql-parser/src/Utils/Error.php @@ -0,0 +1,94 @@ + + * @license http://opensource.org/licenses/GPL-2.0 GNU Public License + */ +class Error +{ + + /** + * Gets the errors of a lexer and a parser. + * + * @param array $objs + * + * @return array Each element of the array represents an error. + * `$err[0]` holds the error message. + * `$err[1]` holds the error code. + * `$err[2]` holds the string that caused the issue. + * `$err[3]` holds the position of the string. + * (i.e. `array($msg, $code, $str, $pos)`) + */ + public static function get($objs) + { + $ret = array(); + + foreach ($objs as $obj) { + if ($obj instanceof Lexer) { + foreach ($obj->errors as $err) { + $ret[] = array( + $err->getMessage(), + $err->getCode(), + $err->ch, + $err->pos + ); + } + } elseif ($obj instanceof Parser) { + foreach ($obj->errors as $err) { + $ret[] = array( + $err->getMessage(), + $err->getCode(), + $err->token->token, + $err->token->position + ); + } + } + } + + return $ret; + } + + /** + * Formats the specified errors + * + * @param array $errors The errors to be formatted. + * @param string $format The format of an error. + * '$1$d' is replaced by the position of this error. + * '$2$s' is replaced by the error message. + * '$3$d' is replaced by the error code. + * '$4$s' is replaced by the string that caused the + * issue. + * '$5$d' is replaced by the position of the string. + * @return array + */ + public static function format( + $errors, $format = '#%1$d: %2$s (near "%4$s" at position %5$d)' + ) { + $ret = array(); + + $i = 0; + foreach ($errors as $key => $err) { + $ret[$key] = sprintf( + $format, ++$i, $err[0], $err[1], $err[2], $err[3] + ); + } + + return $ret; + } +} From 19cdd09c08fa6ba13839e8b03484d015b6ea8610 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 9 Jul 2015 00:56:27 +0300 Subject: [PATCH 45/57] Removed dead code. Signed-off-by: Dan Ungureanu --- libraries/parse_analyze.inc.php | 5 ----- .../abstract/SQLTransformationsPlugin.class.php | 2 -- 2 files changed, 7 deletions(-) diff --git a/libraries/parse_analyze.inc.php b/libraries/parse_analyze.inc.php index bd56c23584..1bd9f46e69 100644 --- a/libraries/parse_analyze.inc.php +++ b/libraries/parse_analyze.inc.php @@ -14,11 +14,6 @@ $GLOBALS['unparsed_sql'] = $sql_query; // Get details about the SQL query. $analyzed_sql_results = SqlParser\Utils\Query::getAll($sql_query); -// Adding data fetched from the old parser and analyzer. -// TODO: Finish replacing all calls to `PMA_SQP_*`. -$analyzed_sql_results['parsed_sql'] = PMA_SQP_parse($sql_query); -$analyzed_sql_results['analyzed_sql'] = PMA_SQP_analyze($analyzed_sql_results['parsed_sql']); - // TODO: Refactor this. extract($analyzed_sql_results); diff --git a/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php b/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php index 09804f7ef7..accc8cdd88 100644 --- a/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php +++ b/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php @@ -45,8 +45,6 @@ abstract class SQLTransformationsPlugin extends TransformationsPlugin { // see PMA_highlightSQL() $result = PMA_Util::formatSql($buffer); - // Need to clear error state not to break subsequent queries display. - PMA_SQP_resetError(); return $result; } From ae733edf417d26e45fa19f5c7a5f095f39f8f254 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 9 Jul 2015 01:38:53 +0300 Subject: [PATCH 46/57] Removed the old parser. Signed-off-by: Dan Ungureanu --- libraries/common.inc.php | 12 +- libraries/sqlparser.data.php | 997 ------ libraries/sqlparser.lib.php | 2997 ----------------- sql.php | 1 - test/classes/PMA_DBQbe_test.php | 1 - test/classes/PMA_TableSearch_test.php | 1 - test/classes/PMA_Table_test.php | 1 - test/classes/PMA_Theme_test.php | 1 - test/classes/dbi/DBIDrizzle_test.php | 1 - test/classes/dbi/DBIMysql_test.php | 1 - test/classes/dbi/DBIMysqli_test.php | 1 - .../plugin/export/PMA_ExportSql_test.php | 1 - .../plugin/export/PMA_ExportTexytext_test.php | 1 - .../Transformation_Plugins_test.php | 1 - .../schema/Dia_Relation_Schema_test.php | 1 - .../schema/Eps_Relation_Schema_test.php | 1 - .../schema/Pdf_Relation_Schema_test.php | 1 - .../schema/Svg_Relation_Schema_test.php | 1 - test/libraries/PMA_GIS_modifyQuery_test.php | 1 - test/libraries/PMA_SQL_parse_analyze_test.php | 79 - test/libraries/PMA_SQL_parser_data_test.php | 123 - test/libraries/PMA_SQL_parser_test.php | 435 --- test/libraries/PMA_central_columns_test.php | 1 - test/libraries/PMA_display_export_test.php | 1 - test/libraries/PMA_import_test.php | 1 - test/libraries/PMA_mult_submits_test.php | 1 - test/libraries/PMA_select_server_test.php | 1 - test/libraries/PMA_server_binlog_test.php | 1 - test/libraries/PMA_server_collations_test.php | 1 - test/libraries/PMA_server_databases_test.php | 1 - test/libraries/PMA_server_engines_test.php | 1 - test/libraries/PMA_server_plugins_test.php | 1 - test/libraries/PMA_server_privileges_test.php | 1 - .../libraries/PMA_server_replication_test.php | 1 - .../PMA_server_status_advisor_test.php | 1 - .../PMA_server_status_monitor_test.php | 1 - .../PMA_server_status_queries_test.php | 1 - .../PMA_server_status_variables_test.php | 1 - test/libraries/PMA_server_variables_test.php | 1 - test/libraries/PMA_sql_query_form_test.php | 1 - test/libraries/PMA_structure_test.php | 1 - test/libraries/common/PMA_formatSql_test.php | 1 - .../common/PMA_quoting_slashing_test.php | 1 - .../rte/PMA_RTN_getExecuteForm_test.php | 1 - 44 files changed, 11 insertions(+), 4670 deletions(-) delete mode 100644 libraries/sqlparser.data.php delete mode 100644 libraries/sqlparser.lib.php delete mode 100644 test/libraries/PMA_SQL_parse_analyze_test.php delete mode 100644 test/libraries/PMA_SQL_parser_data_test.php delete mode 100644 test/libraries/PMA_SQL_parser_test.php diff --git a/libraries/common.inc.php b/libraries/common.inc.php index c71ada952f..34ac26c71a 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1053,10 +1053,20 @@ if (! defined('PMA_MINIMUM_COMMON')) { $cfg['SkipLockedTables'] = false; } + /** + * Charset information + */ + if (!PMA_DRIZZLE) { + include_once './libraries/mysql_charsets.inc.php'; + } + if (!isset($mysql_charsets)) { + $mysql_charsets = array(); + $mysql_collations_flat = array(); + } + /** * SQL Parser code */ - include_once './libraries/sqlparser.lib.php'; include_once './libraries/sql-parser/autoload.php'; try { SqlParser\Context::load((PMA_DRIZZLE ? 'Drizzle' : 'MySql') . PMA_MYSQL_INT_VERSION); diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php deleted file mode 100644 index ec9451ccb1..0000000000 --- a/libraries/sqlparser.data.php +++ /dev/null @@ -1,997 +0,0 @@ - - * http://www.orbis-terrarum.net/?l=people.robbat2 - * - * This data is used by the SQL Parser to recognize keywords - * - * It has been extracted from the lex.h file in the MySQL BK tree - * (around 4.0.2) as well as the MySQL documentation. - * - * It's easier to use only uppercase for proper sorting. In case of - * doubt, use the test case to verify. - * - * @package PhpMyAdmin - */ -if (! defined('PHPMYADMIN')) { - exit; -} - -if (! isset($GLOBALS['sql_delimiter'])) { - $GLOBALS['sql_delimiter'] = ';'; -} - -/** - * @global array MySQL function names - */ -$PMA_SQPdata_function_name = array ( - 'ABS', - 'ACOS', - 'ADDDATE', - 'ADDTIME', - 'AES_DECRYPT', - 'AES_ENCRYPT', - 'AREA', // polygon-property-functions.html - 'ASBINARY', - 'ASCII', - 'ASIN', - 'ASTEXT', - 'ATAN', - 'ATAN2', - 'AVG', - 'BDMPOLYFROMTEXT', - 'BDMPOLYFROMWKB', - 'BDPOLYFROMTEXT', - 'BDPOLYFROMWKB', - 'BENCHMARK', - 'BIN', - 'BIT_AND', - 'BIT_COUNT', - 'BIT_LENGTH', - 'BIT_OR', - 'BIT_XOR', // group-by-functions.html - 'BOUNDARY', // general-geometry-property-functions.html - 'BUFFER', - 'CAST', - 'CEIL', - 'CEILING', - 'CENTROID', // multipolygon-property-functions.html - 'CHAR', // string-functions.html - 'CHARACTER_LENGTH', - 'CHARSET', // information-functions.html - 'CHAR_LENGTH', - 'COALESCE', - 'COERCIBILITY', // information-functions.html - 'COLLATION', // information-functions.html - 'COMPRESS', // string-functions.html - 'CONCAT', - 'CONCAT_WS', - 'CONNECTION_ID', - 'CONTAINS', - 'CONV', - 'CONVERT', - 'CONVERT_TZ', - 'CONVEXHULL', - 'COS', - 'COT', - 'COUNT', - 'CRC32', // mathematical-functions.html - 'CROSSES', - 'CURDATE', - 'CURRENT_DATE', - 'CURRENT_TIME', - 'CURRENT_TIMESTAMP', - 'CURRENT_USER', - 'CURTIME', - 'DATABASE', - 'DATE', // date-and-time-functions.html - 'DATEDIFF', // date-and-time-functions.html - 'DATE_ADD', - 'DATE_DIFF', - 'DATE_FORMAT', - 'DATE_SUB', - 'DAY', - 'DAYNAME', - 'DAYOFMONTH', - 'DAYOFWEEK', - 'DAYOFYEAR', - 'DECODE', - 'DEFAULT', // miscellaneous-functions.html - 'DEGREES', - 'DES_DECRYPT', - 'DES_ENCRYPT', - 'DIFFERENCE', - 'DIMENSION', // general-geometry-property-functions.html - 'DISJOINT', - 'DISTANCE', - 'ELT', - 'ENCODE', - 'ENCRYPT', - 'ENDPOINT', // linestring-property-functions.html - 'ENVELOPE', // general-geometry-property-functions.html - 'EQUALS', - 'EXP', - 'EXPORT_SET', - 'EXTERIORRING', // polygon-property-functions.html - 'EXTRACT', - 'EXTRACTVALUE', // xml-functions.html - 'FIELD', - 'FIND_IN_SET', - 'FLOOR', - 'FORMAT', - 'FOUND_ROWS', - 'FROM_DAYS', - 'FROM_UNIXTIME', - 'GEOMCOLLFROMTEXT', - 'GEOMCOLLFROMWKB', - 'GEOMETRYCOLLECTION', - 'GEOMETRYCOLLECTIONFROMTEXT', - 'GEOMETRYCOLLECTIONFROMWKB', - 'GEOMETRYFROMTEXT', - 'GEOMETRYFROMWKB', - 'GEOMETRYN', // geometrycollection-property-functions.html - 'GEOMETRYTYPE', // general-geometry-property-functions.html - 'GEOMFROMTEXT', - 'GEOMFROMWKB', - 'GET_FORMAT', - 'GET_LOCK', - 'GLENGTH', // linestring-property-functions.html - 'GREATEST', - 'GROUP_CONCAT', - 'GROUP_UNIQUE_USERS', - 'HEX', - 'HOUR', - 'IF', //control-flow-functions.html - 'IFNULL', - 'INET_ATON', - 'INET_NTOA', - 'INSERT', // string-functions.html - 'INSTR', - 'INTERIORRINGN', // polygon-property-functions.html - 'INTERSECTION', - 'INTERSECTS', - 'INTERVAL', - 'ISCLOSED', // multilinestring-property-functions.html - 'ISEMPTY', // general-geometry-property-functions.html - 'ISNULL', - 'ISRING', // linestring-property-functions.html - 'ISSIMPLE', // general-geometry-property-functions.html - 'IS_FREE_LOCK', - 'IS_USED_LOCK', // miscellaneous-functions.html - 'LAST_DAY', - 'LAST_INSERT_ID', - 'LCASE', - 'LEAST', - 'LEFT', - 'LENGTH', - 'LINEFROMTEXT', - 'LINEFROMWKB', - 'LINESTRING', - 'LINESTRINGFROMTEXT', - 'LINESTRINGFROMWKB', - 'LN', - 'LOAD_FILE', - 'LOCALTIME', - 'LOCALTIMESTAMP', - 'LOCATE', - 'LOG', - 'LOG10', - 'LOG2', - 'LOWER', - 'LPAD', - 'LTRIM', - 'MAKEDATE', - 'MAKETIME', - 'MAKE_SET', - 'MASTER_POS_WAIT', - 'MAX', - 'MBRCONTAINS', - 'MBRDISJOINT', - 'MBREQUAL', - 'MBRINTERSECTS', - 'MBROVERLAPS', - 'MBRTOUCHES', - 'MBRWITHIN', - 'MD5', - 'MICROSECOND', - 'MID', - 'MIN', - 'MINUTE', - 'MLINEFROMTEXT', - 'MLINEFROMWKB', - 'MOD', - 'MONTH', - 'MONTHNAME', - 'MPOINTFROMTEXT', - 'MPOINTFROMWKB', - 'MPOLYFROMTEXT', - 'MPOLYFROMWKB', - 'MULTILINESTRING', - 'MULTILINESTRINGFROMTEXT', - 'MULTILINESTRINGFROMWKB', - 'MULTIPOINT', - 'MULTIPOINTFROMTEXT', - 'MULTIPOINTFROMWKB', - 'MULTIPOLYGON', - 'MULTIPOLYGONFROMTEXT', - 'MULTIPOLYGONFROMWKB', - 'NAME_CONST', // NAME_CONST() - 'NOW', - 'NULLIF', - 'NUMGEOMETRIES', // geometrycollection-property-functions.html - 'NUMINTERIORRINGS', // polygon-property-functions.html - 'NUMPOINTS', // linestring-property-functions.html - 'OCT', - 'OCTET_LENGTH', - 'OLD_PASSWORD', - 'ORD', - 'OVERLAPS', - 'PASSWORD', - 'PERIOD_ADD', - 'PERIOD_DIFF', - 'PI', - 'POINT', - 'POINTFROMTEXT', - 'POINTFROMWKB', - 'POINTN', // inestring-property-functions.html - 'POINTONSURFACE', // multipolygon-property-functions.html - 'POLYFROMTEXT', - 'POLYFROMWKB', - 'POLYGON', - 'POLYGONFROMTEXT', - 'POLYGONFROMWKB', - 'POSITION', - 'POW', - 'POWER', - 'QUARTER', - 'QUOTE', - 'RADIANS', - 'RAND', - 'RELATED', - 'RELEASE_LOCK', - 'REPEAT', - 'REPLACE', // string-functions.html - 'REVERSE', - 'RIGHT', - 'ROUND', - 'ROW_COUNT', // information-functions.html - 'RPAD', - 'RTRIM', - 'SCHEMA', // information-functions.html - 'SECOND', - 'SEC_TO_TIME', - 'SESSION_USER', - 'SHA', - 'SHA1', - 'SIGN', - 'SIN', - 'SLEEP', // miscellaneous-functions.html - 'SOUNDEX', - 'SPACE', - 'SQRT', - 'SRID', // general-geometry-property-functions.html - 'STARTPOINT', // linestring-property-functions.html - 'STD', - 'STDDEV', - 'STDDEV_POP', // group-by-functions.html - 'STDDEV_SAMP', // group-by-functions.html - 'STRCMP', - 'STR_TO_DATE', - 'SUBDATE', - 'SUBSTR', - 'SUBSTRING', - 'SUBSTRING_INDEX', - 'SUBTIME', - 'SUM', - 'SYMDIFFERENCE', - 'SYSDATE', - 'SYSTEM_USER', - 'TAN', - 'TIME', - 'TIMEDIFF', - 'TIMESTAMP', - 'TIMESTAMPADD', - 'TIMESTAMPDIFF', - 'TIME_FORMAT', - 'TIME_TO_SEC', - 'TOUCHES', - 'TO_DAYS', - 'TRIM', - 'TRUNCATE', // mathematical-functions.html - 'UCASE', - 'UNCOMPRESS', // string-functions.html - 'UNCOMPRESSED_LENGTH', // string-functions.html - 'UNHEX', // string-functions.html - 'UNIQUE_USERS', - 'UNIX_TIMESTAMP', - 'UPDATEXML', // xml-functions.html - 'UPPER', - 'USER', - 'UTC_DATE', - 'UTC_TIME', - 'UTC_TIMESTAMP', - 'UUID', // miscellaneous-functions.html - 'VARIANCE', // group-by-functions.html - 'VAR_POP', // group-by-functions.html - 'VAR_SAMP', // group-by-functions.html - 'VERSION', - 'WEEK', - 'WEEKDAY', - 'WEEKOFYEAR', - 'WITHIN', - 'X', // point-property-functions.html - 'Y', // point-property-functions.html - 'YEAR', - 'YEARWEEK' -); - -/** - * @global array MySQL attributes - */ -$PMA_SQPdata_column_attrib = array ( - 'ARCHIVE', // Engine - 'ASCII', - 'AUTO_INCREMENT', - 'BDB', // Engine - 'BERKELEYDB', // Engine alias BDB - 'BINARY', - 'BLACKHOLE', // Engine - 'CSV', // Engine - 'DEFAULT', - 'EXAMPLE', // Engine - 'FEDERATED', // Engine - 'HEAP', // Engine - 'INNOBASE', // Engine alias InnoDB - 'INNODB', // Engine InnoDB - 'ISAM', // Engine - 'MARIA', // Engine - 'MEMORY', // Engine alias HEAP, but preferred - 'MERGE', // Engine - 'MRG_ISAM', // Engine - 'MRG_MYISAM', // Engine alias MERGE - 'MYISAM', // Engine MyISAM - 'NATIONAL', - 'NDB', // Engine alias NDBCLUSTER - 'NDBCLUSTER', // Engine - 'PRECISION', - 'UNDEFINED', - 'UNICODE', - 'UNSIGNED', - 'VARYING', - 'ZEROFILL' -); - -/** - * words that are reserved by MySQL and may not be used as identifiers without - * quotes - * - * @see http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html - * - * @global array MySQL reserved words - */ -$PMA_SQPdata_reserved_word = array ( - 'ACCESSIBLE', // 5.1 - 'ACTION', - 'ADD', - 'AFTER', - 'AGAINST', - 'AGGREGATE', - 'ALGORITHM', - 'ALL', - 'ALTER', - 'ANALYSE', - 'ANALYZE', - 'AND', - 'AS', - 'ASC', - 'AUTOCOMMIT', - 'AUTO_INCREMENT', - 'AVG_ROW_LENGTH', - 'BACKUP', - 'BEFORE', - 'BEGIN', - 'BETWEEN', - 'BINLOG', - 'BOTH', - 'BY', - 'CALL', - 'CASCADE', - 'CASE', - 'CHANGE', - 'CHANGED', - 'CHARSET', - 'CHECK', - 'CHECKSUM', - 'COLLATE', - 'COLLATION', - 'COLUMN', - 'COLUMNS', - 'COMMENT', - 'COMMIT', - 'COMMITTED', - 'COMPRESSED', - 'CONCURRENT', - 'CONSTRAINT', - 'CONTAINS', - 'CONVERT', - 'CREATE', - 'CROSS', - 'CURRENT_TIMESTAMP', - 'DATABASE', - 'DATABASES', - 'DAY', - 'DAY_HOUR', - 'DAY_MINUTE', - 'DAY_SECOND', - 'DECLARE', - 'DEFINER', - 'DELAYED', - 'DELAY_KEY_WRITE', - 'DELETE', - 'DESC', - 'DESCRIBE', - 'DETERMINISTIC', - 'DISTINCT', - 'DISTINCTROW', - 'DIV', - 'DO', - 'DROP', - 'DUMPFILE', - 'DUPLICATE', - 'DYNAMIC', - 'EACH', - 'ELSE', - 'ELSEIF', - 'ENCLOSED', - 'END', - 'ENGINE', - 'ENGINES', - 'ESCAPE', - 'ESCAPED', - 'EVENTS', - 'EXECUTE', - 'EXISTS', - 'EXIT', - 'EXPLAIN', - 'EXTENDED', - 'FALSE', - 'FAST', - 'FIELDS', - 'FILE', - 'FIRST', - 'FIXED', - 'FLUSH', - 'FOR', - 'FORCE', - 'FOREIGN', - 'FROM', - 'FULL', - 'FULLTEXT', - 'FUNCTION', - 'GEMINI', - 'GEMINI_SPIN_RETRIES', - 'GLOBAL', - 'GRANT', - 'GRANTS', - 'GROUP', - 'HAVING', - 'HEAP', - 'HIGH_PRIORITY', - 'HOSTS', - 'HOUR', - 'HOUR_MINUTE', - 'HOUR_SECOND', - 'IDENTIFIED', - 'IF', - 'IGNORE', - 'IGNORE_SERVER_IDS', - 'IN', - 'INDEX', - 'INDEXES', - 'INFILE', - 'INNER', - 'INOUT', - 'INSERT', - 'INSERT_ID', - 'INSERT_METHOD', - 'INTERVAL', - 'INTO', - 'INVOKER', - 'IS', - 'ISOLATION', - 'JOIN', - 'KEY', - 'KEYS', - 'KILL', - 'LAST_INSERT_ID', - 'LEADING', - 'LEFT', - 'LIKE', - 'LIMIT', - 'LINEAR', // 5.1 - 'LINES', - 'LOAD', - 'LOCAL', - 'LOCK', - 'LOCKS', - 'LOGS', - 'LOW_PRIORITY', - 'MARIA', // 5.1 ? - 'MASTER_CONNECT_RETRY', - 'MASTER_HEARTBEAT_PERIOD', - 'MASTER_HOST', - 'MASTER_LOG_FILE', - 'MASTER_LOG_POS', - 'MASTER_PASSWORD', - 'MASTER_PORT', - 'MASTER_USER', - 'MATCH', - 'MAXVALUE', - 'MAX_CONNECTIONS_PER_HOUR', - 'MAX_QUERIES_PER_HOUR', - 'MAX_ROWS', - 'MAX_UPDATES_PER_HOUR', - 'MAX_USER_CONNECTIONS', - 'MEDIUM', - 'MERGE', - 'MINUTE', - 'MINUTE_SECOND', - 'MIN_ROWS', - 'MODE', - 'MODIFIES', - 'MODIFY', - 'MONTH', - 'MRG_MYISAM', - 'MYISAM', - 'NAMES', - 'NATURAL', - // 'NO' is not allowed in SQL-99 but is allowed in MySQL - //'NO', - 'NOT', - 'NULL', - 'OFFSET', - 'ON', - 'OPEN', - 'OPTIMIZE', - 'OPTION', - 'OPTIONALLY', - 'OR', - 'ORDER', - 'OUT', - 'OUTER', - 'OUTFILE', - 'PACK_KEYS', - 'PAGE', // 5.1-maria ? - 'PAGE_CHECKSUM', // 5.1 - 'PARTIAL', - 'PARTITION', // 5.1 - 'PARTITIONS', // 5.1 - 'PASSWORD', - 'PRIMARY', - 'PRIVILEGES', - 'PROCEDURE', - 'PROCESS', - 'PROCESSLIST', - 'PURGE', - 'QUICK', - 'RAID0', - 'RAID_CHUNKS', - 'RAID_CHUNKSIZE', - 'RAID_TYPE', - 'RANGE', // 5.1 - 'READ', - 'READS', - 'READ_ONLY', // 5.1 - 'READ_WRITE', // 5.1 - 'REFERENCES', - 'REGEXP', - 'RELOAD', - 'RENAME', - 'REPAIR', - 'REPEATABLE', - 'REPLACE', - 'REPLICATION', - 'RESET', - 'RESIGNAL', - 'RESTORE', - 'RESTRICT', - 'RETURN', - 'RETURNS', - 'REVOKE', - 'RIGHT', - 'RLIKE', - 'ROLLBACK', - 'ROW', - 'ROWS', - 'ROW_FORMAT', - 'SECOND', - 'SECURITY', - 'SELECT', - 'SEPARATOR', - 'SERIALIZABLE', - 'SESSION', - 'SHARE', - 'SHOW', - 'SHUTDOWN', - 'SIGNAL', - 'SLAVE', - 'SLOW', - 'SONAME', - 'SOUNDS', // string-functions.html - 'SQL', - 'SQL_AUTO_IS_NULL', - 'SQL_BIG_RESULT', - 'SQL_BIG_SELECTS', - 'SQL_BIG_TABLES', - 'SQL_BUFFER_RESULT', - 'SQL_CACHE', - 'SQL_CALC_FOUND_ROWS', - 'SQL_LOG_BIN', - 'SQL_LOG_OFF', - 'SQL_LOG_UPDATE', - 'SQL_LOW_PRIORITY_UPDATES', - 'SQL_MAX_JOIN_SIZE', - 'SQL_NO_CACHE', - 'SQL_QUOTE_SHOW_CREATE', - 'SQL_SAFE_UPDATES', - 'SQL_SELECT_LIMIT', - 'SQL_SLAVE_SKIP_COUNTER', - 'SQL_SMALL_RESULT', - 'SQL_WARNINGS', - 'START', - 'STARTING', - 'STATUS', - 'STOP', - 'STORAGE', - 'STRAIGHT_JOIN', - 'STRING', - 'STRIPED', - 'SUPER', - 'TABLE', - 'TABLES', - 'TEMPORARY', - 'TERMINATED', - 'THEN', - 'TO', - 'TRAILING', - 'TRANSACTIONAL', // 5.1 ? - 'TRIGGER', - 'TRUE', - 'TRUNCATE', - 'TYPE', - 'TYPES', - 'UNCOMMITTED', - 'UNION', - 'UNIQUE', - 'UNLOCK', - 'UPDATE', - 'USAGE', - 'USE', - 'USING', - 'VALUES', - 'VARIABLES', - 'VIEW', - 'WHEN', - 'WHERE', - 'WITH', - 'WORK', - 'WRITE', - 'XOR', - 'YEAR_MONTH' -); - -/** - * words forbidden to be used as column or table name without quotes - * as seen in http://dev.mysql.com/doc/refman/5.6/en/reserved-words.html - * - * @global array MySQL forbidden words - */ -$PMA_SQPdata_forbidden_word = array ( - 'ACCESSIBLE', - 'ADD', - 'ALL', - 'ALTER', - 'ANALYZE', - 'AND', - 'AS', - 'ASC', - 'ASENSITIVE', - 'BEFORE', - 'BETWEEN', - 'BIGINT', - 'BINARY', - 'BLOB', - 'BOTH', - 'BY', - 'CALL', - 'CASCADE', - 'CASE', - 'CHANGE', - 'CHAR', - 'CHARACTER', - 'CHECK', - 'COLLATE', - 'COLUMN', - 'CONDITION', - 'CONSTRAINT', - 'CONTINUE', - 'CONVERT', - 'CREATE', - 'CROSS', - 'CURRENT_DATE', - 'CURRENT_TIME', - 'CURRENT_TIMESTAMP', - 'CURRENT_USER', - 'CURSOR', - 'DATABASE', - 'DATABASES', - 'DAY_HOUR', - 'DAY_MICROSECOND', - 'DAY_MINUTE', - 'DAY_SECOND', - 'DEC', - 'DECIMAL', - 'DECLARE', - 'DEFAULT', - 'DELAYED', - 'DELETE', - 'DESC', - 'DESCRIBE', - 'DETERMINISTIC', - 'DISTINCT', - 'DISTINCTROW', - 'DIV', - 'DOUBLE', - 'DROP', - 'DUAL', - 'EACH', - 'ELSE', - 'ELSEIF', - 'ENCLOSED', - 'ESCAPED', - 'EXISTS', - 'EXIT', - 'EXPLAIN', - 'FALSE', - 'FETCH', - 'FLOAT', - 'FLOAT4', - 'FLOAT8', - 'FOR', - 'FORCE', - 'FOREIGN', - 'FROM', - 'FULLTEXT', - 'GET', - 'GRANT', - 'GROUP', - 'HAVING', - 'HIGH_PRIORITY', - 'HOUR_MICROSECOND', - 'HOUR_MINUTE', - 'HOUR_SECOND', - 'IF', - 'IGNORE', - 'IGNORE_SERVER_IDS', - 'IN', - 'INDEX', - 'INFILE', - 'INNER', - 'INOUT', - 'INSENSITIVE', - 'INSERT', - 'INT', - 'INT1', - 'INT2', - 'INT3', - 'INT4', - 'INT8', - 'INTEGER', - 'INTERVAL', - 'INTO', - 'IO_AFTER_GTIDS', - 'IO_BEFORE_GTIDS', - 'IS', - 'ITERATE', - 'JOIN', - 'KEY', - 'KEYS', - 'KILL', - 'LEADING', - 'LEAVE', - 'LEFT', - 'LIKE', - 'LIMIT', - 'LINEAR', - 'LINES', - 'LOAD', - 'LOCALTIME', - 'LOCALTIMESTAMP', - 'LOCK', - 'LONG', - 'LONGBLOB', - 'LONGTEXT', - 'LOOP', - 'LOW_PRIORITY', - 'MASTER_BIND', - 'MASTER_HEARTBEAT_PERIOD', - 'MASTER_SSL_VERIFY_SERVER_CERT', - 'MATCH', - 'MAXVALUE', - 'MEDIUMBLOB', - 'MEDIUMINT', - 'MEDIUMTEXT', - 'MIDDLEINT', - 'MINUTE_MICROSECOND', - 'MINUTE_SECOND', - 'MOD', - 'MODIFIES', - 'NATURAL', - 'NOT', - 'NO_WRITE_TO_BINLOG', - 'NULL', - 'NUMERIC', - 'ON', - 'ONE_SHOT', - 'OPTIMIZE', - 'OPTION', - 'OPTIONALLY', - 'OR', - 'ORDER', - 'OUT', - 'OUTER', - 'OUTFILE', - 'PARTITION', - 'PRECISION', - 'PRIMARY', - 'PROCEDURE', - 'PURGE', - 'RANGE', - 'READ', - 'READS', - 'READ_WRITE', - 'REAL', - 'REFERENCES', - 'REGEXP', - 'RELEASE', - 'RENAME', - 'REPEAT', - 'REPLACE', - 'REQUIRE', - 'RESIGNAL', - 'RESTRICT', - 'RETURN', - 'REVOKE', - 'RIGHT', - 'RLIKE', - 'SCHEMA', - 'SCHEMAS', - 'SECOND_MICROSECOND', - 'SELECT', - 'SENSITIVE', - 'SEPARATOR', - 'SET', - 'SHOW', - 'SIGNAL', - 'SLOW', - 'SMALLINT', - 'SPATIAL', - 'SPECIFIC', - 'SQL', - 'SQLEXCEPTION', - 'SQLSTATE', - 'SQLWARNING', - 'SQL_AFTER_GTIDS', - 'SQL_BEFORE_GTIDS', - 'SQL_BIG_RESULT', - 'SQL_CALC_FOUND_ROWS', - 'SQL_SMALL_RESULT', - 'SSL', - 'STARTING', - 'STRAIGHT_JOIN', - 'TABLE', - 'TERMINATED', - 'THEN', - 'TINYBLOB', - 'TINYINT', - 'TINYTEXT', - 'TO', - 'TRAILING', - 'TRIGGER', - 'TRUE', - 'UNDO', - 'UNION', - 'UNIQUE', - 'UNLOCK', - 'UNSIGNED', - 'UPDATE', - 'USAGE', - 'USE', - 'USING', - 'UTC_DATE', - 'UTC_TIME', - 'UTC_TIMESTAMP', - 'VALUES', - 'VARBINARY', - 'VARCHAR', - 'VARCHARACTER', - 'VARYING', - 'WHEN', - 'WHERE', - 'WHILE', - 'WITH', - 'WRITE', - 'XOR', - 'YEAR_MONTH', - 'ZEROFILL' -); - -/** - * the MySQL column/data types - * - * @see http://dev.mysql.com/doc/refman/5.1/en/data-types.html - * @see http://dev.mysql.com/doc/refman/5.1/en/mysql-spatial-datatypes.html - * - * @global array MySQL column types - */ -$PMA_SQPdata_column_type = array ( - 'BIGINT', - 'BINARY', - 'BIT', - 'BLOB', - 'BOOL', - 'BOOLEAN', // numeric-type-overview.html - 'CHAR', - 'CHARACTER', - 'DATE', - 'DATETIME', - 'DEC', - 'DECIMAL', - 'DOUBLE', - 'ENUM', - 'FLOAT', - 'FLOAT4', - 'FLOAT8', - 'GEOMETRY', // spatial - 'GEOMETRYCOLLECTION', // spatial - 'INT', - 'INT1', - 'INT2', - 'INT3', - 'INT4', - 'INT8', - 'INTEGER', - 'LINESTRING', // spatial - 'LONG', - 'LONGBLOB', - 'LONGTEXT', - 'MEDIUMBLOB', - 'MEDIUMINT', - 'MEDIUMTEXT', - 'MIDDLEINT', - 'MULTILINESTRING', // spatial - 'MULTIPOINT', // spatial - 'MULTIPOLYGON', // spatial - 'NCHAR', - 'NUMERIC', - 'POINT', // spatial - 'POLYGON', // spatial - 'REAL', - 'SERIAL', // alias - 'SET', - 'SMALLINT', - 'TEXT', - 'TIME', - 'TIMESTAMP', - 'TINYBLOB', - 'TINYINT', - 'TINYTEXT', - 'VARBINARY', - 'VARCHAR', - 'YEAR' -); - -?> diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php deleted file mode 100644 index 1431e20534..0000000000 --- a/libraries/sqlparser.lib.php +++ /dev/null @@ -1,2997 +0,0 @@ -' at the moment.) - * - * @package PhpMyAdmin - */ -if (! defined('PHPMYADMIN')) { - exit; -} - -/** - * Include data for the SQL Parser - */ -require_once './libraries/sqlparser.data.php'; - -/** - * Charset information - */ -if (!defined('TESTSUITE') && ! PMA_DRIZZLE) { - include_once './libraries/mysql_charsets.inc.php'; -} -if (! isset($mysql_charsets)) { - $mysql_charsets = array(); - $mysql_collations_flat = array(); -} - -/** - * Stores parsed elements of query to array. - * - * @param array &$arr Array to store element - * @param string $type Type of element - * @param string $data Data (text) of element - * @param int &$arrsize Size of array - * @param int $pos Position of an element - * - * @return void - */ -function PMA_SQP_arrayAdd(&$arr, $type, $data, &$arrsize, $pos = 0) -{ - $arr[] = array('type' => $type, 'data' => $data, 'pos' => $pos); - $arrsize++; -} // end of the "PMA_SQP_arrayAdd()" function - -/** - * Reset the error variable for the SQL parser - * - * @access public - * - * @return void - */ -function PMA_SQP_resetError() -{ - global $SQP_errorString; - $SQP_errorString = ''; - unset($SQP_errorString); -} - -/** - * Get the contents of the error variable for the SQL parser - * - * @return string Error string from SQL parser - * - * @access public - */ -function PMA_SQP_getErrorString() -{ - global $SQP_errorString; - return isset($SQP_errorString) ? $SQP_errorString : ''; -} - -/** - * Check if the SQL parser hit an error - * - * @return boolean error state - * - * @access public - */ -function PMA_SQP_isError() -{ - global $SQP_errorString; - return isset($SQP_errorString) && !empty($SQP_errorString); -} - -/** - * Set an error message for the system - * - * @param string $message The error message - * @param string $sql The failing SQL query - * - * @return void - * - * @access private - * @scope SQL Parser internal - */ -function PMA_SQP_throwError($message, $sql) -{ - global $SQP_errorString; - $SQP_errorString = '

' - . __( - 'There seems to be an error in your SQL query. The MySQL server ' - . 'error output below, if there is any, may also help you in ' - . 'diagnosing the problem.' - ) - . '

' . "\n" - . '
' . "\n"
-        . 'ERROR: ' . $message . "\n"
-        . 'SQL: ' . htmlspecialchars($sql) .  "\n"
-        . '
' . "\n"; - -} // end of the "PMA_SQP_throwError()" function - - -/** - * Do display the bug report - * - * @param string $message The error message - * @param string $sql The failing SQL query - * - * @return void - * - * @access public - */ -function PMA_SQP_bug($message, $sql) -{ - global $SQP_errorString; - $debugstr = 'ERROR: ' . $message . "\n"; - $debugstr .= 'MySQL: ' . PMA_MYSQL_STR_VERSION . "\n"; - $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' '; - $debugstr .= PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n"; - $debugstr .= 'PMA: ' . PMA_VERSION . "\n"; - $debugstr .= 'PHP VER,OS: ' . PMA_PHP_STR_VERSION . ' ' . PHP_OS . "\n"; - $debugstr .= 'LANG: ' . $GLOBALS['lang'] . "\n"; - $debugstr .= 'SQL: ' . htmlspecialchars($sql); - - $encodedstr = $debugstr; - if (@function_exists('gzcompress')) { - $encodedstr = gzcompress($debugstr, 9); - } - $encodedstr = preg_replace( - "/(\015\012)|(\015)|(\012)/", - '
' . "\n", - chunk_split(base64_encode($encodedstr)) - ); - - $SQP_errorString .= __( - 'There is a chance that you may have found a bug in the SQL parser. ' - . 'Please examine your query closely, and check that the quotes are ' - . 'correct and not mis-matched. Other possible failure causes may be ' - . 'that you are uploading a file with binary outside of a quoted text ' - . 'area. You can also try your query on the MySQL command line ' - . 'interface. The MySQL server error output below, if there is any, ' - . 'may also help you in diagnosing the problem. If you still have ' - . 'problems or if the parser fails where the command line interface ' - . 'succeeds, please reduce your SQL query input to the single query ' - . 'that causes problems, and submit a bug report with the data chunk ' - . 'in the CUT section below:' - ); - $SQP_errorString .= '
' . "\n" - . '----' . __('BEGIN CUT') . '----' . '
' . "\n" - . $encodedstr . "\n" - . '----' . __('END CUT') . '----' . '
' . "\n"; - - $SQP_errorString .= '----' . __('BEGIN RAW') . '----
' . "\n" - . '
' . "\n"
-        . $debugstr
-        . '
' . "\n" - . '----' . __('END RAW') . '----
' . "\n"; - -} // end of the "PMA_SQP_bug()" function - - -/** - * Parses the SQL queries - * - * @param string $sql The SQL query list - * - * @return mixed Most of times, nothing... - * - * @global array The current PMA configuration - * @global array MySQL column attributes - * @global array MySQL reserved words - * @global array MySQL column types - * @global array MySQL function names - * @global array List of available character sets - * @global array List of available collations - * - * @access public - */ -function PMA_SQP_parse($sql) -{ - static $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word; - static $PMA_SQPdata_column_type; - static $PMA_SQPdata_function_name, $PMA_SQPdata_forbidden_word; - global $mysql_charsets, $mysql_collations_flat; - - /* @var $pmaString PMA_String */ - $pmaString = $GLOBALS['PMA_String']; - - // Convert all line feeds to Unix style - $sql = str_replace("\r\n", "\n", $sql); - $sql = str_replace("\r", "\n", $sql); - - $len = /*overload*/mb_strlen($sql); - if ($len == 0) { - return array(); - } - - // Create local hashtables - if (!isset($PMA_SQPdata_column_attrib)) { - $PMA_SQPdata_column_attrib = array_flip( - $GLOBALS['PMA_SQPdata_column_attrib'] - ); - $PMA_SQPdata_function_name = array_flip( - $GLOBALS['PMA_SQPdata_function_name'] - ); - $PMA_SQPdata_reserved_word = array_flip( - $GLOBALS['PMA_SQPdata_reserved_word'] - ); - $PMA_SQPdata_forbidden_word = array_flip( - $GLOBALS['PMA_SQPdata_forbidden_word'] - ); - $PMA_SQPdata_column_type = array_flip( - $GLOBALS['PMA_SQPdata_column_type'] - ); - } - - $sql_array = array(); - $sql_array['raw'] = $sql; - $count2 = 0; - $punct_queryend = ';'; - $punct_qualifier = '.'; - $punct_listsep = ','; - $bracket_list = '()[]{}'; - $allpunct_list = '-,;:!?/.^~\*&%+<=>|'; - $allpunct_list_pair = array( - '!=' => 1, - '&&' => 1, - ':=' => 1, - '<<' => 1, - '<=' => 1, - '<=>' => 1, - '<>' => 1, - '>=' => 1, - '>>' => 1, - '||' => 1, - '==' => 1 - ); - $quote_list = '\'"`'; - $arraysize = 0; - - $this_was_space = false; - $this_was_bracket = false; - $this_was_punct = false; - $this_was_listsep = false; - $this_was_quote = false; - - while ($count2 < $len) { - $c = /*overload*/mb_substr($sql, $count2, 1); - $count1 = $count2; - - $previous_was_space = $this_was_space; - $this_was_space = false; - $previous_was_bracket = $this_was_bracket; - $this_was_bracket = false; - $previous_was_punct = $this_was_punct; - $this_was_punct = false; - $previous_was_listsep = $this_was_listsep; - $this_was_listsep = false; - $previous_was_quote = $this_was_quote; - $this_was_quote = false; - - if (($c === "\n")) { - $this_was_space = true; - $count2++; - PMA_SQP_arrayAdd($sql_array, 'white_newline', "\n", $arraysize, $count2); - continue; - } - - // Checks for white space - if ($pmaString->isSpace($c)) { - $this_was_space = true; - $count2++; - continue; - } - - // Checks for comment lines. - // MySQL style # - // C style /* */ - // ANSI style -- - $next_c = /*overload*/mb_substr($sql, $count2 + 1, 1); - if (($c == '#') - || (($count2 + 1 < $len) && ($c == '/') && ($next_c == '*')) - || (($count2 + 2 == $len) && ($c == '-') && ($next_c == '-')) - || (($count2 + 2 < $len) && ($c == '-') && ($next_c == '-') - && ((/*overload*/mb_substr($sql, $count2 + 2, 1) <= ' '))) - ) { - $count2++; - $pos = 0; - $type = 'bad'; - switch ($c) { - case '#': - $type = 'mysql'; - $pos = /*overload*/mb_strpos($sql, "\n", $count2); - break; - case '-': - $type = 'ansi'; - $pos = /*overload*/mb_strpos($sql, "\n", $count2); - break; - case '/': - $type = 'c'; - $pos = /*overload*/mb_strpos($sql, '*/', $count2); - $pos += 2; - break; - default: - break; - } // end switch - $count2 = ($pos < $count2) ? $len : $pos; - $str = /*overload*/mb_substr( - $sql, $count1, $count2 - $count1 - ); - PMA_SQP_arrayAdd( - $sql_array, 'comment_' . $type, $str, $arraysize, $count2 - ); - continue; - } // end if - - // Checks for something inside quotation marks - if (/*overload*/mb_strpos($quote_list, $c) !== false) { - $startquotepos = $count2; - $quotetype = $c; - $count2++; - $pos = $count2; - do { - $oldpos = $pos; - $pos = /*overload*/mb_strpos( - ' ' . $sql, $quotetype, $oldpos + 1 - ) - 1; - // ($pos === false) - if ($pos < 0) { - if ($c != '`') { - $debugstr = __('Unclosed quote') - . ' @ ' . $startquotepos . "\n" - . 'STR: ' . htmlspecialchars($quotetype); - PMA_SQP_throwError($debugstr, $sql); - return $sql_array; - } - - /* - * Behave same as MySQL and accept end of query as end - * of backtick. - * I know this is sick, but MySQL behaves like this: - * - * SELECT * FROM `table - * - * is treated like - * - * SELECT * FROM `table` - */ - $pos_quote_separator = /*overload*/mb_strpos( - ' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1 - ) - 1; - if ($pos_quote_separator < 0) { - $len += 1; - $sql .= '`'; - $sql_array['raw'] .= '`'; - $pos = $len; - } else { - $len += 1; - $sql = /*overload*/mb_substr( - $sql, 0, $pos_quote_separator - ) . '`' . /*overload*/mb_substr( - $sql, $pos_quote_separator - ); - $sql_array['raw'] = $sql; - $pos = $pos_quote_separator; - } - if (class_exists('PMA_Message') - && $GLOBALS['is_ajax_request'] != true - ) { - PMA_Message::notice( - __('Automatically appended backtick to the end of query!') - )->display(); - } - } - - // If the quote is the first character, it can't be - // escaped, so don't do the rest of the code - if ($pos == 0) { - break; - } - - // Checks for MySQL escaping using a \ - // And checks for ANSI escaping using the $quotetype character - if (($pos < $len) - && $pmaString->charIsEscaped($sql, $pos) - && $c != '`' - ) { - $pos ++; - continue; - } elseif (($pos + 1 < $len) - && (/*overload*/mb_substr($sql, $pos, 1) == $quotetype) - && (/*overload*/mb_substr($sql, $pos + 1, 1) == $quotetype) - ) { - $pos = $pos + 2; - continue; - } else { - break; - } - } while ($len > $pos); // end do - - $count2 = $pos; - $count2++; - $type = 'quote_'; - switch ($quotetype) { - case '\'': - $type .= 'single'; - $this_was_quote = true; - break; - case '"': - $type .= 'double'; - $this_was_quote = true; - break; - case '`': - $type .= 'backtick'; - $this_was_quote = true; - break; - default: - break; - } // end switch - $data = /*overload*/mb_substr($sql, $count1, $count2 - $count1); - PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize, $count2); - continue; - } - - // Checks for brackets - if (/*overload*/mb_strpos($bracket_list, $c) !== false) { - // All bracket tokens are only one item long - $this_was_bracket = true; - $count2++; - if (/*overload*/mb_strpos('([{', $c) !== false) { - $type_type = 'open'; - } else { - $type_type = 'close'; - } - - if (/*overload*/mb_strpos('()', $c) !== false) { - $type_style = 'round'; - } elseif (/*overload*/mb_strpos('[]', $c) !== false) { - $type_style = 'square'; - } else { - $type_style = 'curly'; - } - - $type = 'punct_bracket_' . $type_type . '_' . $type_style; - PMA_SQP_arrayAdd($sql_array, $type, $c, $arraysize, $count2); - continue; - } - - /* DEBUG - echo '
1';
-        var_dump($pmaString->isSqlIdentifier($c, false));
-        var_dump($c == '@');
-        var_dump($c == '.');
-        var_dump(
-            $pmaString->isDigit(
-                $pmaString->substr($sql, $count2 + 1, 1)
-            )
-        );
-        var_dump($previous_was_space);
-        var_dump($previous_was_bracket);
-        var_dump($previous_was_listsep);
-        echo '
'; - */ - - // Checks for identifier (alpha or numeric) - if ($pmaString->isSqlIdentifier($c, false) - || $c == '@' - || ($c == '.' - && $pmaString->isDigit(/*overload*/mb_substr($sql, $count2 + 1, 1)) - && ($previous_was_space || $previous_was_bracket - || $previous_was_listsep)) - ) { - /* DEBUG - echo $pmaString->substr($sql, $count2); - echo '
'; - */ - - $count2++; - - /** - * @todo a @ can also be present in expressions like - * FROM 'user'@'%' or TO 'user'@'%' - * in this case, the @ is wrongly marked as alpha_variable - */ - $is_identifier = $previous_was_punct; - $is_sql_variable = $c == '@' && ! $previous_was_quote; - $is_user = $c == '@' && $previous_was_quote; - $is_digit = ( - !$is_identifier - && !$is_sql_variable - && $pmaString->isDigit($c) - ); - $is_hex_digit = ( - $is_digit - && $c == '0' - && $count2 < $len - && /*overload*/mb_substr($sql, $count2, 1) == 'x' - ); - $is_float_digit = $c == '.'; - $is_float_digit_exponent = false; - - /* DEBUG - echo '
2';
-            var_dump($is_identifier);
-            var_dump($is_sql_variable);
-            var_dump($is_digit);
-            var_dump($is_float_digit);
-            echo '
'; - */ - - // Fast skip is especially needed for huge BLOB data - if ($is_hex_digit) { - $count2++; - $pos = strspn($sql, '0123456789abcdefABCDEF', $count2); - if ($pos > $count2) { - $count2 = $pos; - } - unset($pos); - } elseif ($is_digit) { - $pos = strspn($sql, '0123456789', $count2); - if ($pos > $count2) { - $count2 = $pos; - } - unset($pos); - } - - while (($count2 < $len) - && $pmaString->isSqlIdentifier( - /*overload*/mb_substr($sql, $count2, 1), - ($is_sql_variable || $is_digit) - ) - ) { - $c2 = /*overload*/mb_substr($sql, $count2, 1); - if ($is_sql_variable && ($c2 == '.')) { - $count2++; - continue; - } - if ($is_digit && (!$is_hex_digit) && ($c2 == '.')) { - $count2++; - if (!$is_float_digit) { - $is_float_digit = true; - continue; - } else { - $debugstr = __('Invalid Identifer') - . ' @ ' . ($count1+1) . "\n" - . 'STR: ' . htmlspecialchars( - /*overload*/mb_substr( - $sql, $count1, $count2 - $count1 - ) - ); - PMA_SQP_throwError($debugstr, $sql); - return $sql_array; - } - } - if ($is_digit - && (!$is_hex_digit) - && (($c2 == 'e') || ($c2 == 'E')) - ) { - if (!$is_float_digit_exponent) { - $is_float_digit_exponent = true; - $is_float_digit = true; - $count2++; - continue; - } else { - $is_digit = false; - $is_float_digit = false; - } - } - if (($is_hex_digit && $pmaString->isHexDigit($c2)) - || ($is_digit && $pmaString->isDigit($c2)) - ) { - $count2++; - continue; - } else { - $is_digit = false; - $is_hex_digit = false; - } - - $count2++; - } // end while - - $l = $count2 - $count1; - $str = /*overload*/mb_substr($sql, $count1, $l); - - if ($is_digit || $is_float_digit || $is_hex_digit) { - $type = 'digit'; - if ($is_float_digit) { - $type .= '_float'; - } elseif ($is_hex_digit) { - $type .= '_hex'; - } else { - $type .= '_integer'; - } - } elseif ($is_user) { - $type = 'punct_user'; - } elseif ($is_sql_variable != false) { - $type = 'alpha_variable'; - } else { - $type = 'alpha'; - } // end if... else.... - PMA_SQP_arrayAdd($sql_array, $type, $str, $arraysize, $count2); - - continue; - } - - // Checks for punct - if (/*overload*/mb_strpos($allpunct_list, $c) !== false) { - while (($count2 < $len) - && /*overload*/mb_strpos( - $allpunct_list, /*overload*/mb_substr( - $sql, $count2, 1 - ) - ) !== false - ) { - $count2++; - } - $l = $count2 - $count1; - if ($l == 1) { - $punct_data = $c; - } else { - $punct_data = /*overload*/mb_substr($sql, $count1, $l); - } - - // Special case, sometimes, although two characters are - // adjacent directly, they ACTUALLY need to be separate - /* DEBUG - echo '
';
-            var_dump($l);
-            var_dump($punct_data);
-            echo '
'; - */ - - if ($l == 1) { - $t_suffix = ''; - switch ($punct_data) { - case $punct_queryend: - $t_suffix = '_queryend'; - break; - case $punct_qualifier: - $t_suffix = '_qualifier'; - $this_was_punct = true; - break; - case $punct_listsep: - $this_was_listsep = true; - $t_suffix = '_listsep'; - break; - default: - break; - } - PMA_SQP_arrayAdd( - $sql_array, 'punct' . $t_suffix, $punct_data, $arraysize, $count2 - ); - } elseif ($punct_data == $GLOBALS['sql_delimiter'] - || isset($allpunct_list_pair[$punct_data]) - ) { - // Ok, we have one of the valid combined punct expressions - PMA_SQP_arrayAdd( - $sql_array, 'punct', $punct_data, $arraysize, $count2 - ); - } else { - // Bad luck, lets split it up more - $first = $punct_data[0]; - $last2 = $punct_data[$l - 2] . $punct_data[$l - 1]; - $last = $punct_data[$l - 1]; - if (($first == ',') || ($first == ';') || ($first == '.') - || ($first == '*') - ) { - $count2 = $count1 + 1; - $punct_data = $first; - } elseif (($last2 == '/*') - || (($last2 == '--') - && ($count2 == $len - || /*overload*/mb_substr($sql, $count2, 1) <= ' ')) - ) { - $count2 -= 2; - $punct_data = /*overload*/mb_substr( - $sql, $count1, $count2 - $count1 - ); - } elseif (($last == '-') || ($last == '+') || ($last == '!')) { - $count2--; - $punct_data = /*overload*/mb_substr( - $sql, $count1, $count2 - $count1 - ); - } elseif ($last != '~') { - /** - * @todo for negation operator, split in 2 tokens ? - * "select x&~1 from t" - * becomes "select x & ~ 1 from t" ? - */ - $debugstr = __('Unknown Punctuation String') - . ' @ ' . ($count1+1) . "\n" - . 'STR: ' . htmlspecialchars($punct_data); - PMA_SQP_throwError($debugstr, $sql); - return $sql_array; - } - PMA_SQP_arrayAdd( - $sql_array, 'punct', $punct_data, $arraysize, $count2 - ); - continue; - } // end if... elseif... else - continue; - } - - // DEBUG - $count2++; - - $debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n" - . 'STR: ' . /*overload*/mb_substr( - $sql, $count1, $count2 - $count1 - ) . "\n"; - PMA_SQP_bug($debugstr, $sql); - return $sql_array; - - } // end while ($count2 < $len) - - /* - echo '
';
-    print_r($sql_array);
-    echo '
'; - */ - - if ($arraysize > 0) { - $t_next = $sql_array[0]['type']; - $t_prev = ''; - $t_cur = ''; - $d_next = $sql_array[0]['data']; - $d_prev = ''; - $d_cur = ''; - $d_next_upper = $t_next == 'alpha' - ? /*overload*/mb_strtoupper($d_next) - : $d_next; - $d_prev_upper = ''; - $d_cur_upper = ''; - } - - for ($i = 0; $i < $arraysize; $i++) { - $t_prev = $t_cur; - $t_cur = $t_next; - $d_prev = $d_cur; - $d_cur = $d_next; - $d_bef_prev_upper = $d_prev_upper; - $d_prev_upper = $d_cur_upper; - $d_cur_upper = $d_next_upper; - if (($i + 1) < $arraysize) { - $t_next = $sql_array[$i + 1]['type']; - $d_next = $sql_array[$i + 1]['data']; - $d_next_upper - = $t_next == 'alpha' ? /*overload*/mb_strtoupper($d_next) : $d_next; - } else { - $t_next = ''; - $d_next = ''; - $d_next_upper = ''; - } - - /* DEBUG - echo "[prev: ".$d_prev." ".$t_prev."][cur: " - . $d_cur." ".$t_cur."][next: ".$d_next." " - . $t_next."]
"; - */ - - if ($t_cur == 'alpha') { - $t_suffix = '_identifier'; - // for example: `thebit` bit(8) NOT NULL DEFAULT b'0' - if ($t_prev == 'alpha' && $d_prev == 'DEFAULT' && $d_cur == 'b' - && $t_next == 'quote_single' - ) { - $t_suffix = '_bitfield_constant_introducer'; - } elseif (($t_next == 'punct_qualifier') - || ($t_prev == 'punct_qualifier') - ) { - $t_suffix = '_identifier'; - } elseif (($t_next == 'punct_bracket_open_round') - && isset($PMA_SQPdata_function_name[$d_cur_upper]) - ) { - /** - * @todo 2005-10-16: in the case of a CREATE TABLE containing - * a TIMESTAMP, since TIMESTAMP() is also a function, it's - * found here and the token is wrongly marked as alpha_functionName. - * But we compensate for this when analysing for timestamp_not_null - * later in this script. - * - * Same applies to CHAR vs. CHAR() function. - */ - $t_suffix = '_functionName'; - /* There are functions which might be as well column types */ - } elseif (isset($PMA_SQPdata_column_type[$d_cur_upper])) { - $t_suffix = '_columnType'; - - /** - * Temporary fix for bugs #621357 and #2027720 - * - * @todo FIX PROPERLY NEEDS OVERHAUL OF SQL TOKENIZER - */ - if (($d_cur_upper == 'SET' || $d_cur_upper == 'BINARY') - && $t_next != 'punct_bracket_open_round' - ) { - $t_suffix = '_reservedWord'; - } - //END OF TEMPORARY FIX - - // CHARACTER is a synonym for CHAR, but can also be meant as - // CHARACTER SET. In this case, we have a reserved word. - if ($d_cur_upper == 'CHARACTER' && $d_next_upper == 'SET') { - $t_suffix = '_reservedWord'; - } - - // experimental - // current is a column type, so previous must not be - // a reserved word but an identifier - // CREATE TABLE SG_Persons (first varchar(64)) - - //if ($sql_array[$i-1]['type'] =='alpha_reservedWord') { - // $sql_array[$i-1]['type'] = 'alpha_identifier'; - //} - - } elseif (isset($PMA_SQPdata_reserved_word[$d_cur_upper])) { - $t_suffix = '_reservedWord'; - } elseif (isset($PMA_SQPdata_column_attrib[$d_cur_upper])) { - $t_suffix = '_columnAttrib'; - // INNODB is a MySQL table type, but in "SHOW ENGINE INNODB STATUS", - // it should be regarded as a reserved word. - if ($d_cur_upper == 'INNODB' - && $d_prev_upper == 'SHOW' - && $d_next_upper == 'STATUS' - ) { - $t_suffix = '_reservedWord'; - } - - if ($d_cur_upper == 'DEFAULT' && $d_next_upper == 'CHARACTER') { - $t_suffix = '_reservedWord'; - } - // Binary as character set - if ($d_cur_upper == 'BINARY' - && (($d_bef_prev_upper == 'CHARACTER' && $d_prev_upper == 'SET') - || ($d_bef_prev_upper == 'SET' && $d_prev_upper == '=') - || ($d_bef_prev_upper == 'CHARSET' && $d_prev_upper == '=') - || $d_prev_upper == 'CHARSET') - && in_array($d_cur, $mysql_charsets) - ) { - $t_suffix = '_charset'; - } - } elseif (in_array($d_cur, $mysql_charsets) - || in_array($d_cur, $mysql_collations_flat) - || ($d_cur{0} == '_' - && in_array(/*overload*/mb_substr($d_cur, 1), $mysql_charsets)) - ) { - $t_suffix = '_charset'; - } else { - // Do nothing - } - // check if present in the list of forbidden words - if ($t_suffix == '_reservedWord' - && isset($PMA_SQPdata_forbidden_word[$d_cur_upper]) - ) { - $sql_array[$i]['forbidden'] = true; - } else { - $sql_array[$i]['forbidden'] = false; - } - $sql_array[$i]['type'] .= $t_suffix; - } - } // end for - - // Stores the size of the array inside the array, as count() is a slow - // operation. - $sql_array['len'] = $arraysize; - - // DEBUG echo 'After parsing
'; print_r($sql_array); echo '
'; - // Sends the data back - return $sql_array; -} // end of the "PMA_SQP_parse()" function - -/** - * Checks for token types being what we want... - * - * @param string $toCheck String of type that we have - * @param string $whatWeWant String of type that we want - * - * @return boolean result of check - * - * @access private - */ -function PMA_SQP_typeCheck($toCheck, $whatWeWant) -{ - $typeSeparator = '_'; - if (strcmp($whatWeWant, $toCheck) == 0) { - return true; - } - - if (/*overload*/mb_strpos($whatWeWant, $typeSeparator) !== false) { - return false; - } - - return strncmp( - $whatWeWant, $toCheck, - /*overload*/mb_strpos($toCheck, $typeSeparator) - ) == 0; -} - - -/** - * Analyzes SQL queries - * - * @param array $arr The SQL queries - * - * @return array The analyzed SQL queries - * - * @access public - */ -function PMA_SQP_analyze($arr) -{ - if ($arr == array() || ! isset($arr['len'])) { - return array(); - } - $result = array(); - $size = $arr['len']; - $subresult = array( - 'querytype' => '', - // the whole stuff between SELECT and FROM , except DISTINCT - 'select_expr_clause'=> '', - 'position_of_first_select' => '', // the array index - 'from_clause'=> '', - 'group_by_clause'=> '', - 'order_by_clause'=> '', - 'having_clause' => '', - 'limit_clause' => '', - 'where_clause' => '', - 'where_clause_identifiers' => array(), - 'unsorted_query' => '', - 'queryflags' => array(), - 'select_expr' => array(), - 'table_ref' => array(), - 'foreign_keys' => array(), - 'create_table_fields' => array() - ); - $subresult_empty = $subresult; - $seek_queryend = false; - $seen_end_of_table_ref = false; - $number_of_brackets_in_extract = 0; - $number_of_brackets_in_group_concat = 0; - - $number_of_brackets = 0; - $in_subquery = false; - $seen_subquery = false; - $seen_from = false; - - // for SELECT EXTRACT(YEAR_MONTH FROM CURDATE()) - // we must not use CURDATE as a table_ref - // so we track whether we are in the EXTRACT() - $in_extract = false; - - // for GROUP_CONCAT(...) - $in_group_concat = false; - - /* Description of analyzer results - * - * db, table, column, alias - * ------------------------ - * - * Inside the $subresult array, we create ['select_expr'] and ['table_ref'] - * arrays. - * - * The SELECT syntax (simplified) is - * - * SELECT - * select_expression,... - * [FROM [table_references] - * - * - * ['select_expr'] is filled with each expression, the key represents the - * expression position in the list (0-based) (so we don't lose track of - * multiple occurrences of the same column). - * - * ['table_ref'] is filled with each table ref, same thing for the key. - * - * I create all sub-values empty, even if they are - * not present (for example no select_expression alias). - * - * There is a debug section at the end of loop #1, if you want to - * see the exact contents of select_expr and table_ref - * - * queryflags - * ---------- - * - * In $subresult, array 'queryflags' is filled, according to what we - * find in the query. - * - * Currently, those are generated: - * - * ['queryflags']['select_from'] = 1; if this is a real SELECT...FROM - * ['queryflags']['drop_database'] = 1;if this is a DROP DATABASE - * ['queryflags']['reload'] = 1; for the purpose of reloading the - * navigation bar - * ['queryflags']['distinct'] = 1; for a DISTINCT - * ['queryflags']['union'] = 1; for a UNION - * ['queryflags']['join'] = 1; for a JOIN - * ['queryflags']['offset'] = 1; for the presence of OFFSET - * ['queryflags']['procedure'] = 1; for the presence of PROCEDURE - * ['queryflags']['is_explain'] = 1; for the presence of EXPLAIN - * ['queryflags']['is_delete'] = 1; for the presence of DELETE - * ['queryflags']['is_affected'] = 1; for the presence of UPDATE, DELETE - * or INSERT|LOAD DATA|REPLACE - * ['queryflags']['is_replace'] = 1; for the presence of REPLACE - * ['queryflags']['is_insert'] = 1; for the presence of INSERT - * ['queryflags']['is_maint'] = 1; for the presence of CHECK|ANALYZE - * |REPAIR|OPTIMIZE|CHECKSUM TABLE - * ['queryflags']['is_show'] = 1; for the presence of SHOW - * ['queryflags']['is_analyse'] = 1; for the presence of PROCEDURE ANALYSE - * ['queryflags']['is_export'] = 1; for the presence of INTO OUTFILE - * ['queryflags']['is_group'] = 1; for the presence of GROUP BY|HAVING| - * SELECT DISTINCT - * ['queryflags']['is_func'] = 1; for the presence of SUM|AVG|STD|STDDEV - * |MIN|MAX|BIT_OR|BIT_AND - * ['queryflags']['is_count'] = 1; for the presence of SELECT COUNT - * ['queryflags']['is_procedure'] = 1; for the presence of CALL - * ['queryflags']['is_subquery'] = 1; contains a subquery - * - * query clauses - * ------------- - * - * The select is split in those clauses: - * ['select_expr_clause'] - * ['from_clause'] - * ['group_by_clause'] - * ['order_by_clause'] - * ['having_clause'] - * ['limit_clause'] - * ['where_clause'] - * - * The identifiers of the WHERE clause are put into the array - * ['where_clause_identifier'] - * - * For a SELECT, the whole query without the ORDER BY clause is put into - * ['unsorted_query'] - * - * foreign keys - * ------------ - * The CREATE TABLE may contain FOREIGN KEY clauses, so they get - * analyzed and ['foreign_keys'] is an array filled with - * the constraint name, the index list, - * the REFERENCES table name and REFERENCES index list, - * and ON UPDATE | ON DELETE clauses - * - * position_of_first_select - * ------------------------ - * - * The array index of the first SELECT we find. Will be used to - * insert a SQL_CALC_FOUND_ROWS. - * - * create_table_fields - * ------------------- - * - * Used to detect the DEFAULT CURRENT_TIMESTAMP and - * ON UPDATE CURRENT_TIMESTAMP clauses of the CREATE TABLE query. - * Also used to store the default value of the field. - * An array, each element is the identifier name. - * Note that for now, the timestamp_not_null element is created - * even for non-TIMESTAMP fields. - * - * Sub-elements: ['type'] which contains the column type - * optional (currently they are never false but can be absent): - * ['default_current_timestamp'] boolean - * ['on_update_current_timestamp'] boolean - * ['timestamp_not_null'] boolean - * - * section_before_limit, section_after_limit - * ----------------------------------------- - * - * Marks the point of the query where we can insert a LIMIT clause; - * so the section_before_limit will contain the left part before - * a possible LIMIT clause - * - * - * End of description of analyzer results - */ - - // must be sorted - // TODO: current logic checks for only one word, so I put only the - // first word of the reserved expressions that end a table ref; - // maybe this is not ok (the first word might mean something else) - // $words_ending_table_ref = array( - // 'FOR UPDATE', - // 'GROUP BY', - // 'HAVING', - // 'LIMIT', - // 'LOCK IN SHARE MODE', - // 'ORDER BY', - // 'PROCEDURE', - // 'UNION', - // 'WHERE' - // ); - $words_ending_table_ref = array( - 'FOR' => 1, - 'GROUP' => 1, - 'HAVING' => 1, - 'LIMIT' => 1, - 'LOCK' => 1, - 'ORDER' => 1, - 'PROCEDURE' => 1, - 'UNION' => 1, - 'WHERE' => 1 - ); - - $words_ending_clauses = array( - 'FOR' => 1, - 'LIMIT' => 1, - 'LOCK' => 1, - 'PROCEDURE' => 1, - 'UNION' => 1 - ); - - $supported_query_types = array( - 'SELECT' => 1, - /* - // Support for these additional query types will come later on. - 'DELETE' => 1, - 'INSERT' => 1, - 'REPLACE' => 1, - 'TRUNCATE' => 1, - 'UPDATE' => 1, - 'EXPLAIN' => 1, - 'DESCRIBE' => 1, - 'SHOW' => 1, - 'CREATE' => 1, - 'SET' => 1, - 'ALTER' => 1 - */ - ); - - // loop #1 for each token: select_expr, table_ref for SELECT - - for ($i = 0; $i < $size; $i++) { - //DEBUG echo "Loop1 " . $arr[$i]['data'] - //. " (" . $arr[$i]['type'] . ")
"; - - // High speed seek for locating the end of the current query - if ($seek_queryend == true) { - if ($arr[$i]['type'] == 'punct_queryend') { - $seek_queryend = false; - } else { - continue; - } // end if (type == punct_queryend) - } // end if ($seek_queryend) - - /** - * Note: do not split if this is a punct_queryend for the first and only - * query - * @todo when we find a UNION, should we split in another subresult? - */ - if ($arr[$i]['type'] == 'punct_queryend' && ($i + 1 != $size)) { - $result[] = $subresult; - $subresult = $subresult_empty; - continue; - } // end if (type == punct_queryend) - - // ============================================================== - if ($arr[$i]['type'] == 'punct_bracket_open_round') { - $number_of_brackets++; - if ($in_extract) { - $number_of_brackets_in_extract++; - } - if ($in_group_concat) { - $number_of_brackets_in_group_concat++; - } - } - // ============================================================== - if ($arr[$i]['type'] == 'punct_bracket_close_round') { - $number_of_brackets--; - if ($number_of_brackets == 0) { - $in_subquery = false; - } - if ($in_extract) { - $number_of_brackets_in_extract--; - if ($number_of_brackets_in_extract == 0) { - $in_extract = false; - } - } - if ($in_group_concat) { - $number_of_brackets_in_group_concat--; - if ($number_of_brackets_in_group_concat == 0) { - $in_group_concat = false; - } - } - } - - if ($in_subquery) { - /** - * skip the subquery to avoid setting - * select_expr or table_ref with the contents - * of this subquery; this is to avoid a bug when - * trying to edit the results of - * select * from child where not exists (select id from - * parent where child.parent_id = parent.id); - */ - continue; - } - // ============================================================== - if ($arr[$i]['type'] == 'alpha_functionName') { - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - if ($upper_data =='EXTRACT') { - $in_extract = true; - $number_of_brackets_in_extract = 0; - } - if ($upper_data =='GROUP_CONCAT') { - $in_group_concat = true; - $number_of_brackets_in_group_concat = 0; - } - } - - // ============================================================== - if ($arr[$i]['type'] == 'alpha_reservedWord') { - // We don't know what type of query yet, so run this - if ($subresult['querytype'] == '') { - $subresult['querytype'] = /*overload*/mb_strtoupper( - $arr[$i]['data'] - ); - } // end if (querytype was empty) - - // Check if we support this type of query - if (!isset($supported_query_types[$subresult['querytype']])) { - // Skip ahead to the next one if we don't - $seek_queryend = true; - continue; - } // end if (query not supported) - - // upper once - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - /** - * @todo reset for each query? - */ - - if ($upper_data == 'SELECT') { - if ($number_of_brackets > 0) { - $in_subquery = true; - $seen_subquery = true; - $subresult['queryflags']['is_subquery'] = 1; - // this is a subquery so do not analyze inside it - continue; - } - $seen_from = false; - $previous_was_identifier = false; - $current_select_expr = -1; - $seen_end_of_table_ref = false; - } // end if (data == SELECT) - - if ($upper_data =='FROM' && !$in_extract) { - $current_table_ref = -1; - $seen_from = true; - $previous_was_identifier = false; - $save_table_ref = true; - } // end if (data == FROM) - - // here, do not 'continue' the loop, as we have more work for - // reserved words below - } // end if (type == alpha_reservedWord) - - // ============================== - if ($arr[$i]['type'] == 'quote_backtick' - || $arr[$i]['type'] == 'quote_double' - || $arr[$i]['type'] == 'quote_single' - || $arr[$i]['type'] == 'alpha_identifier' - || ($arr[$i]['type'] == 'alpha_reservedWord' - && $arr[$i]['forbidden'] == false) - ) { - switch ($arr[$i]['type']) { - case 'alpha_identifier': - case 'alpha_reservedWord': - /** - * this is not a real reservedWord, because it's not - * present in the list of forbidden words, for example - * "storage" which can be used as an identifier - * - */ - $identifier = $arr[$i]['data']; - break; - - case 'quote_backtick': - case 'quote_double': - case 'quote_single': - $identifier = PMA_Util::unQuote($arr[$i]['data']); - break; - } // end switch - - if ($subresult['querytype'] == 'SELECT' - && ! $in_group_concat - && ! ($seen_subquery - && $arr[$i - 1]['type'] == 'punct_bracket_close_round') - ) { - if (!$seen_from) { - if ($previous_was_identifier && isset($chain)) { - // found alias for this select_expr, save it - // but only if we got something in $chain - // (for example, SELECT COUNT(*) AS cnt - // puts nothing in $chain, so we avoid - // setting the alias) - $alias_for_select_expr = $identifier; - } else { - if (! isset($chain)) { - $chain = array(); - } - $chain[] = $identifier; - $previous_was_identifier = true; - - } // end if !$previous_was_identifier - } else { - // ($seen_from) - if ($save_table_ref && !$seen_end_of_table_ref) { - if ($previous_was_identifier) { - // found alias for table ref - // save it for later - $alias_for_table_ref = $identifier; - } else { - if (! isset($chain)) { - $chain = array(); - } - $chain[] = $identifier; - $previous_was_identifier = true; - - } // end if ($previous_was_identifier) - } // end if ($save_table_ref &&!$seen_end_of_table_ref) - } // end if (!$seen_from) - } // end if (querytype SELECT) - } // end if (quote_backtick or double quote or alpha_identifier) - - // =================================== - if ($arr[$i]['type'] == 'punct_qualifier') { - // to be able to detect an identifier following another - $previous_was_identifier = false; - continue; - } // end if (punct_qualifier) - - /** - * @todo check if 3 identifiers following one another -> error - */ - - // s a v e a s e l e c t e x p r - // finding a list separator or FROM - // means that we must save the current chain of identifiers - // into a select expression - - // for now, we only save a select expression if it contains - // at least one identifier, as we are interested in checking - // the columns and table names, so in "select * from persons", - // the "*" is not saved - - if (isset($chain) && !$seen_end_of_table_ref - && ((!$seen_from && $arr[$i]['type'] == 'punct_listsep') - || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data == 'FROM')) - ) { - $size_chain = count($chain); - $current_select_expr++; - $subresult['select_expr'][$current_select_expr] = array( - 'expr' => '', - 'alias' => '', - 'db' => '', - 'table_name' => '', - 'table_true_name' => '', - 'column' => '' - ); - - if (isset($alias_for_select_expr) - && /*overload*/mb_strlen($alias_for_select_expr) - ) { - // we had found an alias for this select expression - $subresult['select_expr'][$current_select_expr]['alias'] - = $alias_for_select_expr; - unset($alias_for_select_expr); - } - // there is at least a column - $subresult['select_expr'][$current_select_expr]['column'] - = $chain[$size_chain - 1]; - $subresult['select_expr'][$current_select_expr]['expr'] - = $chain[$size_chain - 1]; - - // maybe a table - if ($size_chain > 1) { - $subresult['select_expr'][$current_select_expr]['table_name'] - = $chain[$size_chain - 2]; - // we assume for now that this is also the true name - $subresult['select_expr'][$current_select_expr]['table_true_name'] - = $chain[$size_chain - 2]; - $subresult['select_expr'][$current_select_expr]['expr'] - = $subresult['select_expr'][$current_select_expr]['table_name'] - . '.' . $subresult['select_expr'][$current_select_expr]['expr']; - } // end if ($size_chain > 1) - - // maybe a db - if ($size_chain > 2) { - $subresult['select_expr'][$current_select_expr]['db'] - = $chain[$size_chain - 3]; - $subresult['select_expr'][$current_select_expr]['expr'] - = $subresult['select_expr'][$current_select_expr]['db'] - . '.' . $subresult['select_expr'][$current_select_expr]['expr']; - } // end if ($size_chain > 2) - unset($chain); - - /** - * @todo explain this: - */ - if (($arr[$i]['type'] == 'alpha_reservedWord') - && ($upper_data != 'FROM') - ) { - $previous_was_identifier = true; - } - - } // end if (save a select expr) - - //====================================== - // s a v e a t a b l e r e f - //====================================== - - // maybe we just saw the end of table refs - // but the last table ref has to be saved - // or we are at the last token - // or we just got a reserved word - /** - * @todo there could be another query after this one - */ - - if (isset($chain) && $seen_from && $save_table_ref - && ($arr[$i]['type'] == 'punct_listsep' - || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data != "AS") - || $seen_end_of_table_ref - || $i == $size - 1) - ) { - - $size_chain = count($chain); - $current_table_ref++; - $subresult['table_ref'][$current_table_ref] = array( - 'expr' => '', - 'db' => '', - 'table_name' => '', - 'table_alias' => '', - 'table_true_name' => '' - ); - if (isset($alias_for_table_ref) - && /*overload*/mb_strlen($alias_for_table_ref) - ) { - $subresult['table_ref'][$current_table_ref]['table_alias'] - = $alias_for_table_ref; - unset($alias_for_table_ref); - } - $subresult['table_ref'][$current_table_ref]['table_name'] - = $chain[$size_chain - 1]; - // we assume for now that this is also the true name - $subresult['table_ref'][$current_table_ref]['table_true_name'] - = $chain[$size_chain - 1]; - $subresult['table_ref'][$current_table_ref]['expr'] - = $subresult['table_ref'][$current_table_ref]['table_name']; - // maybe a db - if ($size_chain > 1) { - $subresult['table_ref'][$current_table_ref]['db'] - = $chain[$size_chain - 2]; - $subresult['table_ref'][$current_table_ref]['expr'] - = $subresult['table_ref'][$current_table_ref]['db'] - . '.' . $subresult['table_ref'][$current_table_ref]['expr']; - } // end if ($size_chain > 1) - - // add the table alias into the whole expression - $subresult['table_ref'][$current_table_ref]['expr'] - .= ' ' . $subresult['table_ref'][$current_table_ref]['table_alias']; - - unset($chain); - $previous_was_identifier = true; - //continue; - - } // end if (save a table ref) - - // when we have found all table refs, - // for each table_ref alias, put the true name of the table - // in the corresponding select expressions - - if (isset($current_table_ref) - && ($seen_end_of_table_ref || $i == $size-1) - && $subresult != $subresult_empty - ) { - for ($tr = 0; $tr <= $current_table_ref; $tr++) { - $alias = $subresult['table_ref'][$tr]['table_alias']; - $truename = $subresult['table_ref'][$tr]['table_true_name']; - for ($se = 0; $se <= $current_select_expr; $se++) { - if (isset($alias) - && /*overload*/mb_strlen($alias) - && $subresult['select_expr'][$se]['table_true_name'] == $alias - ) { - $subresult['select_expr'][$se]['table_true_name'] - = $truename; - } // end if (found the alias) - } // end for (select expressions) - - } // end for (table refs) - } // end if (set the true names) - - // e n d i n g l o o p #1 - // set the $previous_was_identifier to false if the current - // token is not an identifier - if (($arr[$i]['type'] != 'alpha_identifier') - && ($arr[$i]['type'] != 'quote_double') - && ($arr[$i]['type'] != 'quote_single') - && ($arr[$i]['type'] != 'quote_backtick') - ) { - $previous_was_identifier = false; - } // end if - - // however, if we are on AS, we must keep the $previous_was_identifier - if (($arr[$i]['type'] == 'alpha_reservedWord') - && ($upper_data == 'AS') - ) { - $previous_was_identifier = true; - } - - if (($arr[$i]['type'] == 'alpha_reservedWord') - && ($upper_data =='ON' || $upper_data =='USING') - ) { - $save_table_ref = false; - } // end if (data == ON) - - if (($arr[$i]['type'] == 'alpha_reservedWord') - && ($upper_data =='JOIN' || $upper_data =='FROM') - ) { - $save_table_ref = true; - } // end if (data == JOIN) - - /** - * no need to check the end of table ref if we already did - * - * @todo maybe add "&& $seen_from" - */ - if (!$seen_end_of_table_ref) { - // if this is the last token, it implies that we have - // seen the end of table references - // Check for the end of table references - // - // Note: if we are analyzing a GROUP_CONCAT clause, - // we might find a word that seems to indicate that - // we have found the end of table refs (like ORDER) - // but it's a modifier of the GROUP_CONCAT so - // it's not the real end of table refs - if (($i == $size-1) - || ($arr[$i]['type'] == 'alpha_reservedWord' - && !$in_group_concat - && isset($words_ending_table_ref[$upper_data])) - ) { - $seen_end_of_table_ref = true; - // to be able to save the last table ref, but do not - // set it true if we found a word like "ON" that has - // already set it to false - if (isset($save_table_ref) && $save_table_ref != false) { - $save_table_ref = true; - } //end if - - } // end if (check for end of table ref) - } //end if (!$seen_end_of_table_ref) - - if ($seen_end_of_table_ref) { - $save_table_ref = false; - } // end if - - } // end for $i (loop #1) - - //DEBUG - /* - if (isset($current_select_expr)) { - for ($trace = 0; $trace <= $current_select_expr; $trace++) { - echo "
"; - reset ($subresult['select_expr'][$trace]); - while (list ($key, $val) = each ($subresult['select_expr'][$trace])) - echo "sel expr $trace $key => $val
\n"; - } - } - - if (isset($current_table_ref)) { - echo "current_table_ref = " . $current_table_ref . "
"; - for ($trace = 0; $trace <= $current_table_ref; $trace++) { - - echo "
"; - reset ($subresult['table_ref'][$trace]); - while (list ($key, $val) = each ($subresult['table_ref'][$trace])) - echo "table ref $trace $key => $val
\n"; - } - } - */ - // ------------------------------------------------------- - - // loop #2: - queryflags - // - querytype (for queries != 'SELECT') - // - section_before_limit, section_after_limit - // - // we will also need this queryflag in loop 2 - // so set it here - if (isset($current_table_ref) && $current_table_ref > -1) { - $subresult['queryflags']['select_from'] = 1; - } - - $section_before_limit = ''; - $section_after_limit = ''; // truly the section after the limit clause - $seen_reserved_word = false; - $seen_group = false; - $seen_order = false; - $seen_order_by = false; - $in_group_by = false; // true when we are inside the GROUP BY clause - $in_order_by = false; // true when we are inside the ORDER BY clause - $in_having = false; // true when we are inside the HAVING clause - $in_select_expr = false; // true when we are inside the select expr clause - $in_where = false; // true when we are inside the WHERE clause - $seen_limit = false; // true if we have seen a LIMIT clause - $in_limit = false; // true when we are inside the LIMIT clause - $after_limit = false; // true when we are after the LIMIT clause - $in_from = false; // true when we are in the FROM clause - $in_group_concat = false; - $first_reserved_word = ''; - $current_identifier = ''; - $unsorted_query = $arr['raw']; // in case there is no ORDER BY - $number_of_brackets = 0; - $in_subquery = false; - - $arrayFunctions = array( - "SUM","AVG","STD","STDDEV","MIN","MAX","BIT_OR","BIT_AND" - ); - $arrayKeyWords = array("BY", "HAVING", "SELECT"); - - for ($i = 0; $i < $size; $i++) { - //DEBUG echo "Loop2 " . $arr[$i]['data'] - //. " (" . $arr[$i]['type'] . ")
"; - - if ($arr[$i]['type'] == 'punct_bracket_open_round') { - $number_of_brackets++; - } - - if ($arr[$i]['type'] == 'punct_bracket_close_round') { - $number_of_brackets--; - if ($number_of_brackets == 0) { - $in_subquery = false; - } - } - - if ($arr[$i]['type'] == 'alpha_reservedWord') { - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - - if ($upper_data == 'SELECT' && $number_of_brackets > 0) { - $in_subquery = true; - } - - if (!$seen_reserved_word) { - $first_reserved_word = $upper_data; - $subresult['querytype'] = $upper_data; - $seen_reserved_word = true; - - if ($first_reserved_word === 'SELECT') { - $position_of_first_select = $i; - } elseif ($first_reserved_word === 'EXPLAIN') { - $subresult['queryflags']['is_explain'] = 1; - } elseif ($first_reserved_word === 'DELETE') { - $subresult['queryflags']['is_delete'] = 1; - $subresult['queryflags']['is_affected'] = 1; - } elseif ($first_reserved_word === 'UPDATE') { - $subresult['queryflags']['is_affected'] = 1; - } elseif ($first_reserved_word === 'REPLACE') { - $subresult['queryflags']['is_replace'] = 1; - $subresult['queryflags']['is_affected'] = 1; - } elseif ($first_reserved_word === 'INSERT') { - $subresult['queryflags']['is_insert'] = 1; - $subresult['queryflags']['is_affected'] = 1; - } elseif ($first_reserved_word === 'SHOW') { - $subresult['queryflags']['is_show'] = 1; - } - - } else { - // for the presence of DROP DATABASE - if ($first_reserved_word == 'DROP' && $upper_data == 'DATABASE') { - $subresult['queryflags']['drop_database'] = 1; - } - // A table has to be created, renamed, dropped -> navi panel - // should be reloaded - $keywords1 = array('CREATE', 'ALTER', 'DROP'); - $keywords2 = array('VIEW', 'TABLE', 'DATABASE', 'SCHEMA'); - if (in_array($first_reserved_word, $keywords1) - && in_array($upper_data, $keywords2) - ) { - $subresult['queryflags']['reload'] = 1; - } - // for the presence of CHECK|ANALYZE|REPAIR|OPTIMIZE|CHECKSUM TABLE - $keywords = array( - 'CHECK', 'ANALYZE', 'REPAIR', 'OPTIMIZE', 'CHECKSUM' - ); - if (in_array($first_reserved_word, $keywords) - && $upper_data == 'TABLE' - ) { - $subresult['queryflags']['is_maint'] = 1; - } - } - - if ($upper_data == 'LIMIT' && ! $in_subquery) { - $section_before_limit = /*overload*/mb_substr( - $arr['raw'], 0, $arr[$i]['pos'] - 5 - ); - $in_limit = true; - $seen_limit = true; - $limit_clause = ''; - $in_order_by = false; // @todo maybe others to set false - } - - if ($upper_data == 'PROCEDURE') { - $subresult['queryflags']['procedure'] = 1; - $in_limit = false; - $after_limit = true; - - // for the presence of PROCEDURE ANALYSE - if (isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - && ($i + 1) < $size - && $arr[$i + 1]['type'] == 'alpha_reservedWord' - && /*overload*/mb_strtoupper($arr[$i + 1]['data']) == 'ANALYSE' - ) { - $subresult['queryflags']['is_analyse'] = 1; - } - } - - // for the presence of INTO OUTFILE - if ($upper_data == 'INTO' - && isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - && ($i + 1) < $size - && $arr[$i + 1]['type'] == 'alpha_reservedWord' - && /*overload*/mb_strtoupper($arr[$i + 1]['data']) == 'OUTFILE' - ) { - $subresult['queryflags']['is_export'] = 1; - } - /** - * @todo set also to false if we find FOR UPDATE or LOCK IN SHARE MODE - */ - if ($upper_data == 'SELECT') { - $in_select_expr = true; - $select_expr_clause = ''; - - // for the presence of SELECT COUNT - if (isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - && !isset($subresult['queryflags']['is_group']) - && ($i + 1) < $size - && $arr[$i + 1]['type'] == 'alpha_functionName' - && /*overload*/mb_strtoupper($arr[$i + 1]['data']) == 'COUNT' - ) { - $subresult['queryflags']['is_count'] = 1; - } - } - - if ($upper_data == 'DISTINCT' && !$in_group_concat) { - $subresult['queryflags']['distinct'] = 1; - } - - if ($upper_data == 'UNION') { - $subresult['queryflags']['union'] = 1; - } - - if ($upper_data == 'JOIN') { - $subresult['queryflags']['join'] = 1; - } - - if ($upper_data == 'OFFSET') { - $subresult['queryflags']['offset'] = 1; - } - - // for the presence of CALL - if ($upper_data == 'CALL') { - $subresult['queryflags']['is_procedure'] = 1; - } - - // if this is a real SELECT...FROM - if ($upper_data == 'FROM' - && isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - ) { - $in_from = true; - $from_clause = ''; - $in_select_expr = false; - } - - // (we could have less resetting of variables to false - // if we trust that the query respects the standard - // MySQL order for clauses) - - // we use $seen_group and $seen_order because we are looking - // for the BY - if ($upper_data == 'GROUP') { - $seen_group = true; - $seen_order = false; - $in_having = false; - $in_order_by = false; - $in_where = false; - $in_select_expr = false; - $in_from = false; - - // for the presence of GROUP BY|HAVING|SELECT DISTINCT - if (isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - && ($i + 1) < $size - && $arr[$i + 1]['type'] == 'alpha_reservedWord' - && in_array( - /*overload*/mb_strtoupper($arr[$i + 1]['data']), - $arrayKeyWords - ) - && ($i + 2) < $size - && $arr[$i + 2]['type'] == 'alpha_reservedWord' - && /*overload*/mb_strtoupper($arr[$i + 2]['data']) == 'DISTINCT' - ) { - $subresult['queryflags']['is_group'] = 1; - } - } - if ($upper_data == 'ORDER' && !$in_group_concat) { - $seen_order = true; - $seen_group = false; - $in_having = false; - $in_group_by = false; - $in_where = false; - $in_select_expr = false; - $in_from = false; - } - if ($upper_data == 'HAVING') { - $in_having = true; - $having_clause = ''; - $seen_group = false; - $seen_order = false; - $in_group_by = false; - $in_order_by = false; - $in_where = false; - $in_select_expr = false; - $in_from = false; - } - - if ($upper_data == 'WHERE') { - $in_where = true; - $where_clause = ''; - $where_clause_identifiers = array(); - $seen_group = false; - $seen_order = false; - $in_group_by = false; - $in_order_by = false; - $in_having = false; - $in_select_expr = false; - $in_from = false; - } - - if ($upper_data == 'BY') { - if ($seen_group) { - $in_group_by = true; - $group_by_clause = ''; - } - if ($seen_order) { - $seen_order_by = true; - // Here we assume that the ORDER BY keywords took - // exactly 8 characters. - // We use $GLOBALS['PMA_String']->substr() to be charset-safe; - // otherwise if the table name contains accents, the unsorted - // query would be missing some characters. - $unsorted_query = /*overload*/mb_substr( - $arr['raw'], 0, $arr[$i]['pos'] - 8 - ); - $in_order_by = true; - $order_by_clause = ''; - } - } - - // if we find one of the words that could end the clause - if (isset($words_ending_clauses[$upper_data])) { - - $in_group_by = false; - $in_order_by = false; - $in_having = false; - $in_where = false; - $in_select_expr = false; - $in_from = false; - } - - } // endif (reservedWord) - - // do not add a space after a function name - /** - * @todo can we combine loop 2 and loop 1? some code is repeated here... - */ - - $sep = ' '; - if ($arr[$i]['type'] == 'alpha_functionName') { - $sep = ''; - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - if ($upper_data =='GROUP_CONCAT') { - $in_group_concat = true; - $number_of_brackets_in_group_concat = 0; - } - } - - if ($arr[$i]['type'] == 'punct_bracket_open_round') { - if ($in_group_concat) { - $number_of_brackets_in_group_concat++; - } - } - if ($arr[$i]['type'] == 'punct_bracket_close_round') { - if ($in_group_concat) { - $number_of_brackets_in_group_concat--; - if ($number_of_brackets_in_group_concat == 0) { - $in_group_concat = false; - } - } - } - - // do not add a space after an identifier if followed by a dot - if ($arr[$i]['type'] == 'alpha_identifier' - && $i < $size - 1 && $arr[$i + 1]['data'] == '.' - ) { - $sep = ''; - } - - // do not add a space after a dot if followed by an identifier - if ($arr[$i]['data'] == '.' && $i < $size - 1 - && $arr[$i + 1]['type'] == 'alpha_identifier' - ) { - $sep = ''; - } - - // for the presence of INSERT|LOAD DATA - if ($arr[$i]['type'] == 'alpha_identifier' - && /*overload*/mb_strtoupper($arr[$i]['data']) == 'DATA' - && ($i - 1) >= 0 - && $arr[$i - 1]['type'] == 'alpha_reservedWord' - && in_array( - /*overload*/mb_strtoupper($arr[$i - 1]['data']), - array("INSERT", "LOAD") - ) - ) { - $subresult['queryflags']['is_insert'] = 1; - $subresult['queryflags']['is_affected'] = 1; - } - - // for the presence of SUM|AVG|STD|STDDEV|MIN|MAX|BIT_OR|BIT_AND - if ($arr[$i]['type'] == 'alpha_functionName' - && in_array(/*overload*/mb_strtoupper($arr[$i]['data']), $arrayFunctions) - && isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - && !isset($subresult['queryflags']['is_group']) - ) { - $subresult['queryflags']['is_func'] = 1; - } - - if ($in_select_expr && $upper_data != 'SELECT' - && $upper_data != 'DISTINCT' - ) { - $select_expr_clause .= $arr[$i]['data'] . $sep; - } - if ($in_from && $upper_data != 'FROM') { - $from_clause .= $arr[$i]['data'] . $sep; - } - if ($in_group_by && $upper_data != 'GROUP' && $upper_data != 'BY') { - $group_by_clause .= $arr[$i]['data'] . $sep; - } - if ($in_order_by && $upper_data != 'ORDER' && $upper_data != 'BY') { - // add a space only before ASC or DESC - // not around the dot between dbname and tablename - if ($arr[$i]['type'] == 'alpha_reservedWord') { - $order_by_clause .= $sep; - } - $order_by_clause .= $arr[$i]['data']; - } - if ($in_having && $upper_data != 'HAVING') { - $having_clause .= $arr[$i]['data'] . $sep; - } - if ($in_where && $upper_data != 'WHERE') { - $where_clause .= $arr[$i]['data'] . $sep; - - if (($arr[$i]['type'] == 'quote_backtick') - || ($arr[$i]['type'] == 'alpha_identifier') - ) { - $where_clause_identifiers[] = $arr[$i]['data']; - } - } - - // to grab the rest of the query after the ORDER BY clause - if (isset($subresult['queryflags']['select_from']) - && $subresult['queryflags']['select_from'] == 1 - && ! $in_order_by - && $seen_order_by - && $upper_data != 'BY' - ) { - $unsorted_query .= $arr[$i]['data']; - if ($arr[$i]['type'] != 'punct_bracket_open_round' - && $arr[$i]['type'] != 'punct_bracket_close_round' - && $arr[$i]['type'] != 'punct' - ) { - $unsorted_query .= $sep; - } - } - - if ($in_limit) { - if ($upper_data == 'OFFSET') { - $limit_clause .= $sep; - } - $limit_clause .= $arr[$i]['data']; - if ($upper_data == 'LIMIT' || $upper_data == 'OFFSET') { - $limit_clause .= $sep; - } - } - if ($after_limit && $seen_limit) { - $section_after_limit .= $arr[$i]['data'] . $sep; - } - - // clear $upper_data for next iteration - $upper_data = ''; - } // end for $i (loop #2) - if (empty($section_before_limit)) { - $section_before_limit = $arr['raw']; - } - - // ----------------------------------------------------- - // loop #3: foreign keys and MySQL 4.1.2+ TIMESTAMP options - // (for now, check only the first query) - // (for now, identifiers are assumed to be backquoted) - - // If we find that we are dealing with a CREATE TABLE query, - // we look for the next punct_bracket_open_round, which - // introduces the fields list. Then, when we find a - // quote_backtick, it must be a field, so we put it into - // the create_table_fields array. Even if this field is - // not a timestamp, it will be useful when logic has been - // added for complete field attributes analysis. - - $seen_foreign = false; - $seen_references = false; - $seen_constraint = false; - $foreign_key_number = -1; - $seen_create_table = false; - $seen_create = false; - $seen_alter = false; - $in_create_table_fields = false; - $brackets_level = 0; - $in_timestamp_options = false; - $seen_default = false; - - for ($i = 0; $i < $size; $i++) { - if ($arr[$i]['type'] == 'alpha_reservedWord') { - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - - if ($upper_data == 'NOT' && $in_timestamp_options) { - if (! isset($create_table_fields)) { - $create_table_fields = array(); - } - $create_table_fields[$current_identifier]['timestamp_not_null'] - = true; - - } - - if ($upper_data == 'CREATE') { - $seen_create = true; - } - - if ($upper_data == 'ALTER') { - $seen_alter = true; - } - - if ($upper_data == 'TABLE' && $seen_create) { - $seen_create_table = true; - $create_table_fields = array(); - } - - if ($upper_data == 'CURRENT_TIMESTAMP') { - if ($in_timestamp_options) { - if ($seen_default) { - $create_table_fields[$current_identifier] - ['default_current_timestamp'] = true; - } - } - } - - if ($upper_data == 'CONSTRAINT') { - $foreign_key_number++; - $seen_foreign = false; - $seen_references = false; - $seen_constraint = true; - } - if ($upper_data == 'FOREIGN') { - $seen_foreign = true; - $seen_references = false; - $seen_constraint = false; - } - if ($upper_data == 'REFERENCES') { - $seen_foreign = false; - $seen_references = true; - $seen_constraint = false; - } - - // Cases covered: - - // [ON DELETE {CASCADE | SET NULL | NO ACTION | RESTRICT}] - // [ON UPDATE {CASCADE | SET NULL | NO ACTION | RESTRICT}] - - // but we set ['on_delete'] or ['on_cascade'] to - // CASCADE | SET_NULL | NO_ACTION | RESTRICT - - // ON UPDATE CURRENT_TIMESTAMP - - if ($upper_data == 'ON') { - if (isset($arr[$i+1]) - && $arr[$i+1]['type'] == 'alpha_reservedWord' - ) { - $second_upper_data = /*overload*/mb_strtoupper( - $arr[$i+1]['data'] - ); - if ($second_upper_data == 'DELETE') { - $clause = 'on_delete'; - } - if ($second_upper_data == 'UPDATE') { - $clause = 'on_update'; - } - // ugly workaround because currently, NO is not - // in the list of reserved words in sqlparser.data - // (we got a bug report about not being able to use - // 'no' as an identifier) - if (isset($clause) - && ($arr[$i+2]['type'] == 'alpha_reservedWord' - || ($arr[$i+2]['type'] == 'alpha_identifier' - && /*overload*/mb_strtoupper($arr[$i+2]['data'])=='NO')) - ) { - $third_upper_data = /*overload*/mb_strtoupper( - $arr[$i+2]['data'] - ); - if ($third_upper_data == 'CASCADE' - || $third_upper_data == 'RESTRICT' - ) { - $value = $third_upper_data; - } elseif ($third_upper_data == 'SET' - || $third_upper_data == 'NO' - ) { - if ($arr[$i+3]['type'] == 'alpha_reservedWord') { - $value = $third_upper_data . '_' - . /*overload*/mb_strtoupper($arr[$i + 3]['data']); - } - } elseif ($third_upper_data == 'CURRENT_TIMESTAMP') { - if ($clause == 'on_update' - && $in_timestamp_options - ) { - $create_table_fields[$current_identifier] - ['on_update_current_timestamp'] - = true; - $seen_default = false; - } - - } else { - $value = ''; - } - if (!empty($value)) { - if (! isset($foreign)) { - $foreign = array(); - } - $foreign[$foreign_key_number][$clause] = $value; - } - unset($clause); - } // endif (isset($clause)) - } - } - - } // end of reserved words analysis - - if ($arr[$i]['type'] == 'punct_bracket_open_round') { - $brackets_level++; - if ($seen_create_table && $brackets_level == 1) { - $in_create_table_fields = true; - } - } - - if ($arr[$i]['type'] == 'punct_bracket_close_round') { - $brackets_level--; - if ($seen_references) { - $seen_references = false; - } - if ($seen_create_table && $brackets_level == 0) { - $in_create_table_fields = false; - } - } - - if (($arr[$i]['type'] == 'alpha_columnAttrib')) { - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - if ($seen_create_table && $in_create_table_fields) { - if ($upper_data == 'DEFAULT') { - $seen_default = true; - $create_table_fields[$current_identifier]['default_value'] - = $arr[$i + 1]['data']; - } - } - } - - /** - * @see @todo 2005-10-16 note: the "or" part here is a workaround for a bug - */ - if (($arr[$i]['type'] == 'alpha_columnType') - || ($arr[$i]['type'] == 'alpha_functionName' && $seen_create_table) - ) { - $upper_data = /*overload*/mb_strtoupper($arr[$i]['data']); - if ($seen_create_table && $in_create_table_fields - && isset($current_identifier) - ) { - $create_table_fields[$current_identifier]['type'] = $upper_data; - if ($upper_data == 'TIMESTAMP') { - $arr[$i]['type'] = 'alpha_columnType'; - $in_timestamp_options = true; - } else { - $in_timestamp_options = false; - if ($upper_data == 'CHAR') { - $arr[$i]['type'] = 'alpha_columnType'; - } - } - } - } - - if ($arr[$i]['type'] == 'quote_backtick' - || $arr[$i]['type'] == 'alpha_identifier' - ) { - - if ($arr[$i]['type'] == 'quote_backtick') { - // remove backquotes - $identifier = PMA_Util::unQuote($arr[$i]['data']); - } else { - $identifier = $arr[$i]['data']; - } - - if ($seen_create_table && $in_create_table_fields) { - $current_identifier = $identifier; - // we set this one even for non TIMESTAMP type - $create_table_fields[$current_identifier]['timestamp_not_null'] - = false; - } - - if ($seen_constraint) { - $foreign[$foreign_key_number]['constraint'] = $identifier; - } - - if ($seen_foreign && $brackets_level > 0) { - $foreign[$foreign_key_number]['index_list'][] = $identifier; - } - - if ($seen_references) { - if ($seen_alter && $brackets_level > 0) { - $foreign[$foreign_key_number]['ref_index_list'][] = $identifier; - // here, the first bracket level corresponds to the - // bracket of CREATE TABLE - // so if we are on level 2, it must be the index list - // of the foreign key REFERENCES - } elseif ($brackets_level > 1) { - $foreign[$foreign_key_number]['ref_index_list'][] = $identifier; - } elseif ($arr[$i+1]['type'] == 'punct_qualifier') { - // identifier is `db`.`table` - // the first pass will pick the db name - // the next pass will pick the table name - $foreign[$foreign_key_number]['ref_db_name'] = $identifier; - } else { - // identifier is `table` - $foreign[$foreign_key_number]['ref_table_name'] = $identifier; - } - } - } - } // end for $i (loop #3) - - // Fill the $subresult array - - if (isset($create_table_fields)) { - $subresult['create_table_fields'] = $create_table_fields; - } - - if (isset($foreign)) { - $subresult['foreign_keys'] = $foreign; - } - - if (isset($select_expr_clause)) { - $subresult['select_expr_clause'] = $select_expr_clause; - } - if (isset($from_clause)) { - $subresult['from_clause'] = $from_clause; - } - if (isset($group_by_clause)) { - $subresult['group_by_clause'] = $group_by_clause; - } - if (isset($order_by_clause)) { - $subresult['order_by_clause'] = $order_by_clause; - } - if (isset($having_clause)) { - $subresult['having_clause'] = $having_clause; - } - if (isset($limit_clause)) { - $subresult['limit_clause'] = $limit_clause; - } - if (isset($where_clause)) { - $subresult['where_clause'] = $where_clause; - } - if (isset($unsorted_query) && !empty($unsorted_query)) { - $subresult['unsorted_query'] = $unsorted_query; - } - if (isset($where_clause_identifiers)) { - $subresult['where_clause_identifiers'] = $where_clause_identifiers; - } - - if (isset($position_of_first_select)) { - $subresult['position_of_first_select'] = $position_of_first_select; - $subresult['section_before_limit'] = $section_before_limit; - $subresult['section_after_limit'] = $section_after_limit; - } - - // They are naughty and didn't have a trailing semi-colon, - // then still handle it properly - if ($subresult['querytype'] != '') { - $result[] = $subresult; - } - return $result; -} // end of the "PMA_SQP_analyze()" function - - -/** - * Formats SQL queries - * - * @param array $arr The SQL queries - * @param string $mode formatting mode - * @param integer $start_token starting token - * @param integer $number_of_tokens number of tokens to format, -1 = all - * - * @return string The formatted SQL queries - * - * @access public - */ -function PMA_SQP_format( - $arr, $mode='text', $start_token=0, - $number_of_tokens=-1 -) { - //DEBUG echo 'in Format
'; print_r($arr); echo '
'; - // then check for an array - if (! is_array($arr)) { - return htmlspecialchars($arr); - } - // first check for the SQL parser having hit an error - if (PMA_SQP_isError()) { - return htmlspecialchars($arr['raw']); - } - // else do it properly - switch ($mode) { - case 'query_only': - $str = ''; - $html_line_break = "\n"; - break; - case 'text': - $str = ''; - $html_line_break = '
'; - break; - } // end switch - $indent = 0; - $bracketlevel = 0; - $functionlevel = 0; - $infunction = false; - $space_punct_listsep = ' '; - $space_punct_listsep_function_name = ' '; - // $space_alpha_reserved_word = '
'."\n"; - $space_alpha_reserved_word = ' '; - - $keywords_with_brackets_1before = array( - 'INDEX' => 1, - 'KEY' => 1, - 'ON' => 1, - 'USING' => 1 - ); - - $keywords_with_brackets_2before = array( - 'IGNORE' => 1, - 'INDEX' => 1, - 'INTO' => 1, - 'KEY' => 1, - 'PRIMARY' => 1, - 'PROCEDURE' => 1, - 'REFERENCES' => 1, - 'UNIQUE' => 1, - 'USE' => 1 - ); - - // These reserved words do NOT get a newline placed near them. - $keywords_no_newline = array( - 'AS' => 1, - 'ASC' => 1, - 'DESC' => 1, - 'DISTINCT' => 1, - 'DUPLICATE' => 1, - 'HOUR' => 1, - 'INTERVAL' => 1, - 'IS' => 1, - 'LIKE' => 1, - 'NOT' => 1, - 'NULL' => 1, - 'ON' => 1, - 'REGEXP' => 1 - ); - - // These reserved words introduce a privilege list - $keywords_priv_list = array( - 'GRANT' => 1, - 'REVOKE' => 1 - ); - - if ($number_of_tokens == -1) { - $number_of_tokens = $arr['len']; - } - $typearr = array(); - if ($number_of_tokens >= 0) { - $typearr[0] = ''; - $typearr[1] = ''; - $typearr[2] = ''; - $typearr[3] = $arr[$start_token]['type']; - } - - $in_priv_list = false; - for ($i = $start_token; $i < $number_of_tokens; $i++) { - // DEBUG echo "Loop format " . $arr[$i]['data'] - // . " " . $arr[$i]['type'] . "
"; - $before = ''; - $after = ''; - // array_shift($typearr); - /* - 0 prev2 - 1 prev - 2 current - 3 next - */ - if (($i + 1) < $number_of_tokens) { - $typearr[4] = $arr[$i + 1]['type']; - } else { - $typearr[4] = ''; - } - - for ($j = 0; $j < 4; $j++) { - $typearr[$j] = $typearr[$j + 1]; - } - - switch ($typearr[2]) { - case 'alpha_bitfield_constant_introducer': - $before = ' '; - $after = ''; - break; - case 'white_newline': - $before = ''; - break; - case 'punct_bracket_open_round': - $bracketlevel++; - $infunction = false; - $keyword_brackets_2before = isset( - $keywords_with_brackets_2before[ - /*overload*/mb_strtoupper($arr[$i - 2]['data']) - ] - ); - $keyword_brackets_1before = isset( - $keywords_with_brackets_1before[ - /*overload*/mb_strtoupper($arr[$i - 1]['data']) - ] - ); - // Make sure this array is sorted! - if (($typearr[1] == 'alpha_functionName') - || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct') - || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') - || ($typearr[3] == 'digit_float') - || ($typearr[0] == 'alpha_reservedWord' && $keyword_brackets_2before) - || ($typearr[1] == 'alpha_reservedWord' && $keyword_brackets_1before) - ) { - $functionlevel++; - $infunction = true; - $after .= ' '; - } else { - $indent++; - if ($mode != 'query_only') { - $after .= '
'; - } else { - $after .= ' '; - } - } - break; - case 'alpha_identifier': - if (($typearr[1] == 'punct_qualifier') - || ($typearr[3] == 'punct_qualifier') - ) { - $after = ''; - $before = ''; - } - // for example SELECT 1 somealias - if ($typearr[1] == 'digit_integer') { - $before = ' '; - } - if (($typearr[3] == 'alpha_columnType') - || ($typearr[3] == 'alpha_identifier') - ) { - $after .= ' '; - } - break; - case 'punct_user': - case 'punct_qualifier': - $before = ''; - $after = ''; - break; - case 'punct_listsep': - if ($infunction == true) { - $after .= $space_punct_listsep_function_name; - } else { - $after .= $space_punct_listsep; - } - break; - case 'punct_queryend': - if (($typearr[3] != 'comment_mysql') - && ($typearr[3] != 'comment_ansi') - && $typearr[3] != 'comment_c' - ) { - $after .= $html_line_break; - $after .= $html_line_break; - } - $space_punct_listsep = ' '; - $space_punct_listsep_function_name = ' '; - $space_alpha_reserved_word = ' '; - $in_priv_list = false; - break; - case 'comment_mysql': - case 'comment_ansi': - $after .= $html_line_break; - break; - case 'punct': - $before .= ' '; - - // workaround for - // select * from mytable limit 0,-1 - // (a side effect of this workaround is that - // select 20 - 9 - // becomes - // select 20 -9 - // ) - if ($typearr[3] != 'digit_integer') { - $after .= ' '; - } - break; - case 'punct_bracket_close_round': - // only close bracket level when it was opened before - if ($bracketlevel > 0) { - $bracketlevel--; - if ($infunction == true) { - $functionlevel--; - $after .= ' '; - $before .= ' '; - } else { - $indent--; - $before .= ($mode != 'query_only' ? '
' : ' '); - } - $infunction = ($functionlevel > 0) ? true : false; - } - break; - case 'alpha_columnType': - if ($typearr[3] == 'alpha_columnAttrib') { - $after .= ' '; - } - if ($typearr[1] == 'alpha_columnType') { - $before .= ' '; - } - break; - case 'alpha_columnAttrib': - - // ALTER TABLE tbl_name AUTO_INCREMENT = 1 - // COLLATE LATIN1_GENERAL_CI DEFAULT - if ($typearr[1] == 'alpha_identifier' - || $typearr[1] == 'alpha_charset' - ) { - $before .= ' '; - } - if (($typearr[3] == 'alpha_columnAttrib') - || ($typearr[3] == 'quote_single') - || ($typearr[3] == 'digit_integer') - ) { - $after .= ' '; - } - // workaround for - // AUTO_INCREMENT = 31DEFAULT_CHARSET = utf-8 - - if ($typearr[2] == 'alpha_columnAttrib' - && $typearr[3] == 'alpha_reservedWord' - ) { - $before .= ' '; - } - // workaround for - // select * from mysql.user where binary user="root" - // binary is marked as alpha_columnAttrib - // but should be marked as a reserved word - if (/*overload*/mb_strtoupper($arr[$i]['data']) == 'BINARY' - && $typearr[3] == 'alpha_identifier' - ) { - $after .= ' '; - } - break; - case 'alpha_functionName': - break; - case 'alpha_reservedWord': - // do not uppercase the reserved word if we are calling - // this function in query_only mode, because we need - // the original query (otherwise we get problems with - // semi-reserved words like "storage" which is legal - // as an identifier name) - - if ($mode != 'query_only') { - $arr[$i]['data'] = /*overload*/mb_strtoupper($arr[$i]['data']); - } - - list($before, $in_priv_list) = PMA_SQP_getBeforeAndInPrivList( - $arr, $typearr, $keywords_no_newline, $i, $in_priv_list, - $space_alpha_reserved_word, $before, $keywords_priv_list - ); - - list($space_punct_listsep, $space_alpha_reserved_word) - = PMA_SQP_getListsepAndReservedWord( - $arr[$i]['data'], $in_priv_list, $html_line_break, - $space_punct_listsep, $space_alpha_reserved_word - ); - - $after .= ' '; - break; - case 'digit_integer': - case 'digit_float': - case 'digit_hex': - /** - * @todo could there be other types preceding a digit? - */ - if ($typearr[1] == 'alpha_reservedWord') { - $after .= ' '; - } - if ($infunction && $typearr[3] == 'punct_bracket_close_round') { - $after .= ' '; - } - if ($typearr[1] == 'alpha_columnAttrib') { - $before .= ' '; - } - break; - case 'alpha_variable': - $after = ' '; - break; - case 'quote_double': - case 'quote_single': - // workaround: for the query - // REVOKE SELECT ON `base2\_db`.* FROM 'user'@'%' - // the @ is incorrectly marked as alpha_variable - // in the parser, and here, the '%' gets a blank before, - // which is a syntax error - if ($typearr[1] != 'punct_user' - && $typearr[1] != 'alpha_bitfield_constant_introducer' - ) { - $before .= ' '; - } - if ($infunction && $typearr[3] == 'punct_bracket_close_round') { - $after .= ' '; - } - break; - case 'quote_backtick': - // here we check for punct_user to handle correctly - // DEFINER = `username`@`%` - // where @ is the punct_user and `%` is the quote_backtick - if ($typearr[3] != 'punct_qualifier' - && $typearr[3] != 'alpha_variable' - && $typearr[3] != 'punct_user' - ) { - $after .= ' '; - } - if ($typearr[1] != 'punct_qualifier' - && $typearr[1] != 'alpha_variable' - && $typearr[1] != 'punct_user' - ) { - $before .= ' '; - } - break; - default: - break; - } // end switch ($typearr[2]) - - /* - if ($typearr[3] != 'punct_qualifier') { - $after .= ' '; - } - $after .= "\n"; - */ - $str .= $before; - if ($mode == 'text') { - $str .= htmlspecialchars($arr[$i]['data']); - } else { - $str .= $arr[$i]['data']; - } - $str .= $after; - } // end for - // close unclosed indent levels - while ($indent > 0) { - $indent--; - $str .= ($mode != 'query_only' ? '
' : ' '); - } - - return $str; -} // end of the "PMA_SQP_format()" function - -/** - * Define variables for PMA_SQP_format - * - * @param array $arr The SQL queries - * @param array $typearr Types - * @param array $keywords_no_newline Reserved words without newline placed - * near them - * @param int $index Index in $arr - * @param boolean $in_priv_list Is in privilege list - * @param string $space_alpha_reserved_word Reserved word separator - * @param string $before String before - * @param array $keywords_priv_list Keywords list of privileges - * - * @return array - */ -function PMA_SQP_getBeforeAndInPrivList( - $arr, $typearr, $keywords_no_newline, $index, $in_priv_list, - $space_alpha_reserved_word, $before, $keywords_priv_list -) { - if (!((($typearr[1] != 'alpha_reservedWord') - || (($typearr[1] == 'alpha_reservedWord') - && isset($keywords_no_newline[/*overload*/mb_strtoupper($arr[$index - 1]['data'])]))) - && ($typearr[1] != 'punct_level_plus') - && (!isset($keywords_no_newline[$arr[$index]['data']]))) - ) { - $before .= ' '; - return array($before, $in_priv_list); - } - - // do not put a space before the first token, because - // we use a lot of pattern matching checking for the - // first reserved word at beginning of query - // so do not put a newline before - // - // also we must not be inside a privilege list - if ($index > 0) { - // the alpha_identifier exception is there to - // catch cases like - // GRANT SELECT ON mydb.mytable TO myuser@localhost - // (else, we get mydb.mytableTO) - // - // the quote_single exception is there to - // catch cases like - // GRANT ... TO 'marc'@'domain.com' IDENTIFIED... - /** - * @todo fix all cases and find why this happens - */ - - if (!$in_priv_list - || in_array( - $typearr[1], - array('alpha_identifier', 'quote_single', 'white_newline') - ) - ) { - $before .= $space_alpha_reserved_word; - } - return array($before, $in_priv_list); - } - - // on first keyword, check if it introduces a - // privilege list - if (isset($keywords_priv_list[$arr[$index]['data']])) { - $in_priv_list = true; - } - return array($before, $in_priv_list); -} - -/** - * Define variables for PMA_SQP_format - * - * @param string $data Data to check - * @param boolean $in_priv_list In privilege list - * @param string $html_line_break HTML line break - * @param string $space_punct_listsep List separator - * @param string $space_alpha_reserved_word Space between reserved words - * - * @todo check definition of $space_punct_listsep and $space_alpha_reserved_word - * - * @return array Variables needed by PMA_SQP_format - */ -function PMA_SQP_getListsepAndReservedWord( - $data, $in_priv_list, $html_line_break, $space_punct_listsep, - $space_alpha_reserved_word -) { - switch ($data) { - case 'CREATE': - case 'ALTER': - case 'DROP': - case 'RENAME'; - case 'TRUNCATE': - case 'ANALYZE': - case 'ANALYSE': - case 'OPTIMIZE': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'EVENT': - case 'TABLESPACE': - case 'TABLE': - case 'FUNCTION': - case 'INDEX': - case 'PROCEDURE': - case 'SERVER': - case 'TRIGGER': - case 'DATABASE': - case 'VIEW': - case 'GROUP': - break; - case 'SET': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'EXPLAIN': - case 'DESCRIBE': - case 'DELETE': - case 'SHOW': - case 'UPDATE': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'INSERT': - case 'REPLACE': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = $html_line_break; - } - break; - case 'VALUES': - $space_punct_listsep = ' '; - $space_alpha_reserved_word = $html_line_break; - break; - case 'SELECT': - $space_punct_listsep = ' '; - $space_alpha_reserved_word = $html_line_break; - break; - case 'CALL': - case 'DO': - case 'HANDLER': - break; - default: - break; - } - return array($space_punct_listsep, $space_alpha_reserved_word); -} - -/** - * Gets SQL queries with no format - * - * @param array $arr The SQL queries list - * - * @return string The SQL queries with no format - * - * @access public - */ -function PMA_SQP_formatNone($arr) -{ - $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace( - "@((\015\012)|(\015)|(\012)){3,}@", - "\n\n", - $formatted_sql - ); - - return $formatted_sql; -} // end of the "PMA_SQP_formatNone()" function - -/** - * Checks whether a given name is MySQL reserved word - * - * @param string $column The word to be checked - * - * @return boolean whether true or false - */ -function PMA_SQP_isKeyWord($column) -{ - global $PMA_SQPdata_forbidden_word; - return in_array( - /*overload*/mb_strtoupper($column), - $PMA_SQPdata_forbidden_word - ); -} - -/** - * Get Parser Data Map from sqlparser.data.php - * - * @return Array Parser Data Map from sqlparser.data.php - */ -function PMA_SQP_getParserDataMap() -{ - include 'libraries/sqlparser.data.php'; - return array( - 'PMA_SQPdata_function_name' => $PMA_SQPdata_function_name, - 'PMA_SQPdata_column_attrib' => $PMA_SQPdata_column_attrib, - 'PMA_SQPdata_reserved_word' => $PMA_SQPdata_reserved_word, - 'PMA_SQPdata_forbidden_word' => $PMA_SQPdata_forbidden_word, - 'PMA_SQPdata_column_type' => $PMA_SQPdata_column_type, - ); -} - -/** - * Get Parser analyze Map from parse_analyze_inc.php - * - * @param array $sql_query The SQL string - * @param array $db Current DB - * - * @return Array analyze Map from parse_analyze_inc.php - */ -function PMA_SQP_getParserAnalyzeMap($sql_query, $db) -{ - include 'libraries/parse_analyze.inc.php'; - return $analyzed_sql_results; -} - -/** - * Get Aliases from select query - * Note: only useful for select query on single table. - * - * @param string $select_query The Select SQL Query - * @param string $db Current DB - * - * @return Array alias information from select query - */ -function PMA_SQP_getAliasesFromQuery($select_query, $db) -{ - if (empty($select_query) || empty($db)) { - return array(); - } - $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($select_query)); - $aliases = array( - $db => array( - 'alias' => null, - 'tables' => array() - ) - ); - foreach ($analyzed_sql[0]['table_ref'] as $table) { - $t_db = !empty($table['db']) ? $table['db'] : $db; - if (!isset($aliases[$t_db])) { - $aliases[$t_db] = array( - 'alias' => null, - 'tables' => array() - ); - } - $aliases[$t_db]['tables'][$table['table_true_name']] = array( - 'alias' => !empty($table['table_alias']) - ? $table['table_alias'] : null, - 'columns' => array() - ); - } - foreach ($analyzed_sql[0]['select_expr'] as $cols) { - if (!empty($cols['alias'])) { - $t_db = !empty($cols['db']) ? $cols['db'] : $db; - if (!empty($cols['table_true_name'])) { - $aliases[$t_db]['tables'][$cols['table_true_name']] - ['columns'][$cols['column']] = $cols['alias']; - } else { - foreach ($aliases[$t_db]['tables'] as $key => $table) { - $aliases[$t_db]['tables'][$key] - ['columns'][$cols['column']] = $cols['alias']; - } - } - } - } - return $aliases; -} - -?> diff --git a/sql.php b/sql.php index 5ba7e194c2..e834f87ff8 100644 --- a/sql.php +++ b/sql.php @@ -17,7 +17,6 @@ require_once 'libraries/Header.class.php'; require_once 'libraries/check_user_privileges.lib.php'; require_once 'libraries/bookmark.lib.php'; require_once 'libraries/sql.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/config/page_settings.class.php'; PMA_PageSettings::showGroup('Browse'); diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php index 84dc7905f1..5b19bcadc3 100644 --- a/test/classes/PMA_DBQbe_test.php +++ b/test/classes/PMA_DBQbe_test.php @@ -16,7 +16,6 @@ require_once 'libraries/core.lib.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Tracker.class.php'; require_once 'libraries/relation.lib.php'; -require_once 'libraries/sqlparser.lib.php'; /** * Tests for PMA_DBQbe class diff --git a/test/classes/PMA_TableSearch_test.php b/test/classes/PMA_TableSearch_test.php index 725355bffc..96b89da7df 100644 --- a/test/classes/PMA_TableSearch_test.php +++ b/test/classes/PMA_TableSearch_test.php @@ -16,7 +16,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/Theme.class.php'; require_once 'libraries/Tracker.class.php'; require_once 'libraries/Types.class.php'; diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php index 1bd637638c..f6eaed3758 100644 --- a/test/classes/PMA_Table_test.php +++ b/test/classes/PMA_Table_test.php @@ -10,7 +10,6 @@ * Include to test. */ require_once 'libraries/Table.class.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/mysql_charsets.lib.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index 227ed15164..0b95e49b72 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/Config.class.php'; require_once 'libraries/Theme_Manager.class.php'; require_once 'libraries/php-gettext/gettext.inc'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/url_generating.lib.php'; /** diff --git a/test/classes/dbi/DBIDrizzle_test.php b/test/classes/dbi/DBIDrizzle_test.php index 83d6c28fe6..66003c2624 100644 --- a/test/classes/dbi/DBIDrizzle_test.php +++ b/test/classes/dbi/DBIDrizzle_test.php @@ -32,7 +32,6 @@ function drizzle_version() require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/dbi/DBIMysql_test.php b/test/classes/dbi/DBIMysql_test.php index 3bb9969d41..9183165a66 100644 --- a/test/classes/dbi/DBIMysql_test.php +++ b/test/classes/dbi/DBIMysql_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/dbi/DBIMysqli_test.php b/test/classes/dbi/DBIMysqli_test.php index a9d0c7c889..e6fc7f3db5 100644 --- a/test/classes/dbi/DBIMysqli_test.php +++ b/test/classes/dbi/DBIMysqli_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index a646f8a3b8..dd68dc80c6 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -17,7 +17,6 @@ require_once 'libraries/mysql_charsets.lib.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/transformations.lib.php'; require_once 'libraries/Table.class.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/charset_conversion.lib.php'; require_once 'export.php'; /** diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/PMA_ExportTexytext_test.php index a7eb5c4524..eaaace230b 100644 --- a/test/classes/plugin/export/PMA_ExportTexytext_test.php +++ b/test/classes/plugin/export/PMA_ExportTexytext_test.php @@ -14,7 +14,6 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'libraries/DatabaseInterface.class.php'; require_once 'libraries/relation.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/transformations.lib.php'; require_once 'export.php'; /** diff --git a/test/classes/plugin/transformations/Transformation_Plugins_test.php b/test/classes/plugin/transformations/Transformation_Plugins_test.php index a764aa6155..eea5c67179 100644 --- a/test/classes/plugin/transformations/Transformation_Plugins_test.php +++ b/test/classes/plugin/transformations/Transformation_Plugins_test.php @@ -35,7 +35,6 @@ require_once 'libraries/plugins/transformations/output/' . 'Text_Plain_Imagelink.class.php'; require_once 'libraries/plugins/transformations/output/' . 'Text_Plain_Sql.class.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/plugins/transformations/Text_Plain_Link.class.php'; require_once 'libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php'; require_once 'libraries/plugins/transformations/Text_Plain_Preappend.class.php'; diff --git a/test/classes/schema/Dia_Relation_Schema_test.php b/test/classes/schema/Dia_Relation_Schema_test.php index b51c5c7c49..04754a6d42 100644 --- a/test/classes/schema/Dia_Relation_Schema_test.php +++ b/test/classes/schema/Dia_Relation_Schema_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/schema/Eps_Relation_Schema_test.php b/test/classes/schema/Eps_Relation_Schema_test.php index 5b82256442..14daedd228 100644 --- a/test/classes/schema/Eps_Relation_Schema_test.php +++ b/test/classes/schema/Eps_Relation_Schema_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/classes/schema/Pdf_Relation_Schema_test.php b/test/classes/schema/Pdf_Relation_Schema_test.php index 7bb825de5a..3ad8485049 100644 --- a/test/classes/schema/Pdf_Relation_Schema_test.php +++ b/test/classes/schema/Pdf_Relation_Schema_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/Table.class.php'; diff --git a/test/classes/schema/Svg_Relation_Schema_test.php b/test/classes/schema/Svg_Relation_Schema_test.php index c492584941..c630e04ee8 100644 --- a/test/classes/schema/Svg_Relation_Schema_test.php +++ b/test/classes/schema/Svg_Relation_Schema_test.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php index 05950af671..b0742a8a42 100644 --- a/test/libraries/PMA_GIS_modifyQuery_test.php +++ b/test/libraries/PMA_GIS_modifyQuery_test.php @@ -6,7 +6,6 @@ * @package PhpMyAdmin-test */ -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/Util.class.php'; /* * Include to test diff --git a/test/libraries/PMA_SQL_parse_analyze_test.php b/test/libraries/PMA_SQL_parse_analyze_test.php deleted file mode 100644 index ccff5fc9f3..0000000000 --- a/test/libraries/PMA_SQL_parse_analyze_test.php +++ /dev/null @@ -1,79 +0,0 @@ -assertEquals( - array( - 'type' => 'alpha_reservedWord', - 'data' => 'select', - 'pos' => 6, - 'forbidden' => true, - ), - $data['parsed_sql'][0] - ); - $this->assertEquals( - 'select * from PMA.PMAParse', - $data['analyzed_sql'][0]['unsorted_query'] - ); - - $this->assertTrue($data['is_select']); - $this->assertFalse($data['is_group']); - $this->assertFalse($data['is_show']); - - //update statement - $sql_query = "UPDATE `11`.`pma_bookmark` SET `id` = '2' WHERE `pma_bookmark`.`id` = 1;"; - $db = "PMA"; - $data = PMA_SQP_getParserAnalyzeMap($sql_query, $db); - - $this->assertEquals( - array( - 'type' => 'alpha_reservedWord', - 'data' => 'UPDATE', - 'pos' => 6, - 'forbidden' => true, - ), - $data['parsed_sql'][0] - ); - $this->assertEquals( - $sql_query, - $data['analyzed_sql'][0]['unsorted_query'] - ); - $this->assertFalse($data['is_group']); - $this->assertFalse($data['is_show']); - $this->assertTrue($data['is_affected']); - $this->assertFalse($data['is_select']); - } -} - -?> diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php deleted file mode 100644 index 41f321f597..0000000000 --- a/test/libraries/PMA_SQL_parser_data_test.php +++ /dev/null @@ -1,123 +0,0 @@ -assertEquals($difference, array()); - } - - /** - * assert Parser values - * - * @param string $name Parser Data key - * - * @return null - */ - private function _assertParserData($name) - { - $this->_assertSorted($GLOBALS[$name]); - } - - - /** - * Test for PMA_SQPdata - * - * @return void - */ - public function testData() - { - $data = PMA_SQP_getParserDataMap(); - $this->_assertSorted($data['PMA_SQPdata_function_name']); - $this->_assertSorted($data['PMA_SQPdata_column_attrib']); - $this->_assertSorted($data['PMA_SQPdata_reserved_word']); - $this->_assertSorted($data['PMA_SQPdata_forbidden_word']); - $this->_assertSorted($data['PMA_SQPdata_column_type']); - } - - - /** - * Test for PMA_SQPdata_function_name - * - * @return void - */ - public function testFunctionName() - { - $this->_assertParserData('PMA_SQPdata_function_name'); - } - - - /** - * Test for PMA_SQPdata_column_attrib - * - * @return void - */ - public function testColumnAttrib() - { - $this->_assertParserData('PMA_SQPdata_column_attrib'); - } - - - /** - * Test for PMA_SQPdata_reserved_word - * - * @return void - */ - public function testReservedWord() - { - $this->_assertParserData('PMA_SQPdata_reserved_word'); - } - - - /** - * Test for PMA_SQPdata_forbidden_word - * - * @return void - */ - public function testForbiddenWord() - { - $this->_assertParserData('PMA_SQPdata_forbidden_word'); - } - - - /** - * Test for PMA_SQPdata_column_type - * - * @return void - */ - public function testColumnType() - { - $this->_assertParserData('PMA_SQPdata_column_type'); - } -} - -?> diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php deleted file mode 100644 index 3cda3964c4..0000000000 --- a/test/libraries/PMA_SQL_parser_test.php +++ /dev/null @@ -1,435 +0,0 @@ -expectOutputString($error); - $parsed_sql = PMA_SQP_parse($sql); - $this->assertEquals('', PMA_SQP_getErrorString()); - $this->assertEquals($expected, $parsed_sql); - } - - /** - * Test for PMA_SQP_isKeyWord - * - * @return void - */ - public function testPmaSqpIsKeyWord() - { - PMA_SQP_resetError(); - $this->assertTrue(PMA_SQP_isKeyWord("ACCESSIBLE")); - $this->assertTrue(PMA_SQP_isKeyWord("accessible")); - $this->assertTrue(PMA_SQP_isKeyWord("ASC")); - $this->assertFalse(PMA_SQP_isKeyWord("hello")); - } - - /** - * Test PMA_SQP_typeCheck - * - * @return void - */ - public function testPmaSqpTypeCheck() - { - $this->assertTrue( - PMA_SQP_typeCheck("VARCHAR", "VARCHAR") - ); - - $this->assertFalse( - PMA_SQP_typeCheck("VARCHAR", "VARCHAR_INT") - ); - - $this->assertTrue( - PMA_SQP_typeCheck("VARCHAR_INT", "VARCHAR") - ); - - $this->assertFalse( - PMA_SQP_typeCheck("TIME_INT", "VARCHAR") - ); - } - - /** - * Test PMA_SQP_throwError - * - * @return void - */ - public function testPmaSqpThrowError() - { - global $SQP_errorString; - $message = "error from testPMA_SQP_throwError"; - $sql = "select * from PMA.PMABookmark"; - PMA_SQP_throwError($message, $sql); - - $this->assertContains( - "There seems to be an error in your SQL query.", - $SQP_errorString - ); - - $this->assertContains( - 'ERROR: ' . $message, - $SQP_errorString - ); - - $this->assertContains( - 'SQL: ' . htmlspecialchars($sql), - $SQP_errorString - ); - } - - /** - * Data provider for parser testing - * - * @return array with test data - */ - public function parserData() - { - return array( - array( - 'SELECT 1;', - array( - 'raw' => 'SELECT 1;', - 0 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'SELECT', - 'pos' => 6, - 'forbidden' => true, - ), - 1 => array( - 'type' => 'digit_integer', - 'data' => '1', - 'pos' => 8, - ), - 2 => array( - 'type' => 'punct_queryend', - 'data' => ';', - 'pos' => 9, - ), - 'len' => 3, - ) - ), - array( - 'SELECT * from aaa;', - array( - 'raw' => 'SELECT * from aaa;', - 0 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'SELECT', - 'pos' => 6, - 'forbidden' => true, - ), - 1 => array( - 'type' => 'punct', - 'data' => '*', - 'pos' => 8, - ), - 2 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'from', - 'pos' => 13, - 'forbidden' => true, - ), - 3 => array( - 'type' => 'alpha_identifier', - 'data' => 'aaa', - 'pos' => 17, - 'forbidden' => false, - ), - 4 => array( - 'type' => 'punct_queryend', - 'data' => ';', - 'pos' => 18, - ), - 'len' => 5, - ) - ), - array( - 'SELECT * from `aaa`;', - array( - 'raw' => 'SELECT * from `aaa`;', - 0 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'SELECT', - 'pos' => 6, - 'forbidden' => true, - ), - 1 => array( - 'type' => 'punct', - 'data' => '*', - 'pos' => 8, - ), - 2 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'from', - 'pos' => 13, - 'forbidden' => true, - ), - 3 => array( - 'type' => 'quote_backtick', - 'data' => '`aaa`', - 'pos' => 19, - ), - 4 => array( - 'type' => 'punct_queryend', - 'data' => ';', - 'pos' => 20, - ), - 'len' => 5, - ) - ), - array( - 'SELECT * from `aaa;', - array( - 'raw' => 'SELECT * from `aaa`;', - 0 => array ( - 'type' => 'alpha_reservedWord', - 'data' => 'SELECT', - 'pos' => 6, - 'forbidden' => true, - ), - 1 => array( - 'type' => 'punct', - 'data' => '*', - 'pos' => 8, - ), - 2 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'from', - 'pos' => 13, - 'forbidden' => true, - ), - 3 => array( - 'type' => 'quote_backtick', - 'data' => '`aaa`', - 'pos' => 19, - ), - 4 => array( - 'type' => 'punct_queryend', - 'data' => ';', - 'pos' => 20, - ), - 'len' => 5, - ), - '
Automatically appended ' - . 'backtick to the end of query!
' - ), - array( - 'SELECT * FROM `a_table` tbla INNER JOIN b_table` tblb ON ' - . 'tblb.id = tbla.id WHERE tblb.field1 != tbla.field1`;', - array( - 'raw' => 'SELECT * FROM `a_table` tbla INNER JOIN ' - . 'b_table` tblb ON tblb.id = tbla.id WHERE ' - . 'tblb.field1 != tbla.field1`;', - 0 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'SELECT', - 'pos' => 6, - 'forbidden' => true, - ), - 1 => array( - 'type' => 'punct', - 'data' => '*', - 'pos' => 8, - ), - 2 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'FROM', - 'pos' => 13, - 'forbidden' => true, - ), - 3 => array( - 'type' => 'quote_backtick', - 'data' => '`a_table`', - 'pos' => 23, - ), - 4 => array( - 'type' => 'alpha_identifier', - 'data' => 'tbla', - 'pos' => 28, - 'forbidden' => false, - ), - 5 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'INNER', - 'pos' => 34, - 'forbidden' => true, - ), - 6 => array( - 'type' => 'alpha_reservedWord', - 'data' => 'JOIN', - 'pos' => 39, - 'forbidden' => true, - ), - 7 => array( - 'type' => 'alpha_identifier', - 'data' => 'b_table', - 'pos' => 47, - 'forbidden' => false, - ), - 8 => array( - 'type' => 'quote_backtick', - 'data' => '` tblb ON tblb.id = tbla.id WHERE ' - . 'tblb.field1 != tbla.field1`', - 'pos' => 108, - ), - 9 => array( - 'type' => 'punct_queryend', - 'data' => ';', - 'pos' => 109, - ), - 'len' => 10, - ) - ), - ); - } - - /** - * Data provider for testPmaSqpGetAliasesFromQuery - * - * @return array with test data - */ - public function aliasDataProvider() - { - return array( - array( - 'select i.name as `n`,abcdef gh from qwerty i', - 'mydb', - array( - 'mydb' => array( - 'alias' => null, - 'tables' => array( - 'qwerty' => array( - 'alias' => 'i', - 'columns' => array( - 'name' => 'n', - 'abcdef' => 'gh' - ) - ) - ) - ) - ) - ), - array( - 'select film_id id,title from film', - 'sakila', - array( - 'sakila' => array( - 'alias' => null, - 'tables' => array( - 'film' => array( - 'alias' => null, - 'columns' => array( - 'film_id' => 'id' - ) - ) - ) - ) - ) - ), - array( - 'select `sakila`.`A`.`actor_id` as aid,`F`.`film_id` `fid`,' - . 'last_update updated from `sakila`.actor A join `film_actor` as ' - . '`F` on F.actor_id = A.`actor_id`', - 'sakila', - array( - 'sakila' => array( - 'alias' => null, - 'tables' => array( - 'film_actor' => array( - 'alias' => 'F', - 'columns' => array( - 'film_id' => 'fid', - 'last_update' => 'updated' - ) - ), - 'actor' => array( - 'alias'=> 'A', - 'columns' => array( - 'actor_id' => 'aid', - 'last_update' => 'updated' - ) - ) - ) - ) - ) - ), - array( - '', - '', - array() - ) - ); - } - - /** - * Testing of PMA_SQP_getAliasesFromQuery. - * - * @param string $select_query The Select SQL Query - * @param string $db Current DB - * @param array $expected Expected parse result - * - * @return void - * - * @dataProvider aliasDataProvider - * @group medium - */ - public function testPmaSqpGetAliasesFromQuery($select_query, $db, $expected) - { - $this->assertEquals( - $expected, - PMA_SQP_getAliasesFromQuery($select_query, $db) - ); - } -} -?> diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php index 787cd2c7ca..d7b408256d 100644 --- a/test/libraries/PMA_central_columns_test.php +++ b/test/libraries/PMA_central_columns_test.php @@ -21,7 +21,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/Types.class.php'; require_once 'libraries/mysql_charsets.inc.php'; require_once 'libraries/central_columns.lib.php'; -require_once 'libraries/sqlparser.lib.php'; /** * tests for central_columns.lib.php diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php index 29df119e81..e1e84685d4 100644 --- a/test/libraries/PMA_display_export_test.php +++ b/test/libraries/PMA_display_export_test.php @@ -22,7 +22,6 @@ require_once 'libraries/charset_conversion.lib.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/plugin_interface.lib.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/relation.lib.php'; diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php index 96472e08e2..055301a002 100644 --- a/test/libraries/PMA_import_test.php +++ b/test/libraries/PMA_import_test.php @@ -24,7 +24,6 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/Tracker.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/import.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/url_generating.lib.php'; /** diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php index ce5572569a..b6523117b2 100644 --- a/test/libraries/PMA_mult_submits_test.php +++ b/test/libraries/PMA_mult_submits_test.php @@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/relation_cleanup.lib.php'; require_once 'libraries/relation.lib.php'; diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php index f7700bf1a6..d7753b67ed 100644 --- a/test/libraries/PMA_select_server_test.php +++ b/test/libraries/PMA_select_server_test.php @@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_binlog_test.php b/test/libraries/PMA_server_binlog_test.php index 1e7bd442cf..13db2a1150 100644 --- a/test/libraries/PMA_server_binlog_test.php +++ b/test/libraries/PMA_server_binlog_test.php @@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/database_interface.inc.php'; diff --git a/test/libraries/PMA_server_collations_test.php b/test/libraries/PMA_server_collations_test.php index 9391e162a8..f19cc02fae 100644 --- a/test/libraries/PMA_server_collations_test.php +++ b/test/libraries/PMA_server_collations_test.php @@ -35,7 +35,6 @@ require_once 'libraries/url_generating.lib.php'; require_once 'libraries/Tracker.class.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/server_common.inc.php'; diff --git a/test/libraries/PMA_server_databases_test.php b/test/libraries/PMA_server_databases_test.php index e0842a6ad6..fb5825c476 100644 --- a/test/libraries/PMA_server_databases_test.php +++ b/test/libraries/PMA_server_databases_test.php @@ -19,7 +19,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/Config.class.php'; require_once 'libraries/config.default.php'; diff --git a/test/libraries/PMA_server_engines_test.php b/test/libraries/PMA_server_engines_test.php index 0f66bcc04e..b133b407dd 100644 --- a/test/libraries/PMA_server_engines_test.php +++ b/test/libraries/PMA_server_engines_test.php @@ -18,7 +18,6 @@ require_once 'libraries/Tracker.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/StorageEngine.class.php'; diff --git a/test/libraries/PMA_server_plugins_test.php b/test/libraries/PMA_server_plugins_test.php index 38412bc92d..8e8f02f50a 100644 --- a/test/libraries/PMA_server_plugins_test.php +++ b/test/libraries/PMA_server_plugins_test.php @@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index f989a849d3..24e84316cc 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -16,7 +16,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/Response.class.php'; diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php index ab0b1734f6..4358931102 100644 --- a/test/libraries/PMA_server_replication_test.php +++ b/test/libraries/PMA_server_replication_test.php @@ -19,7 +19,6 @@ require_once 'libraries/replication_gui.lib.php'; require_once 'libraries/Theme.class.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php index ff3eb442eb..a28cc6f4a6 100644 --- a/test/libraries/PMA_server_status_advisor_test.php +++ b/test/libraries/PMA_server_status_advisor_test.php @@ -19,7 +19,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php index 1efe0b4121..c49be83ac0 100644 --- a/test/libraries/PMA_server_status_monitor_test.php +++ b/test/libraries/PMA_server_status_monitor_test.php @@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php index c67defd7cf..75d6294a5e 100644 --- a/test/libraries/PMA_server_status_queries_test.php +++ b/test/libraries/PMA_server_status_queries_test.php @@ -19,7 +19,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php index cfc4db842d..c21ceedd50 100644 --- a/test/libraries/PMA_server_status_variables_test.php +++ b/test/libraries/PMA_server_status_variables_test.php @@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_server_variables_test.php b/test/libraries/PMA_server_variables_test.php index 7d23753354..bd4aa62fdb 100644 --- a/test/libraries/PMA_server_variables_test.php +++ b/test/libraries/PMA_server_variables_test.php @@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; /** diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php index 3f97e9a883..1b0ad82f16 100644 --- a/test/libraries/PMA_sql_query_form_test.php +++ b/test/libraries/PMA_sql_query_form_test.php @@ -19,7 +19,6 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/Theme.class.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/sql_query_form.lib.php'; diff --git a/test/libraries/PMA_structure_test.php b/test/libraries/PMA_structure_test.php index a44613577d..0cc505f287 100644 --- a/test/libraries/PMA_structure_test.php +++ b/test/libraries/PMA_structure_test.php @@ -17,7 +17,6 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/Tracker.class.php'; require_once 'libraries/Table.class.php'; diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php index 7aa9d5e998..9d0cd85191 100644 --- a/test/libraries/common/PMA_formatSql_test.php +++ b/test/libraries/common/PMA_formatSql_test.php @@ -11,7 +11,6 @@ * Include to test. */ require_once 'libraries/Util.class.php'; -require_once 'libraries/sqlparser.lib.php'; /** ** Test for PMA_Util::formatSql from Util.class.php diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index b5d837a9e0..d68c9e1501 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -11,7 +11,6 @@ * Include to test. */ require_once 'libraries/Util.class.php'; -require_once 'libraries/sqlparser.data.php'; /** * Test for quoting, slashing/backslashing diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index 44061c9090..b483c29e5c 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -8,7 +8,6 @@ $GLOBALS['server'] = 0; require_once 'libraries/Util.class.php'; -require_once 'libraries/sqlparser.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; require_once './libraries/Types.class.php'; From ecc60f3664d01f19809be25f8b319e66a204603d Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 10 Jul 2015 02:58:55 +0300 Subject: [PATCH 47/57] Fixed failing tests. Also, removed deprecated PHPUnit configuration that might cause issues with XDebug. Fixed a bug where the query delimiter would not be added. Updated sql-parser to udan11/sql-parser@7c925b6. Signed-off-by: Dan Ungureanu --- libraries/import.lib.php | 4 +- libraries/sql-parser/src/Fragment.php | 4 + .../src/Fragments/FieldDefFragment.php | 4 +- .../src/Fragments/OptionsFragment.php | 9 ++- libraries/sql-parser/src/Statement.php | 25 +++++- .../src/Statements/CreateStatement.php | 31 +++++++- phpunit.xml.dist | 2 - .../plugin/export/PMA_ExportSql_test.php | 79 +++++++++---------- test/classes/plugin/import/ImportCsv_test.php | 30 +++++-- test/classes/plugin/import/ImportOds_test.php | 17 ++-- 10 files changed, 138 insertions(+), 67 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 4eeacb2aa3..a47bbffe63 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1006,10 +1006,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, if ($create_db) { if (PMA_DRIZZLE) { $sql[] = "CREATE DATABASE IF NOT EXISTS " . PMA_Util::backquote($db_name) - . " COLLATE " . $collation; + . " COLLATE " . $collation . ";"; } else { $sql[] = "CREATE DATABASE IF NOT EXISTS " . PMA_Util::backquote($db_name) - . " DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation; + . " DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";"; } } diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Fragment.php index 29ec8a9395..d9c4c8f939 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Fragment.php @@ -35,6 +35,8 @@ abstract class Fragment */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { + // This method should be abstract, but it can't be both static and + // abstract. return null; } @@ -50,6 +52,8 @@ abstract class Fragment */ public static function build($fragment) { + // This method should be abstract, but it can't be both static and + // abstract. return null; } } diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Fragments/FieldDefFragment.php index 947a8813df..34932d5ac3 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Fragments/FieldDefFragment.php @@ -231,6 +231,7 @@ class FieldDefFragment extends Fragment public static function build($fragment) { $ret = array(); + foreach ($fragment as $f) { $tmp = ''; @@ -258,6 +259,7 @@ class FieldDefFragment extends Fragment $ret[] = trim($tmp); } - return '(' . implode(', ', $ret) . ')'; + + return "(\n" . implode(",\n", $ret) . "\n)"; } } diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Fragments/OptionsFragment.php index 5384a77414..b9a37d3652 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Fragments/OptionsFragment.php @@ -65,6 +65,11 @@ class OptionsFragment extends Fragment * @var array $lastOption */ $lastOption = null; + + /** + * The index of the option that was processed last time. + * @var int $lastOptionId + */ $lastOptionId = 0; $brackets = 0; @@ -87,8 +92,8 @@ class OptionsFragment extends Fragment } if ($lastOption === null) { - if (isset($options[strtoupper($token->value)])) { - $lastOption = $options[strtoupper($token->value)]; + if (isset($options[strtoupper($token->token)])) { + $lastOption = $options[strtoupper($token->token)]; $lastOptionId = is_array($lastOption) ? $lastOption[0] : $lastOption; // Checking for option conflicts. diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 16b1819879..11676be6d2 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -6,7 +6,7 @@ * * A statement represents the result of parsing the lexemes. * - * @package SqlParser. + * @package SqlParser */ namespace SqlParser; @@ -23,6 +23,27 @@ use SqlParser\Fragments\OptionsFragment; abstract class Statement { + /** + * Options for this statement. + * + * The option would be the key and the value can be an integer or an array. + * + * The integer represents only the index used. + * + * The array may have two keys: `0` is used to represent the index used and + * `1` is the type of the option (which may be 'var' or 'var='). Both + * options mean they expect a value after the option (e.g. `A = B` or `A B`, + * in which case `A` is the key and `B` is the value). The only difference + * is in the building process. `var` options are built as `A B` and `var=` + * options are built as `A = B` + * + * Two options that can be used together must have different values for + * indexes, else, when they will be used together, an error will occur. + * + * @var array + */ + public static $OPTIONS = array(); + /** * The clauses of this statement, in order. * @@ -157,7 +178,7 @@ abstract class Statement * default. * @var bool $parsedOptions */ - $parsedOptions = isset(static::$OPTIONS) ? false : true; + $parsedOptions = !empty(static::$OPTIONS) ? false : true; for (; $list->idx < $list->count; ++$list->idx) { /** diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index ede120e893..55aad0a76c 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -64,6 +64,20 @@ class CreateStatement extends Statement 'IF NOT EXISTS' => 7, ); + /** + * All database options. + * + * @var array + */ + public static $DB_OPTIONS = array( + 'CHARACTER SET' => array(1, 'var='), + 'CHARSET' => array(1, 'var='), + 'DEFAULT CHARACTER SET' => array(1, 'var='), + 'DEFAULT CHARSET' => array(1, 'var='), + 'DEFAULT COLLATE' => array(2, 'var='), + 'COLLATE' => array(2, 'var='), + ); + /** * All table options. * @@ -78,7 +92,7 @@ class CreateStatement extends Statement 'DEFAULT CHARACTER SET' => array(4, 'var='), 'DEFAULT CHARSET' => array(4, 'var='), 'CHECKSUM' => array(5, 'var'), - 'DEFAULT COLLATE' => array(5, 'var='), + 'DEFAULT COLLATE' => array(6, 'var='), 'COLLATE' => array(6, 'var='), 'COMMENT' => array(7, 'var='), 'CONNECTION' => array(8, 'var'), @@ -201,7 +215,12 @@ class CreateStatement extends Statement */ public function build() { - if ($this->options->has('TABLE')) { + if ($this->options->has('DATABASE')) { + return 'CREATE ' + . OptionsFragment::build($this->options) . ' ' + . FieldFragment::build($this->name) . ' ' + . OptionsFragment::build($this->entityOptions); + } elseif ($this->options->has('TABLE')) { return 'CREATE ' . OptionsFragment::build($this->options) . ' ' . FieldFragment::build($this->name) . ' ' @@ -266,7 +285,13 @@ class CreateStatement extends Statement ); ++$list->idx; // Skipping field. - if ($this->options->has('TABLE')) { + if ($this->options->has('DATABASE')) { + $this->entityOptions = OptionsFragment::parse( + $parser, + $list, + static::$DB_OPTIONS + ); + } elseif ($this->options->has('TABLE')) { $this->fields = FieldDefFragment::parse($parser, $list); ++$list->idx; diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d3e2fab635..2a89e42e9f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,8 +2,6 @@ diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index dd68dc80c6..1b724c0e22 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -1221,8 +1221,13 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $row = array( '', - "CREATE TABLE `db`.`table`,\n CONSTRAINT KEYS \nFOREIGN KEY\n) " . - "unsigned NOT NULL\n(\r\n" + "CREATE TABLE `table` (\n" . + "`id` INT NOT NULL AUTO_INCREMENT,\n" . + "username VARCHAR(64) NULL,\n" . + "`password` VARCHAR(256) DEFAULT '123456',\n" . + "CONSTRAINT pk_id PRIMARY KEY (`id`),\n" . + "UNIQUE (username)\n" . + ")" ); $dbi->expects($this->once()) @@ -1258,12 +1263,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertContains( - "CREATE TABLE `table`\n", - $result - ); - - $this->assertContains( - ") NOT NULL\n", + "CREATE TABLE `table`", $result ); @@ -1278,27 +1278,22 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertContains( - 'ALTER TABLE "table"' . "\n", + 'ALTER TABLE "table"', $GLOBALS['sql_constraints'] ); $this->assertContains( - 'ADD CONSTRAINT KEYS ' . "\n", + 'ADD CONSTRAINT', $GLOBALS['sql_constraints'] ); $this->assertContains( - 'ADD FOREIGN KEY;', - $GLOBALS['sql_constraints'] - ); - - $this->assertContains( - 'ALTER TABLE "table"' . "\n", + 'ALTER TABLE "table"', $GLOBALS['sql_constraints_query'] ); $this->assertContains( - ' ADD CONSTRAINT KEYS ADD FOREIGN KEY;', + 'ADD CONSTRAINT', $GLOBALS['sql_constraints_query'] ); @@ -1308,7 +1303,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertContains( - 'DROP FOREIGN KEY KEYS', + 'DROP FOREIGN KEY', $GLOBALS['sql_drop_foreign_keys'] ); @@ -1398,8 +1393,13 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $row = array( '', - "CREATE TABLE `db`.`table` ROW_FORMAT='row',\n CONSTRAINT " - . "KEYS \nFOREIGN KEY\n) unsigned NOT NULL\n(\r" + "CREATE TABLE `db`.`table` (\n" . + "`id` INT NOT NULL AUTO_INCREMENT,\n" . + "username VARCHAR(64) NULL,\n" . + "`password` VARCHAR(256) DEFAULT '123456',\n" . + "CONSTRAINT pk_id PRIMARY KEY (`id`),\n" . + "UNIQUE (username)\n" . + ")" ); $dbi->expects($this->once()) @@ -1415,12 +1415,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertContains( - "CREATE TABLE IF NOT EXISTS `table` ROW_FORMAT=row", - $result - ); - - $this->assertContains( - ") unsigned NOT NULL\n", + "CREATE TABLE IF NOT EXISTS `table`", $result ); @@ -2255,14 +2250,14 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $db = 'a'; $table = 'foo'; - $sql_query = "CREATE TABLE IF NOT EXISTS foo (" - . "baz tinyint(3) unsigned NOT NULL COMMENT 'Primary Key'," + $sql_query = "CREATE TABLE IF NOT EXISTS foo (\n" + . "baz tinyint(3) unsigned NOT NULL COMMENT 'Primary Key',\n" . "xyz varchar(255) COLLATE latin1_general_ci NOT NULL " - . "COMMENT 'xyz'," + . "COMMENT 'xyz',\n" . "pqr varchar(10) COLLATE latin1_general_ci NOT NULL " - . "COMMENT 'pqr'," + . "COMMENT 'pqr',\n" . "CONSTRAINT fk_om_dept FOREIGN KEY (baz) " - . "REFERENCES dept_master (baz)" + . "REFERENCES dept_master (baz)\n" . ") ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=" . "latin1_general_ci COMMENT='List' AUTO_INCREMENT=5"; $result = $this->object->replaceWithAliases( @@ -2270,11 +2265,11 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertEquals( - "CREATE TABLE IF NOT EXISTS `bartest` (" . - "`p` TINYINT (3) UNSIGNED NOT NULL COMMENT 'Primary Key', " . - "`xyz` VARCHAR (255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz', " . - "`pphymdain` VARCHAR (10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr', " . - "CONSTRAINT `fk_om_dept` FOREIGN KEY (`p`) REFERENCES `dept_master` (`baz`)" . + "CREATE TABLE IF NOT EXISTS `bartest` (\n" . + "`p` TINYINT (3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" . + "`xyz` VARCHAR (255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" . + "`pphymdain` VARCHAR (10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" . + "CONSTRAINT `fk_om_dept` FOREIGN KEY (`p`) REFERENCES `dept_master` (`baz`)\n" . ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'", $result ); @@ -2282,11 +2277,11 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $result = $this->object->replaceWithAliases($sql_query, array(), '', ''); $this->assertEquals( - "CREATE TABLE IF NOT EXISTS foo (" . - "`baz` TINYINT (3) UNSIGNED NOT NULL COMMENT 'Primary Key', " . - "`xyz` VARCHAR (255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz', " . - "`pqr` VARCHAR (10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr', " . - "CONSTRAINT `fk_om_dept` FOREIGN KEY (`baz`) REFERENCES `dept_master` (`baz`)" . + "CREATE TABLE IF NOT EXISTS foo (\n" . + "`baz` TINYINT (3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" . + "`xyz` VARCHAR (255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" . + "`pqr` VARCHAR (10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" . + "CONSTRAINT `fk_om_dept` FOREIGN KEY (`baz`) REFERENCES `dept_master` (`baz`)\n" . ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'", $result ); @@ -2316,4 +2311,4 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); } } -?> +?> \ No newline at end of file diff --git a/test/classes/plugin/import/ImportCsv_test.php b/test/classes/plugin/import/ImportCsv_test.php index ff2ac1b39a..b1ac9c5e55 100644 --- a/test/classes/plugin/import/ImportCsv_test.php +++ b/test/classes/plugin/import/ImportCsv_test.php @@ -134,10 +134,17 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase $this->object->doImport(); //asset that all sql are executed - $this->assertContains( - 'CREATE DATABASE IF NOT EXISTS `CSV_DB` DEFAULT CHARACTER', - $sql_query - ); + if (PMA_DRIZZLE) { + $this->assertContains( + 'CREATE DATABASE IF NOT EXISTS `CSV_DB` COLLATE', + $sql_query + ); + } else { + $this->assertContains( + 'CREATE DATABASE IF NOT EXISTS `CSV_DB` DEFAULT CHARACTER', + $sql_query + ); + } $this->assertContains( 'SET utf8 COLLATE utf8_general_ci', $sql_query @@ -193,10 +200,17 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase $this->object->doImport(); //asset that all sql are executed - $this->assertContains( - 'CREATE DATABASE IF NOT EXISTS `CSV_DB` DEFAULT CHARACTER', - $sql_query - ); + if (PMA_DRIZZLE) { + $this->assertContains( + 'CREATE DATABASE IF NOT EXISTS `CSV_DB` COLLATE', + $sql_query + ); + } else { + $this->assertContains( + 'CREATE DATABASE IF NOT EXISTS `CSV_DB` DEFAULT CHARACTER', + $sql_query + ); + } $this->assertContains( 'SET utf8 COLLATE utf8_general_ci', $sql_query diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOds_test.php index a6f2e27547..79439f6d96 100644 --- a/test/classes/plugin/import/ImportOds_test.php +++ b/test/classes/plugin/import/ImportOds_test.php @@ -136,11 +136,18 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase $this->object->doImport(); //asset that all sql are executed - $this->assertContains( - 'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET ' - . 'utf8 COLLATE utf8_general_ci', - $sql_query - ); + if (PMA_DRIZZLE) { + $this->assertContains( + 'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT COLLATE utf8_general_ci', + $sql_query + ); + } else { + $this->assertContains( + 'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET ' + . 'utf8 COLLATE utf8_general_ci', + $sql_query + ); + } $this->assertContains( 'CREATE TABLE IF NOT EXISTS `ODS_DB`.`pma_bookmark`', $sql_query From 2dfc29df4ae73a022398541c8fa30969127d3a97 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 10 Jul 2015 03:37:11 +0300 Subject: [PATCH 48/57] Updated sql-parser library to udan11/sql-parser@5278427. Signed-off-by: Dan Ungureanu --- libraries/Table.class.php | 6 +- .../src/{Fragment.php => Component.php} | 21 ++--- .../AlterOperation.php} | 36 ++++---- .../Array2d.php} | 16 ++-- .../ArrayObj.php} | 26 +++--- .../Condition.php} | 26 +++--- .../DataType.php} | 36 ++++---- .../Expression.php} | 48 +++++------ .../ExpressionArray.php} | 20 ++--- .../FieldDefinition.php} | 60 ++++++------- .../FunctionCall.php} | 30 +++---- .../{Fragments => Components}/IntoKeyword.php | 16 ++-- .../{Fragments => Components}/JoinKeyword.php | 18 ++-- .../KeyFragment.php => Components/Key.php} | 38 ++++----- .../LimitKeyword.php => Components/Limit.php} | 24 +++--- .../OptionsArray.php} | 30 +++---- .../OrderKeyword.php | 14 ++-- .../ParameterDefinition.php} | 30 +++---- .../Reference.php} | 32 +++---- .../RenameOperation.php} | 24 +++--- .../SetOperation.php} | 16 ++-- libraries/sql-parser/src/Parser.php | 58 ++++++------- libraries/sql-parser/src/Statement.php | 6 +- .../src/Statements/AlterStatement.php | 20 ++--- .../src/Statements/AnalyzeStatement.php | 4 +- .../src/Statements/CallStatement.php | 4 +- .../src/Statements/CreateStatement.php | 84 +++++++++---------- .../src/Statements/DeleteStatement.php | 18 ++-- .../src/Statements/DropStatement.php | 4 +- .../src/Statements/InsertStatement.php | 6 +- .../src/Statements/MaintenanceStatement.php | 10 +-- .../src/Statements/OptimizeStatement.php | 4 +- .../src/Statements/RenameStatement.php | 4 +- .../src/Statements/ReplaceStatement.php | 10 +-- .../src/Statements/SelectStatement.php | 30 +++---- .../src/Statements/TruncateStatement.php | 4 +- .../src/Statements/UpdateStatement.php | 18 ++-- libraries/sql-parser/src/Utils/Query.php | 4 +- libraries/sql-parser/src/Utils/Routine.php | 8 +- tbl_export.php | 4 +- 40 files changed, 434 insertions(+), 433 deletions(-) rename libraries/sql-parser/src/{Fragment.php => Component.php} (64%) rename libraries/sql-parser/src/{Fragments/AlterFragment.php => Components/AlterOperation.php} (87%) rename libraries/sql-parser/src/{Fragments/ValuesKeyword.php => Components/Array2d.php} (92%) rename libraries/sql-parser/src/{Fragments/ArrayFragment.php => Components/ArrayObj.php} (88%) rename libraries/sql-parser/src/{Fragments/WhereKeyword.php => Components/Condition.php} (90%) rename libraries/sql-parser/src/{Fragments/DataTypeFragment.php => Components/DataType.php} (82%) rename libraries/sql-parser/src/{Fragments/FieldFragment.php => Components/Expression.php} (90%) rename libraries/sql-parser/src/{Fragments/FieldListFragment.php => Components/ExpressionArray.php} (84%) rename libraries/sql-parser/src/{Fragments/FieldDefFragment.php => Components/FieldDefinition.php} (80%) rename libraries/sql-parser/src/{Fragments/CallKeyword.php => Components/FunctionCall.php} (78%) rename libraries/sql-parser/src/{Fragments => Components}/IntoKeyword.php (91%) rename libraries/sql-parser/src/{Fragments => Components}/JoinKeyword.php (86%) rename libraries/sql-parser/src/{Fragments/KeyFragment.php => Components/Key.php} (80%) rename libraries/sql-parser/src/{Fragments/LimitKeyword.php => Components/Limit.php} (85%) rename libraries/sql-parser/src/{Fragments/OptionsFragment.php => Components/OptionsArray.php} (90%) rename libraries/sql-parser/src/{Fragments => Components}/OrderKeyword.php (92%) rename libraries/sql-parser/src/{Fragments/ParamDefFragment.php => Components/ParameterDefinition.php} (86%) rename libraries/sql-parser/src/{Fragments/ReferencesKeyword.php => Components/Reference.php} (79%) rename libraries/sql-parser/src/{Fragments/RenameKeyword.php => Components/RenameOperation.php} (89%) rename libraries/sql-parser/src/{Fragments/SetKeyword.php => Components/SetOperation.php} (91%) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 069b827e8f..0e2eadabdd 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -818,9 +818,9 @@ class PMA_Table /** * The destination where the table is moved or copied to. - * @var SqlParser\Fragments\FieldFragment + * @var SqlParser\Components\Expression */ - $destination = new SqlParser\Fragments\FieldFragment( + $destination = new SqlParser\Components\Expression( $target_db, $target_table, '' ); @@ -850,7 +850,7 @@ class PMA_Table */ $statement = new SqlParser\Statements\DropStatement(); - $statement->options = new SqlParser\Fragments\OptionsFragment( + $statement->options = new SqlParser\Components\OptionsArray( array( PMA_Table::isView($target_db, $target_table) ? 'VIEW' : 'TABLE', diff --git a/libraries/sql-parser/src/Fragment.php b/libraries/sql-parser/src/Component.php similarity index 64% rename from libraries/sql-parser/src/Fragment.php rename to libraries/sql-parser/src/Component.php index d9c4c8f939..3505f3dfd5 100644 --- a/libraries/sql-parser/src/Fragment.php +++ b/libraries/sql-parser/src/Component.php @@ -1,26 +1,27 @@ * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -abstract class Fragment +abstract class Component { /** @@ -41,16 +42,16 @@ abstract class Fragment } /** - * Builds the string representation of a fragment of this type. + * Builds the string representation of a component of this type. * * In other words, this function represents the inverse function of * `static::parse`. * - * @param mixed $fragment The fragment to be built. + * @param mixed $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { // This method should be abstract, but it can't be both static and // abstract. diff --git a/libraries/sql-parser/src/Fragments/AlterFragment.php b/libraries/sql-parser/src/Components/AlterOperation.php similarity index 87% rename from libraries/sql-parser/src/Fragments/AlterFragment.php rename to libraries/sql-parser/src/Components/AlterOperation.php index 3b71773925..aa81689be2 100644 --- a/libraries/sql-parser/src/Fragments/AlterFragment.php +++ b/libraries/sql-parser/src/Components/AlterOperation.php @@ -4,11 +4,11 @@ * Parses a reference to a field. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -16,13 +16,13 @@ use SqlParser\TokensList; /** * Parses a reference to a field. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class AlterFragment extends Fragment +class AlterOperation extends Component { /** @@ -77,14 +77,14 @@ class AlterFragment extends Fragment /** * Options of this operation. * - * @var OptionsFragment + * @var OptionsArray */ public $options; /** * The altered field. * - * @var FieldFragment + * @var Expression */ public $field; @@ -100,11 +100,11 @@ class AlterFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return AlterFragment + * @return AlterOperation */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new AlterFragment(); + $ret = new AlterOperation(); /** * Counts brackets. @@ -148,10 +148,10 @@ class AlterFragment extends Fragment } if ($state === 0) { - $ret->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + $ret->options = OptionsArray::parse($parser, $list, static::$OPTIONS); $state = 1; } elseif ($state === 1) { - $ret->field = FieldFragment::parse( + $ret->field = Expression::parse( $parser, $list, array( @@ -184,17 +184,17 @@ class AlterFragment extends Fragment } /** - * @param AlterFragment $fragment The fragment to be built. + * @param AlterOperation $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { - $ret = OptionsFragment::build($fragment->options) . ' '; - if (!empty($fragment->field)) { - $ret .= FieldFragment::build($fragment->field) . ' '; + $ret = OptionsArray::build($component->options) . ' '; + if (!empty($component->field)) { + $ret .= Expression::build($component->field) . ' '; } - foreach ($fragment->unknown as $token) { + foreach ($component->unknown as $token) { $ret .= $token->token; } return $ret; diff --git a/libraries/sql-parser/src/Fragments/ValuesKeyword.php b/libraries/sql-parser/src/Components/Array2d.php similarity index 92% rename from libraries/sql-parser/src/Fragments/ValuesKeyword.php rename to libraries/sql-parser/src/Components/Array2d.php index bed0c5fe3c..c521de2a16 100644 --- a/libraries/sql-parser/src/Fragments/ValuesKeyword.php +++ b/libraries/sql-parser/src/Components/Array2d.php @@ -4,11 +4,11 @@ * `VALUES` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ValuesKeyword extends Fragment +class Array2d extends Component { /** @@ -37,13 +37,13 @@ class ValuesKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return ValuesKeyword + * @return Array2d */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { $ret = array(); - $expr = new ValuesKeyword(); + $expr = new Array2d(); $value = ''; /** @@ -102,7 +102,7 @@ class ValuesKeyword extends Fragment $expr->values[] = $value; $ret[] = $expr; $value = ''; - $expr = new ValuesKeyword(); + $expr = new Array2d(); continue; } diff --git a/libraries/sql-parser/src/Fragments/ArrayFragment.php b/libraries/sql-parser/src/Components/ArrayObj.php similarity index 88% rename from libraries/sql-parser/src/Fragments/ArrayFragment.php rename to libraries/sql-parser/src/Components/ArrayObj.php index 592775160b..01571defa3 100644 --- a/libraries/sql-parser/src/Fragments/ArrayFragment.php +++ b/libraries/sql-parser/src/Components/ArrayObj.php @@ -4,11 +4,11 @@ * Parses an array. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -16,13 +16,13 @@ use SqlParser\TokensList; /** * Parses an array. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ArrayFragment extends Fragment +class ArrayObj extends Component { /** @@ -56,11 +56,11 @@ class ArrayFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return ArrayFragment + * @return ArrayObj */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new ArrayFragment(); + $ret = new ArrayObj(); /** * The state of the parser. @@ -127,17 +127,17 @@ class ArrayFragment extends Fragment } /** - * @param ArrayFragment $fragment The fragment to be built. + * @param ArrayObj $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { $values = array(); - if (!empty($fragment->raw)) { - $values = $fragment->raw; + if (!empty($component->raw)) { + $values = $component->raw; } else { - foreach ($fragment->values as $value) { + foreach ($component->values as $value) { $values[] = $value; } } diff --git a/libraries/sql-parser/src/Fragments/WhereKeyword.php b/libraries/sql-parser/src/Components/Condition.php similarity index 90% rename from libraries/sql-parser/src/Fragments/WhereKeyword.php rename to libraries/sql-parser/src/Components/Condition.php index 90fc0fa484..b170356728 100644 --- a/libraries/sql-parser/src/Fragments/WhereKeyword.php +++ b/libraries/sql-parser/src/Components/Condition.php @@ -4,11 +4,11 @@ * `WHERE` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class WhereKeyword extends Fragment +class Condition extends Component { /** @@ -49,7 +49,7 @@ class WhereKeyword extends Fragment public $identifiers = array(); /** - * Whether this fragment is an operator. + * Whether this component is an operator. * * @var bool */ @@ -77,13 +77,13 @@ class WhereKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return WhereKeyword[] + * @return Condition[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { $ret = array(); - $expr = new WhereKeyword(); + $expr = new Condition(); /** * Counts brackets. @@ -130,11 +130,11 @@ class WhereKeyword extends Fragment } // Adding the operator. - $expr = new WhereKeyword($token->value); + $expr = new Condition($token->value); $expr->isOperator = true; $ret[] = $expr; - $expr = new WhereKeyword(); + $expr = new Condition(); continue; } } @@ -178,14 +178,14 @@ class WhereKeyword extends Fragment } /** - * @param WhereKeyword[] $fragment The fragment to be built. + * @param Condition[] $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { $ret = array(); - foreach ($fragment as $f) { + foreach ($component as $f) { $ret[] = $f->expr; } return implode(' ', $ret); diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Components/DataType.php similarity index 82% rename from libraries/sql-parser/src/Fragments/DataTypeFragment.php rename to libraries/sql-parser/src/Components/DataType.php index d17cfa9ca6..60f5bba9a5 100644 --- a/libraries/sql-parser/src/Fragments/DataTypeFragment.php +++ b/libraries/sql-parser/src/Components/DataType.php @@ -4,11 +4,11 @@ * Parses a data type. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -16,13 +16,13 @@ use SqlParser\TokensList; /** * Parses a data type. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class DataTypeFragment extends Fragment +class DataType extends Component { /** @@ -64,7 +64,7 @@ class DataTypeFragment extends Fragment /** * The options of this data type. * - * @var OptionsFragment + * @var OptionsArray */ public $options; @@ -73,7 +73,7 @@ class DataTypeFragment extends Fragment * * @param string $name The name of this data type. * @param array $parameters The parameters (size or possible values). - * @param OptionsFragment $options The options of this data type. + * @param OptionsArray $options The options of this data type. */ public function __construct($name = null, array $parameters = array(), $options = null @@ -88,11 +88,11 @@ class DataTypeFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return DataTypeFragment + * @return DataType */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new DataTypeFragment(); + $ret = new DataType(); /** * The state of the parser. @@ -127,12 +127,12 @@ class DataTypeFragment extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $parameters = ArrayFragment::parse($parser, $list); + $parameters = ArrayObj::parse($parser, $list); ++$list->idx; $ret->parameters = (($ret->name === 'ENUM') || ($ret->name === 'SET')) ? $parameters->raw : $parameters->values; } - $ret->options = OptionsFragment::parse($parser, $list, static::$DATA_TYPE_OPTIONS); + $ret->options = OptionsArray::parse($parser, $list, static::$DATA_TYPE_OPTIONS); ++$list->idx; break; } @@ -148,19 +148,19 @@ class DataTypeFragment extends Fragment } /** - * @param DataTypeFragment $fragment The fragment to be built. + * @param DataType $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { $tmp = ''; - if (!empty($fragment->parameters)) { - $tmp = '(' . implode(', ', $fragment->parameters) . ')'; + if (!empty($component->parameters)) { + $tmp = '(' . implode(', ', $component->parameters) . ')'; } return trim( - $fragment->name . ' ' . $tmp . ' ' - . OptionsFragment::build($fragment->options) + $component->name . ' ' . $tmp . ' ' + . OptionsArray::build($component->options) ); } } diff --git a/libraries/sql-parser/src/Fragments/FieldFragment.php b/libraries/sql-parser/src/Components/Expression.php similarity index 90% rename from libraries/sql-parser/src/Fragments/FieldFragment.php rename to libraries/sql-parser/src/Components/Expression.php index a0bfc6d67d..29b56350bc 100644 --- a/libraries/sql-parser/src/Fragments/FieldFragment.php +++ b/libraries/sql-parser/src/Components/Expression.php @@ -4,12 +4,12 @@ * Parses a reference to a field. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; use SqlParser\Context; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -17,13 +17,13 @@ use SqlParser\TokensList; /** * Parses a reference to a field. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class FieldFragment extends Fragment +class Expression extends Component { /** @@ -79,10 +79,10 @@ class FieldFragment extends Fragment * Constructor. * * Syntax: - * new FieldFragment('expr') - * new FieldFragment('expr', 'alias') - * new FieldFragment('database', 'table', 'column') - * new FieldFragment('database', 'table', 'column', 'alias') + * new Expression('expr') + * new Expression('expr', 'alias') + * new Expression('database', 'table', 'column') + * new Expression('database', 'table', 'column', 'alias') * * If the database, table or column name is not required, pass an empty * string. @@ -112,11 +112,11 @@ class FieldFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return FieldFragment + * @return Expression */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new FieldFragment(); + $ret = new Expression(); /** * Whether current tokens make an expression or a table reference. @@ -306,30 +306,30 @@ class FieldFragment extends Fragment } /** - * @param FieldFragment $fragment The fragment to be built. + * @param Expression $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { - if (!empty($fragment->expr)) { - $ret = $fragment->expr; + if (!empty($component->expr)) { + $ret = $component->expr; } else { $fields = array(); - if (!empty($fragment->database)) { - $fields[] = $fragment->database; + if (!empty($component->database)) { + $fields[] = $component->database; } - if (!empty($fragment->table)) { - $fields[] = $fragment->table; + if (!empty($component->table)) { + $fields[] = $component->table; } - if (!empty($fragment->column)) { - $fields[] = $fragment->column; + if (!empty($component->column)) { + $fields[] = $component->column; } $ret = implode('.', Context::escape($fields)); } - if (!empty($fragment->alias)) { - $ret .= ' AS ' . Context::escape($fragment->alias); + if (!empty($component->alias)) { + $ret .= ' AS ' . Context::escape($component->alias); } return $ret; diff --git a/libraries/sql-parser/src/Fragments/FieldListFragment.php b/libraries/sql-parser/src/Components/ExpressionArray.php similarity index 84% rename from libraries/sql-parser/src/Fragments/FieldListFragment.php rename to libraries/sql-parser/src/Components/ExpressionArray.php index cdf6428972..d62f34cb61 100644 --- a/libraries/sql-parser/src/Fragments/FieldListFragment.php +++ b/libraries/sql-parser/src/Components/ExpressionArray.php @@ -4,11 +4,11 @@ * Parses a a list of fields delimited by a single comma. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class FieldListFragment extends Fragment +class ExpressionArray extends Component { /** @@ -30,7 +30,7 @@ class FieldListFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return FieldFragment[] + * @return Expression[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { @@ -63,7 +63,7 @@ class FieldListFragment extends Fragment if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { $ret[] = $expr; } else { - $expr = FieldFragment::parse($parser, $list, $options); + $expr = Expression::parse($parser, $list, $options); if ($expr === null) { break; } @@ -81,14 +81,14 @@ class FieldListFragment extends Fragment } /** - * @param FieldFragment[] $fragment The fragment to be built. + * @param Expression[] $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { $ret = array(); - foreach ($fragment as $frag) { + foreach ($component as $frag) { $ret[] = $frag::build($frag); } return implode($ret, ', '); diff --git a/libraries/sql-parser/src/Fragments/FieldDefFragment.php b/libraries/sql-parser/src/Components/FieldDefinition.php similarity index 80% rename from libraries/sql-parser/src/Fragments/FieldDefFragment.php rename to libraries/sql-parser/src/Components/FieldDefinition.php index 34932d5ac3..97cda27b66 100644 --- a/libraries/sql-parser/src/Fragments/FieldDefFragment.php +++ b/libraries/sql-parser/src/Components/FieldDefinition.php @@ -6,12 +6,12 @@ * Used for parsing `CREATE TABLE` statement. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; use SqlParser\Context; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -21,13 +21,13 @@ use SqlParser\TokensList; * * Used for parsing `CREATE TABLE` statement. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class FieldDefFragment extends Fragment +class FieldDefinition extends Component { /** @@ -66,28 +66,28 @@ class FieldDefFragment extends Fragment /** * The data type of thew new column. * - * @var DataTypeFragment + * @var DataType */ public $type; /** * The key. * - * @var KeyFragment + * @var Key */ public $key; /** * The table that is referenced. * - * @var ReferencesKeyword + * @var Reference */ public $references; /** - * The options of the new field fragment. + * The options of this field. * - * @var OptionsFragment + * @var OptionsArray */ public $options; @@ -95,19 +95,19 @@ class FieldDefFragment extends Fragment * Constructor. * * @param string $name The name of the field. - * @param OptionsFragment $options The options of this field. - * @param DataTypeFragment|KeyFragment $type The data type of this field or the key. + * @param OptionsArray $options The options of this field. + * @param DataType|Key $type The data type of this field or the key. * @param bool $isConstraint Whether this field is a constraint or not. - * @param ReferencesKeyword $references References. + * @param Reference $references References. */ public function __construct($name = null, $options = null, $type = null, $isConstraint = false, $references = null ) { $this->name = $name; $this->options = $options; - if ($type instanceof DataTypeFragment) { + if ($type instanceof DataType) { $this->type = $type; - } elseif ($type instanceof KeyFragment) { + } elseif ($type instanceof Key) { $this->key = $type; $this->isConstraint = $isConstraint; $this->references = $references; @@ -119,13 +119,13 @@ class FieldDefFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return FieldDefFragment[] + * @return FieldDefinition[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { $ret = array(); - $expr = new FieldDefFragment(); + $expr = new FieldDefinition(); /** * The state of the parser. @@ -176,7 +176,7 @@ class FieldDefFragment extends Fragment if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'CONSTRAINT')) { $expr->isConstraint = true; } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_KEY)) { - $expr->key = KeyFragment::parse($parser, $list); + $expr->key = Key::parse($parser, $list); $state = 4; } else { $expr->name = $token->value; @@ -185,15 +185,15 @@ class FieldDefFragment extends Fragment } } } elseif ($state === 2) { - $expr->type = DataTypeFragment::parse($parser, $list); + $expr->type = DataType::parse($parser, $list); $state = 3; } elseif ($state === 3) { - $expr->options = OptionsFragment::parse($parser, $list, static::$FIELD_OPTIONS); + $expr->options = OptionsArray::parse($parser, $list, static::$FIELD_OPTIONS); $state = 4; } elseif ($state === 4) { if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'REFERENCES')) { ++$list->idx; // Skipping keyword 'REFERENCES'. - $expr->references = ReferencesKeyword::parse($parser, $list); + $expr->references = Reference::parse($parser, $list); } else { --$list->idx; } @@ -202,7 +202,7 @@ class FieldDefFragment extends Fragment if ((!empty($expr->type)) || (!empty($expr->key))) { $ret[] = $expr; } - $expr = new FieldDefFragment(); + $expr = new FieldDefinition(); if ($token->value === ',') { $state = 1; continue; @@ -224,15 +224,15 @@ class FieldDefFragment extends Fragment } /** - * @param FieldDefFragment[] $fragment The fragment to be built. + * @param FieldDefinition[] $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { $ret = array(); - foreach ($fragment as $f) { + foreach ($component as $f) { $tmp = ''; if ($f->isConstraint) { @@ -244,18 +244,18 @@ class FieldDefFragment extends Fragment } if (!empty($f->type)) { - $tmp .= DataTypeFragment::build($f->type) . ' '; + $tmp .= DataType::build($f->type) . ' '; } if (!empty($f->key)) { - $tmp .= KeyFragment::build($f->key) . ' '; + $tmp .= Key::build($f->key) . ' '; } if (!empty($f->references)) { - $tmp .= 'REFERENCES ' . ReferencesKeyword::build($f->references) . ' '; + $tmp .= 'REFERENCES ' . Reference::build($f->references) . ' '; } - $tmp .= OptionsFragment::build($f->options); + $tmp .= OptionsArray::build($f->options); $ret[] = trim($tmp); } diff --git a/libraries/sql-parser/src/Fragments/CallKeyword.php b/libraries/sql-parser/src/Components/FunctionCall.php similarity index 78% rename from libraries/sql-parser/src/Fragments/CallKeyword.php rename to libraries/sql-parser/src/Components/FunctionCall.php index aae2b52ef3..572b3f88b3 100644 --- a/libraries/sql-parser/src/Fragments/CallKeyword.php +++ b/libraries/sql-parser/src/Components/FunctionCall.php @@ -4,11 +4,11 @@ * Parses a function call. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class CallKeyword extends Fragment +class FunctionCall extends Component { /** @@ -35,7 +35,7 @@ class CallKeyword extends Fragment /** * The list of parameters * - * @var ArrayFragment + * @var ArrayObj */ public $parameters; @@ -43,14 +43,14 @@ class CallKeyword extends Fragment * Constructor. * * @param string $name The name of the function to be called. - * @param array|ArrayFragment $parameters The parameters of this function. + * @param array|ArrayObj $parameters The parameters of this function. */ public function __construct($name = null, $parameters = null) { $this->name = $name; if (is_array($parameters)) { - $this->parameters = new ArrayFragment($parameters); - } elseif ($parameters instanceof ArrayFragment) { + $this->parameters = new ArrayObj($parameters); + } elseif ($parameters instanceof ArrayObj) { $this->parameters = $parameters; } } @@ -60,11 +60,11 @@ class CallKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return CallKeyword + * @return FunctionCall */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new CallKeyword(); + $ret = new FunctionCall(); /** * The state of the parser. @@ -101,7 +101,7 @@ class CallKeyword extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $ret->parameters = ArrayFragment::parse($parser, $list); + $ret->parameters = ArrayObj::parse($parser, $list); } break; } @@ -112,12 +112,12 @@ class CallKeyword extends Fragment } /** - * @param CallKeyword $fragment The fragment to be built. + * @param FunctionCall $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { - return $fragment->name . ArrayFragment::build($fragment->parameters); + return $component->name . ArrayObj::build($component->parameters); } } diff --git a/libraries/sql-parser/src/Fragments/IntoKeyword.php b/libraries/sql-parser/src/Components/IntoKeyword.php similarity index 91% rename from libraries/sql-parser/src/Fragments/IntoKeyword.php rename to libraries/sql-parser/src/Components/IntoKeyword.php index 9117dce787..a0e5d545f8 100644 --- a/libraries/sql-parser/src/Fragments/IntoKeyword.php +++ b/libraries/sql-parser/src/Components/IntoKeyword.php @@ -4,11 +4,11 @@ * `INTO` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class IntoKeyword extends Fragment +class IntoKeyword extends Component { /** @@ -35,7 +35,7 @@ class IntoKeyword extends Fragment /** * The destination, which can be a table or a file. * - * @var string|FieldFragment + * @var string|Expression */ public $dest; @@ -102,7 +102,7 @@ class IntoKeyword extends Fragment } if ($state === 0) { - $ret->dest = FieldFragment::parse( + $ret->dest = Expression::parse( $parser, $list, array( @@ -114,7 +114,7 @@ class IntoKeyword extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $ret->fields = ArrayFragment::parse($parser, $list)->values; + $ret->fields = ArrayObj::parse($parser, $list)->values; ++$list->idx; } break; diff --git a/libraries/sql-parser/src/Fragments/JoinKeyword.php b/libraries/sql-parser/src/Components/JoinKeyword.php similarity index 86% rename from libraries/sql-parser/src/Fragments/JoinKeyword.php rename to libraries/sql-parser/src/Components/JoinKeyword.php index 4d47ec409d..8b07822c10 100644 --- a/libraries/sql-parser/src/Fragments/JoinKeyword.php +++ b/libraries/sql-parser/src/Components/JoinKeyword.php @@ -4,11 +4,11 @@ * `JOIN` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,24 +18,24 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class JoinKeyword extends Fragment +class JoinKeyword extends Component { /** * Join expression. * - * @var FieldFragment + * @var Expression */ public $expr; /** * Join conditions. * - * @var WhereKeyword[] + * @var Condition[] */ public $on; @@ -83,14 +83,14 @@ class JoinKeyword extends Fragment } if ($state === 0) { - $ret->expr = FieldFragment::parse($parser, $list, array('skipColumn' => true)); + $ret->expr = Expression::parse($parser, $list, array('skipColumn' => true)); $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON')) { $state = 2; } } elseif ($state === 2) { - $ret->on = WhereKeyword::parse($parser, $list); + $ret->on = Condition::parse($parser, $list); ++$list->idx; break; } diff --git a/libraries/sql-parser/src/Fragments/KeyFragment.php b/libraries/sql-parser/src/Components/Key.php similarity index 80% rename from libraries/sql-parser/src/Fragments/KeyFragment.php rename to libraries/sql-parser/src/Components/Key.php index 7c165fe306..a79feefb41 100644 --- a/libraries/sql-parser/src/Fragments/KeyFragment.php +++ b/libraries/sql-parser/src/Components/Key.php @@ -4,12 +4,12 @@ * Parses the definition of a key. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; use SqlParser\Context; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -19,13 +19,13 @@ use SqlParser\TokensList; * * Used for parsing `CREATE TABLE` statement. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class KeyFragment extends Fragment +class Key extends Component { /** @@ -63,7 +63,7 @@ class KeyFragment extends Fragment /** * The options of this key. * - * @var OptionsFragment + * @var OptionsArray */ public $options; @@ -73,7 +73,7 @@ class KeyFragment extends Fragment * @param string $name The name of the key. * @param array $columns The columns covered by this key. * @param string $type The type of this key. - * @param OptionsFragment $options The options of this key. + * @param OptionsArray $options The options of this key. */ public function __construct($name = null, array $columns = array(), $type = null, $options = null @@ -89,11 +89,11 @@ class KeyFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return KeyFragment[] + * @return Key[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new KeyFragment(); + $ret = new Key(); /** * The state of the parser. @@ -133,13 +133,13 @@ class KeyFragment extends Fragment $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { - $ret->columns = ArrayFragment::parse($parser, $list)->values; + $ret->columns = ArrayObj::parse($parser, $list)->values; $state = 2; } else { $ret->name = $token->value; } } elseif ($state === 2) { - $ret->options = OptionsFragment::parse($parser, $list, static::$KEY_OPTIONS); + $ret->options = OptionsArray::parse($parser, $list, static::$KEY_OPTIONS); ++$list->idx; break; } @@ -151,18 +151,18 @@ class KeyFragment extends Fragment } /** - * @param KeyFragment $fragment The fragment to be built. + * @param Key $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { - $ret = $fragment->type . ' '; - if (!empty($fragment->name)) { - $ret .= Context::escape($fragment->name) . ' '; + $ret = $component->type . ' '; + if (!empty($component->name)) { + $ret .= Context::escape($component->name) . ' '; } - $ret .= '(' . implode(', ', Context::escape($fragment->columns)) . ')'; - $ret .= OptionsFragment::build($fragment->options); + $ret .= '(' . implode(', ', Context::escape($component->columns)) . ')'; + $ret .= OptionsArray::build($component->options); return trim($ret); } } diff --git a/libraries/sql-parser/src/Fragments/LimitKeyword.php b/libraries/sql-parser/src/Components/Limit.php similarity index 85% rename from libraries/sql-parser/src/Fragments/LimitKeyword.php rename to libraries/sql-parser/src/Components/Limit.php index 06db20b692..1e25d2aedd 100644 --- a/libraries/sql-parser/src/Fragments/LimitKeyword.php +++ b/libraries/sql-parser/src/Components/Limit.php @@ -4,11 +4,11 @@ * `LIMIT` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class LimitKeyword extends Fragment +class Limit extends Component { /** @@ -56,11 +56,11 @@ class LimitKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return LimitKeyword + * @return Limit */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new LimitKeyword(); + $ret = new Limit(); $offset = false; @@ -116,16 +116,16 @@ class LimitKeyword extends Fragment } /** - * @param LimitKeyword $fragment The fragment to be built. + * @param Limit $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { - if (empty($fragment->offset)) { - return $fragment->rowCount; + if (empty($component->offset)) { + return $component->rowCount; } else { - return $fragment->offset . ', ' . $fragment->rowCount; + return $component->offset . ', ' . $component->rowCount; } } } diff --git a/libraries/sql-parser/src/Fragments/OptionsFragment.php b/libraries/sql-parser/src/Components/OptionsArray.php similarity index 90% rename from libraries/sql-parser/src/Fragments/OptionsFragment.php rename to libraries/sql-parser/src/Components/OptionsArray.php index b9a37d3652..7a3a588fb3 100644 --- a/libraries/sql-parser/src/Fragments/OptionsFragment.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -4,11 +4,11 @@ * Parses a list of options. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -16,17 +16,17 @@ use SqlParser\TokensList; /** * Parses a list of options. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class OptionsFragment extends Fragment +class OptionsArray extends Component { /** - * Array of selected options. + * ArrayObj of selected options. * * @var array */ @@ -48,11 +48,11 @@ class OptionsFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return OptionsFragment + * @return OptionsArray */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new OptionsFragment(); + $ret = new OptionsArray(); /** * The ID that will be assigned to duplicate options. @@ -150,17 +150,17 @@ class OptionsFragment extends Fragment } /** - * @param OptionsFragment $fragment The fragment to be built. + * @param OptionsArray $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { - if ((empty($fragment)) || (!is_array($fragment->options))) { + if ((empty($component)) || (!is_array($component->options))) { return ''; } $options = array(); - foreach ($fragment->options as $option) { + foreach ($component->options as $option) { if (is_array($option)) { $options[] = $option['name'] . (!empty($option['equal']) ? '=' : ' ') @@ -195,7 +195,7 @@ class OptionsFragment extends Fragment * Merges the specified options with these ones. Values with same ID will be * replaced. * - * @param array|OptionsFragment $options The options to be merged. + * @param array|OptionsArray $options The options to be merged. * * @return void */ @@ -203,7 +203,7 @@ class OptionsFragment extends Fragment { if (is_array($options)) { $this->options = array_merge_recursive($this->options, $options); - } elseif ($options instanceof OptionsFragment) { + } elseif ($options instanceof OptionsArray) { $this->options = array_merge_recursive($this->options, $options->options); } } diff --git a/libraries/sql-parser/src/Fragments/OrderKeyword.php b/libraries/sql-parser/src/Components/OrderKeyword.php similarity index 92% rename from libraries/sql-parser/src/Fragments/OrderKeyword.php rename to libraries/sql-parser/src/Components/OrderKeyword.php index 710aff80f3..26d0f20d80 100644 --- a/libraries/sql-parser/src/Fragments/OrderKeyword.php +++ b/libraries/sql-parser/src/Components/OrderKeyword.php @@ -4,11 +4,11 @@ * `ORDER BY` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,17 +18,17 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class OrderKeyword extends Fragment +class OrderKeyword extends Component { /** * The field that is used for ordering. * - * @var FieldFragment + * @var Expression */ public $field; @@ -84,7 +84,7 @@ class OrderKeyword extends Fragment } if ($state === 0) { - $expr->field = FieldFragment::parse($parser, $list); + $expr->field = Expression::parse($parser, $list); $state = 1; } elseif ($state === 1) { if (($token->type === Token::TYPE_KEYWORD) && (($token->value === 'ASC') || ($token->value === 'DESC'))) { diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Components/ParameterDefinition.php similarity index 86% rename from libraries/sql-parser/src/Fragments/ParamDefFragment.php rename to libraries/sql-parser/src/Components/ParameterDefinition.php index d766cff6a3..a089c3ebf0 100644 --- a/libraries/sql-parser/src/Fragments/ParamDefFragment.php +++ b/libraries/sql-parser/src/Components/ParameterDefinition.php @@ -4,12 +4,12 @@ * The definition of a parameter of a function or procedure. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; use SqlParser\Context; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -17,13 +17,13 @@ use SqlParser\TokensList; /** * The definition of a parameter of a function or procedure. * - * @category Fragments + * @category Components * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ParamDefFragment extends Fragment +class ParameterDefinition extends Component { /** @@ -43,7 +43,7 @@ class ParamDefFragment extends Fragment /** * The data type of thew new column. * - * @var DataTypeFragment + * @var DataType */ public $type; @@ -52,13 +52,13 @@ class ParamDefFragment extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return ParamDefFragment[] + * @return ParameterDefinition[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { $ret = array(); - $expr = new ParamDefFragment(); + $expr = new ParameterDefinition(); /** * The state of the parser. @@ -113,11 +113,11 @@ class ParamDefFragment extends Fragment $state = 2; } } elseif ($state === 2) { - $expr->type = DataTypeFragment::parse($parser, $list); + $expr->type = DataType::parse($parser, $list); $state = 3; } elseif ($state === 3) { $ret[] = $expr; - $expr = new ParamDefFragment(); + $expr = new ParameterDefinition(); if ($token->value === ',') { $state = 1; continue; @@ -138,14 +138,14 @@ class ParamDefFragment extends Fragment } /** - * @param ParamDefFragment[] $fragment The fragment to be built. + * @param ParameterDefinition[] $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { $ret = array(); - foreach ($fragment as $f) { + foreach ($component as $f) { $tmp = ''; if (!empty($f->inOut)) { $tmp .= $f->inOut . ' '; @@ -153,7 +153,7 @@ class ParamDefFragment extends Fragment $ret[] = trim( $tmp . Context::escape($f->name) . ' ' . - DataTypeFragment::build($f->type) + DataType::build($f->type) ); } return '(' . implode(', ', $ret) . ')'; diff --git a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php b/libraries/sql-parser/src/Components/Reference.php similarity index 79% rename from libraries/sql-parser/src/Fragments/ReferencesKeyword.php rename to libraries/sql-parser/src/Components/Reference.php index 95e3d92bff..fef8fa465f 100644 --- a/libraries/sql-parser/src/Fragments/ReferencesKeyword.php +++ b/libraries/sql-parser/src/Components/Reference.php @@ -4,12 +4,12 @@ * `REFERENCES` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; use SqlParser\Context; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -19,11 +19,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class ReferencesKeyword extends Fragment +class Reference extends Component { /** @@ -54,7 +54,7 @@ class ReferencesKeyword extends Fragment /** * The options of the referencing. * - * @var OptionsFragment + * @var OptionsArray */ public $options; @@ -63,7 +63,7 @@ class ReferencesKeyword extends Fragment * * @param string $table The name of the table referenced. * @param array $columns The columns referenced. - * @param OptionsFragment $options The options. + * @param OptionsArray $options The options. */ public function __construct($table = null, array $columns = array(), $options = null) { @@ -77,11 +77,11 @@ class ReferencesKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return ReferencesKeyword + * @return Reference */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new ReferencesKeyword(); + $ret = new Reference(); /** * The state of the parser. @@ -119,10 +119,10 @@ class ReferencesKeyword extends Fragment $ret->table = $token->value; $state = 1; } elseif ($state === 1) { - $ret->columns = ArrayFragment::parse($parser, $list)->values; + $ret->columns = ArrayObj::parse($parser, $list)->values; $state = 2; } elseif ($state === 2) { - $ret->options = OptionsFragment::parse($parser, $list, static::$REFERENCES_OPTIONS); + $ret->options = OptionsArray::parse($parser, $list, static::$REFERENCES_OPTIONS); ++$list->idx; break; } @@ -134,16 +134,16 @@ class ReferencesKeyword extends Fragment } /** - * @param ReferencesKeyword $fragment The fragment to be built. + * @param Reference $component The component to be built. * * @return string */ - public static function build($fragment) + public static function build($component) { return trim( - Context::escape($fragment->table) - . ' (' . implode(', ', Context::escape($fragment->columns)) . ') ' - . OptionsFragment::build($fragment->options) + Context::escape($component->table) + . ' (' . implode(', ', Context::escape($component->columns)) . ') ' + . OptionsArray::build($component->options) ); } } diff --git a/libraries/sql-parser/src/Fragments/RenameKeyword.php b/libraries/sql-parser/src/Components/RenameOperation.php similarity index 89% rename from libraries/sql-parser/src/Fragments/RenameKeyword.php rename to libraries/sql-parser/src/Components/RenameOperation.php index 10cf7fd281..335043791a 100644 --- a/libraries/sql-parser/src/Fragments/RenameKeyword.php +++ b/libraries/sql-parser/src/Components/RenameOperation.php @@ -4,11 +4,11 @@ * `RENAME TABLE` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,24 +18,24 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class RenameKeyword extends Fragment +class RenameOperation extends Component { /** * The old table name. * - * @var FieldFragment + * @var Expression */ public $old; /** * The new table name. * - * @var FieldFragment + * @var Expression */ public $new; @@ -44,13 +44,13 @@ class RenameKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return RenameKeyword + * @return RenameOperation */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { $ret = array(); - $expr = new RenameKeyword(); + $expr = new RenameOperation(); /** * The state of the parser. @@ -100,7 +100,7 @@ class RenameKeyword extends Fragment if ($token->type === Token::TYPE_OPERATOR) { if (($state === 3) && ($token->value === ',')) { $ret[] = $expr; - $expr = new RenameKeyword(); + $expr = new RenameOperation(); $state = 0; continue; } @@ -110,7 +110,7 @@ class RenameKeyword extends Fragment } if ($state == 0) { - $expr->old = FieldFragment::parse( + $expr->old = Expression::parse( $parser, $list, array( @@ -121,7 +121,7 @@ class RenameKeyword extends Fragment ); $state = 1; } elseif ($state == 2) { - $expr->new = FieldFragment::parse( + $expr->new = Expression::parse( $parser, $list, array( diff --git a/libraries/sql-parser/src/Fragments/SetKeyword.php b/libraries/sql-parser/src/Components/SetOperation.php similarity index 91% rename from libraries/sql-parser/src/Fragments/SetKeyword.php rename to libraries/sql-parser/src/Components/SetOperation.php index d9e0871d15..dad91e5425 100644 --- a/libraries/sql-parser/src/Fragments/SetKeyword.php +++ b/libraries/sql-parser/src/Components/SetOperation.php @@ -4,11 +4,11 @@ * `SET` keyword parser. * * @package SqlParser - * @subpackage Fragments + * @subpackage Components */ -namespace SqlParser\Fragments; +namespace SqlParser\Components; -use SqlParser\Fragment; +use SqlParser\Component; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; @@ -18,11 +18,11 @@ use SqlParser\TokensList; * * @category Keywords * @package SqlParser - * @subpackage Fragments + * @subpackage Components * @author Dan Ungureanu * @license http://opensource.org/licenses/GPL-2.0 GNU Public License */ -class SetKeyword extends Fragment +class SetOperation extends Component { /** @@ -44,13 +44,13 @@ class SetKeyword extends Fragment * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return SetKeyword[] + * @return SetOperation[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { $ret = array(); - $expr = new SetKeyword(); + $expr = new SetOperation(); /** * The state of the parser. @@ -93,7 +93,7 @@ class SetKeyword extends Fragment $expr->column = trim($expr->column); $expr->value = trim($expr->value); $ret[] = $expr; - $expr = new SetKeyword(); + $expr = new SetOperation(); $state = 0; continue; } elseif ($token->value === '=') { diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 124848f320..9a57a20fcf 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -75,7 +75,7 @@ class Parser ); /** - * Array of classes that are used in parsing SQL fragments. + * Array of classes that are used in parsing SQL components. * * @var array */ @@ -83,128 +83,128 @@ class Parser // This is not a proper keyword and was added here to help the builder. '_OPTIONS' => array( - 'class' => 'SqlParser\\Fragments\\OptionsFragment', + 'class' => 'SqlParser\\Components\\OptionsArray', 'field' => 'options', ), 'ALTER' => array( - 'class' => 'SqlParser\\Fragments\\FieldFragment', + 'class' => 'SqlParser\\Components\\Expression', 'field' => 'table', 'options' => array('skipColumn' => true), ), 'ANALYZE' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'BACKUP' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'CALL' => array( - 'class' => 'SqlParser\\Fragments\\CallKeyword', + 'class' => 'SqlParser\\Components\\FunctionCall', 'field' => 'call', ), 'CHECK' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'CHECKSUM' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'DROP' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'fields', 'options' => array('skipColumn' => true), ), 'FROM' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'from', 'options' => array('skipColumn' => true), ), 'GROUP BY' => array( - 'class' => 'SqlParser\\Fragments\\OrderKeyword', + 'class' => 'SqlParser\\Components\\OrderKeyword', 'field' => 'group', ), 'HAVING' => array( - 'class' => 'SqlParser\\Fragments\\WhereKeyword', + 'class' => 'SqlParser\\Components\\Condition', 'field' => 'having', ), 'INTO' => array( - 'class' => 'SqlParser\\Fragments\\IntoKeyword', + 'class' => 'SqlParser\\Components\\IntoKeyword', 'field' => 'into', ), 'JOIN' => array( - 'class' => 'SqlParser\\Fragments\\JoinKeyword', + 'class' => 'SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), 'LIMIT' => array( - 'class' => 'SqlParser\\Fragments\\LimitKeyword', + 'class' => 'SqlParser\\Components\\Limit', 'field' => 'limit', ), 'OPTIMIZE' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'ORDER BY' => array( - 'class' => 'SqlParser\\Fragments\\OrderKeyword', + 'class' => 'SqlParser\\Components\\OrderKeyword', 'field' => 'order', ), 'PARTITION' => array( - 'class' => 'SqlParser\\Fragments\\ArrayFragment', + 'class' => 'SqlParser\\Components\\ArrayObj', 'field' => 'partition', ), 'PROCEDURE' => array( - 'class' => 'SqlParser\\Fragments\\CallKeyword', + 'class' => 'SqlParser\\Components\\FunctionCall', 'field' => 'procedure', ), 'RENAME' => array( - 'class' => 'SqlParser\\Fragments\\RenameKeyword', + 'class' => 'SqlParser\\Components\\RenameOperation', 'field' => 'renames', ), 'REPAIR' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'RESTORE' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'SET' => array( - 'class' => 'SqlParser\\Fragments\\SetKeyword', + 'class' => 'SqlParser\\Components\\SetOperation', 'field' => 'set', ), 'SELECT' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'expr', ), 'TRUNCATE' => array( - 'class' => 'SqlParser\\Fragments\\FieldFragment', + 'class' => 'SqlParser\\Components\\Expression', 'field' => 'table', 'options' => array('skipColumn' => true), ), 'UPDATE' => array( - 'class' => 'SqlParser\\Fragments\\FieldListFragment', + 'class' => 'SqlParser\\Components\\ExpressionArray', 'field' => 'tables', 'options' => array('skipColumn' => true), ), 'VALUE' => array( - 'class' => 'SqlParser\\Fragments\\ValuesKeyword', + 'class' => 'SqlParser\\Components\\Array2d', 'field' => 'values', ), 'VALUES' => array( - 'class' => 'SqlParser\\Fragments\\ValuesKeyword', + 'class' => 'SqlParser\\Components\\Array2d', 'field' => 'values', ), 'WHERE' => array( - 'class' => 'SqlParser\\Fragments\\WhereKeyword', + 'class' => 'SqlParser\\Components\\Condition', 'field' => 'where', ), diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 11676be6d2..a9ee3d34b0 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -10,7 +10,7 @@ */ namespace SqlParser; -use SqlParser\Fragments\OptionsFragment; +use SqlParser\Components\OptionsArray; /** * Abstract statement definition. @@ -61,7 +61,7 @@ abstract class Statement /** * The options of this query. * - * @var OptionsFragment + * @var OptionsArray * * @see static::$OPTIONS */ @@ -233,7 +233,7 @@ abstract class Statement if (!empty(Parser::$STATEMENT_PARSERS[$token->value])) { if (!$parsedOptions) { ++$list->idx; // Skipping keyword. - $this->options = OptionsFragment::parse( + $this->options = OptionsArray::parse( $parser, $list, static::$OPTIONS diff --git a/libraries/sql-parser/src/Statements/AlterStatement.php b/libraries/sql-parser/src/Statements/AlterStatement.php index 24de371d63..0dfee2cff8 100644 --- a/libraries/sql-parser/src/Statements/AlterStatement.php +++ b/libraries/sql-parser/src/Statements/AlterStatement.php @@ -12,9 +12,9 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; -use SqlParser\Fragments\AlterFragment; -use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\OptionsFragment; +use SqlParser\Components\AlterOperation; +use SqlParser\Components\Expression; +use SqlParser\Components\OptionsArray; /** * `ALTER` statement. @@ -31,14 +31,14 @@ class AlterStatement extends Statement /** * Table affected. * - * @var FieldFragment + * @var Expression */ public $table; /** * Column affected by this statement. * - * @var AlterFragment[] + * @var AlterOperation[] */ public $altered = array(); @@ -62,7 +62,7 @@ class AlterStatement extends Statement public function parse(Parser $parser, TokensList $list) { ++$list->idx; // Skipping `ALTER`. - $this->options = OptionsFragment::parse( + $this->options = OptionsArray::parse( $parser, $list, static::$OPTIONS @@ -72,7 +72,7 @@ class AlterStatement extends Statement $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE'); // Parsing affected table. - $this->table = FieldFragment::parse( + $this->table = Expression::parse( $parser, $list, array( 'noAlias' => true, 'noBrackets' => true, @@ -111,7 +111,7 @@ class AlterStatement extends Statement } if ($state === 0) { - $this->altered[] = AlterFragment::parse($parser, $list); + $this->altered[] = AlterOperation::parse($parser, $list); $state = 1; } else if ($state === 1) { if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) { @@ -131,8 +131,8 @@ class AlterStatement extends Statement $tmp[] = $altered::build($altered); } - return 'ALTER ' . OptionsFragment::build($this->options) - . ' TABLE ' . FieldFragment::build($this->table) + return 'ALTER ' . OptionsArray::build($this->options) + . ' TABLE ' . Expression::build($this->table) . ' ' . implode(', ', $tmp); } } diff --git a/libraries/sql-parser/src/Statements/AnalyzeStatement.php b/libraries/sql-parser/src/Statements/AnalyzeStatement.php index be3a4f36db..b6ae99e8c0 100644 --- a/libraries/sql-parser/src/Statements/AnalyzeStatement.php +++ b/libraries/sql-parser/src/Statements/AnalyzeStatement.php @@ -9,7 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\FieldFragment; +use SqlParser\Components\Expression; /** * `ANALYZE` statement. @@ -42,7 +42,7 @@ class AnalyzeStatement extends Statement /** * Analyzed tables. * - * @var FieldFragment[] + * @var Expression[] */ public $tables; } diff --git a/libraries/sql-parser/src/Statements/CallStatement.php b/libraries/sql-parser/src/Statements/CallStatement.php index 4ad8f708a2..bac73ee530 100644 --- a/libraries/sql-parser/src/Statements/CallStatement.php +++ b/libraries/sql-parser/src/Statements/CallStatement.php @@ -9,7 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\CallKeyword; +use SqlParser\Components\FunctionCall; /** * `CALL` statement. @@ -32,7 +32,7 @@ class CallStatement extends Statement /** * The name of the function and its parameters. * - * @var CallKeyword + * @var FunctionCall */ public $call; } diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 55aad0a76c..60846780be 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -12,12 +12,12 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; -use SqlParser\Fragments\ArrayFragment; -use SqlParser\Fragments\DataTypeFragment; -use SqlParser\Fragments\FieldDefFragment; -use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\OptionsFragment; -use SqlParser\Fragments\ParamDefFragment; +use SqlParser\Components\ArrayObj; +use SqlParser\Components\DataType; +use SqlParser\Components\FieldDefinition; +use SqlParser\Components\Expression; +use SqlParser\Components\OptionsArray; +use SqlParser\Components\ParameterDefinition; /** * `CREATE` statement. @@ -146,7 +146,7 @@ class CreateStatement extends Statement * * Used by all `CREATE` statements. * - * @var FieldFragment + * @var Expression */ public $name; @@ -155,7 +155,7 @@ class CreateStatement extends Statement * * Used by `CREATE TABLE`, `CREATE FUNCTION` and `CREATE PROCEDURE`. * - * @var OptionsFragment + * @var OptionsArray * * @see static::$TABLE_OPTIONS * @see static::$FUNC_OPTIONS @@ -169,7 +169,7 @@ class CreateStatement extends Statement * * Used by `CREATE TABLE` and `CREATE VIEW`. * - * @var FieldDefFragment[]|ArrayFragment + * @var FieldDefinition[]|ArrayObj */ public $fields; @@ -178,7 +178,7 @@ class CreateStatement extends Statement * * Used by `CREATE TRIGGER`. * - * @var FieldFragment + * @var Expression */ public $table; @@ -187,7 +187,7 @@ class CreateStatement extends Statement * * Used by `CREATE FUNCTION`. * - * @var DataTypeFragment + * @var DataType */ public $return; @@ -196,7 +196,7 @@ class CreateStatement extends Statement * * Used by `CREATE FUNCTION` and `CREATE PROCEDURE`. * - * @var ParamDefFragment[] + * @var ParameterDefinition[] */ public $parameters; @@ -217,43 +217,43 @@ class CreateStatement extends Statement { if ($this->options->has('DATABASE')) { return 'CREATE ' - . OptionsFragment::build($this->options) . ' ' - . FieldFragment::build($this->name) . ' ' - . OptionsFragment::build($this->entityOptions); + . OptionsArray::build($this->options) . ' ' + . Expression::build($this->name) . ' ' + . OptionsArray::build($this->entityOptions); } elseif ($this->options->has('TABLE')) { return 'CREATE ' - . OptionsFragment::build($this->options) . ' ' - . FieldFragment::build($this->name) . ' ' - . FieldDefFragment::build($this->fields) . ' ' - . OptionsFragment::build($this->entityOptions); + . OptionsArray::build($this->options) . ' ' + . Expression::build($this->name) . ' ' + . FieldDefinition::build($this->fields) . ' ' + . OptionsArray::build($this->entityOptions); } elseif ($this->options->has('VIEW')) { $tmp = ''; if (!empty($this->fields)) { - $tmp = ArrayFragment::build($this->fields); + $tmp = ArrayObj::build($this->fields); } return 'CREATE ' - . OptionsFragment::build($this->options) . ' ' - . FieldFragment::build($this->name) . ' ' + . OptionsArray::build($this->options) . ' ' + . Expression::build($this->name) . ' ' . $tmp . ' AS ' . TokensList::build($this->body) . ' ' - . OptionsFragment::build($this->entityOptions); + . OptionsArray::build($this->entityOptions); } elseif ($this->options->has('TRIGGER')) { return 'CREATE ' - . OptionsFragment::build($this->options) . ' ' - . FieldFragment::build($this->name) . ' ' - . OptionsFragment::build($this->entityOptions) . ' ' - . 'ON ' . FieldFragment::build($this->table) . ' ' + . OptionsArray::build($this->options) . ' ' + . Expression::build($this->name) . ' ' + . OptionsArray::build($this->entityOptions) . ' ' + . 'ON ' . Expression::build($this->table) . ' ' . 'FOR EACH ROW ' . TokensList::build($this->body); } elseif (($this->options->has('PROCEDURE')) || ($this->options->has('FUNCTION')) ) { $tmp = ''; if ($this->options->has('FUNCTION')) { - $tmp = 'RETURNS ' . DataTypeFragment::build($this->return); + $tmp = 'RETURNS ' . DataType::build($this->return); } return 'CREATE ' - . OptionsFragment::build($this->options) . ' ' - . FieldFragment::build($this->name) . ' ' - . ParamDefFragment::build($this->parameters) . ' ' + . OptionsArray::build($this->options) . ' ' + . Expression::build($this->name) . ' ' + . ParameterDefinition::build($this->parameters) . ' ' . $tmp . ' ' . TokensList::build($this->body); } return ''; @@ -270,11 +270,11 @@ class CreateStatement extends Statement ++$list->idx; // Skipping `CREATE`. // Parsing options. - $this->options = OptionsFragment::parse($parser, $list, static::$OPTIONS); + $this->options = OptionsArray::parse($parser, $list, static::$OPTIONS); ++$list->idx; // Skipping last option. // Parsing the field name. - $this->name = FieldFragment::parse( + $this->name = Expression::parse( $parser, $list, array( @@ -286,16 +286,16 @@ class CreateStatement extends Statement ++$list->idx; // Skipping field. if ($this->options->has('DATABASE')) { - $this->entityOptions = OptionsFragment::parse( + $this->entityOptions = OptionsArray::parse( $parser, $list, static::$DB_OPTIONS ); } elseif ($this->options->has('TABLE')) { - $this->fields = FieldDefFragment::parse($parser, $list); + $this->fields = FieldDefinition::parse($parser, $list); ++$list->idx; - $this->entityOptions = OptionsFragment::parse( + $this->entityOptions = OptionsArray::parse( $parser, $list, static::$TABLE_OPTIONS @@ -303,7 +303,7 @@ class CreateStatement extends Statement } elseif (($this->options->has('PROCEDURE')) || ($this->options->has('FUNCTION')) ) { - $this->parameters = ParamDefFragment::parse($parser, $list); + $this->parameters = ParameterDefinition::parse($parser, $list); if ($this->options->has('FUNCTION')) { $token = $list->getNextOfType(Token::TYPE_KEYWORD); if ($token->value !== 'RETURNS') { @@ -313,7 +313,7 @@ class CreateStatement extends Statement ); } else { ++$list->idx; - $this->return = DataTypeFragment::parse( + $this->return = DataType::parse( $parser, $list ); @@ -321,7 +321,7 @@ class CreateStatement extends Statement } ++$list->idx; - $this->entityOptions = OptionsFragment::parse( + $this->entityOptions = OptionsArray::parse( $parser, $list, static::$FUNC_OPTIONS @@ -338,7 +338,7 @@ class CreateStatement extends Statement // Parsing columns list. if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) { --$list->idx; // getNext() also goes forward one field. - $this->fields = ArrayFragment::parse($parser, $list); + $this->fields = ArrayObj::parse($parser, $list); ++$list->idx; // Skipping last token from the array. $list->getNext(); } @@ -353,7 +353,7 @@ class CreateStatement extends Statement } } else if ($this->options->has('TRIGGER')) { // Parsing the time and the event. - $this->entityOptions = OptionsFragment::parse( + $this->entityOptions = OptionsArray::parse( $parser, $list, static::$TRIGGER_OPTIONS @@ -364,7 +364,7 @@ class CreateStatement extends Statement ++$list->idx; // Skipping `ON`. // Parsing the name of the table. - $this->table = FieldFragment::parse( + $this->table = Expression::parse( $parser, $list, array( diff --git a/libraries/sql-parser/src/Statements/DeleteStatement.php b/libraries/sql-parser/src/Statements/DeleteStatement.php index 4d9dbceb08..0e13881926 100644 --- a/libraries/sql-parser/src/Statements/DeleteStatement.php +++ b/libraries/sql-parser/src/Statements/DeleteStatement.php @@ -9,11 +9,11 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\ArrayFragment; -use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\LimitKeyword; -use SqlParser\Fragments\OrderKeyword; -use SqlParser\Fragments\WhereKeyword; +use SqlParser\Components\ArrayObj; +use SqlParser\Components\Expression; +use SqlParser\Components\Limit; +use SqlParser\Components\OrderKeyword; +use SqlParser\Components\Condition; /** * `DELETE` statement. @@ -65,21 +65,21 @@ class DeleteStatement extends Statement /** * Tables used as sources for this statement. * - * @var FieldFragment[] + * @var Expression[] */ public $from; /** * Partitions used as source for this statement. * - * @var ArrayFragment + * @var ArrayObj */ public $partition; /** * Conditions used for filtering each row of the result set. * - * @var WhereKeyword[] + * @var Condition[] */ public $where; @@ -93,7 +93,7 @@ class DeleteStatement extends Statement /** * Conditions used for limiting the size of the result set. * - * @var LimitKeyword + * @var Limit */ public $limit; } diff --git a/libraries/sql-parser/src/Statements/DropStatement.php b/libraries/sql-parser/src/Statements/DropStatement.php index 2c4faaf686..70583ed83b 100644 --- a/libraries/sql-parser/src/Statements/DropStatement.php +++ b/libraries/sql-parser/src/Statements/DropStatement.php @@ -9,7 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\FieldFragment; +use SqlParser\Components\Expression; /** * `DROP` statement. @@ -64,7 +64,7 @@ class DropStatement extends Statement /** * Dropped elements. * - * @var FieldFragment[] + * @var Expression[] */ public $fields; } diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php index fbb96cb024..303de259b6 100644 --- a/libraries/sql-parser/src/Statements/InsertStatement.php +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -9,8 +9,8 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\IntoKeyword; -use SqlParser\Fragments\ValuesKeyword; +use SqlParser\Components\IntoKeyword; +use SqlParser\Components\Array2d; /** * `INSERT` statement. @@ -76,7 +76,7 @@ class InsertStatement extends Statement /** * Values to be inserted. * - * @var ValuesKeyword + * @var Array2d */ public $values; } diff --git a/libraries/sql-parser/src/Statements/MaintenanceStatement.php b/libraries/sql-parser/src/Statements/MaintenanceStatement.php index 3d21538e83..952314e8f2 100644 --- a/libraries/sql-parser/src/Statements/MaintenanceStatement.php +++ b/libraries/sql-parser/src/Statements/MaintenanceStatement.php @@ -12,8 +12,8 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; -use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\OptionsFragment; +use SqlParser\Components\Expression; +use SqlParser\Components\OptionsArray; /** * Maintenance statement. @@ -33,14 +33,14 @@ class MaintenanceStatement extends Statement /** * Tables maintained. * - * @var FieldFragment[] + * @var Expression[] */ public $tables; /** * Function called after the token was processed. * - * Parses the additional options fragment at the end. + * Parses the additional options from the end. * * @param Parser $parser The instance that requests parsing. * @param TokensList $list The list of tokens to be parsed. @@ -58,7 +58,7 @@ class MaintenanceStatement extends Statement // Finally, we parse here [some more options] and that's all. ++$list->idx; $this->options->merge( - OptionsFragment::parse( + OptionsArray::parse( $parser, $list, static::$OPTIONS diff --git a/libraries/sql-parser/src/Statements/OptimizeStatement.php b/libraries/sql-parser/src/Statements/OptimizeStatement.php index 242979cc6d..07150150da 100644 --- a/libraries/sql-parser/src/Statements/OptimizeStatement.php +++ b/libraries/sql-parser/src/Statements/OptimizeStatement.php @@ -9,7 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\FieldFragment; +use SqlParser\Components\Expression; /** * `OPTIMIZE` statement. @@ -42,7 +42,7 @@ class OptimizeStatement extends Statement /** * Optimized tables. * - * @var FieldFragment[] + * @var Expression[] */ public $tables; } diff --git a/libraries/sql-parser/src/Statements/RenameStatement.php b/libraries/sql-parser/src/Statements/RenameStatement.php index fc7a1480c4..6b4f1888e0 100644 --- a/libraries/sql-parser/src/Statements/RenameStatement.php +++ b/libraries/sql-parser/src/Statements/RenameStatement.php @@ -12,7 +12,7 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; -use SqlParser\Fragments\RenameKeyword; +use SqlParser\Components\RenameOperation; /** * `RENAME` statement. @@ -32,7 +32,7 @@ class RenameStatement extends Statement /** * The old and new names of the tables. * - * @var RenameKeyword[] + * @var RenameOperation[] */ public $renames; diff --git a/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index f88b2295ca..b6a7bb4edb 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -9,9 +9,9 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\IntoKeyword; -use SqlParser\Fragments\SetKeyword; -use SqlParser\Fragments\ValuesKeyword; +use SqlParser\Components\IntoKeyword; +use SqlParser\Components\SetOperation; +use SqlParser\Components\Array2d; /** * `REPLACE` statement. @@ -55,14 +55,14 @@ class ReplaceStatement extends Statement /** * Values to be replaced. * - * @var ValuesKeyword + * @var Array2d */ public $values; /** * The replaced values. * - * @var SetKeyword[] + * @var SetOperation[] */ public $set; } diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 5066989c75..02624c1a1a 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -9,14 +9,14 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\ArrayFragment; -use SqlParser\Fragments\CallKeyword; -use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\IntoKeyword; -use SqlParser\Fragments\JoinKeyword; -use SqlParser\Fragments\LimitKeyword; -use SqlParser\Fragments\OrderKeyword; -use SqlParser\Fragments\WhereKeyword; +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; /** * `SELECT` statement. @@ -104,28 +104,28 @@ class SelectStatement extends Statement /** * Expressions that are being selected by this statement. * - * @var FieldFragment[] + * @var Expression[] */ public $expr = array(); /** * Tables used as sources for this statement. * - * @var FieldFragment[] + * @var Expression[] */ public $from = array(); /** * Partitions used as source for this statement. * - * @var ArrayFragment + * @var ArrayObj */ public $partition; /** * Conditions used for filtering each row of the result set. * - * @var WhereKeyword[] + * @var Condition[] */ public $where; @@ -139,7 +139,7 @@ class SelectStatement extends Statement /** * Conditions used for filtering the result set. * - * @var WhereKeyword[] + * @var Condition[] */ public $having; @@ -153,14 +153,14 @@ class SelectStatement extends Statement /** * Conditions used for limiting the size of the result set. * - * @var LimitKeyword + * @var Limit */ public $limit; /** * Procedure that should process the data in the result set. * - * @var CallKeyword + * @var FunctionCall */ public $procedure; diff --git a/libraries/sql-parser/src/Statements/TruncateStatement.php b/libraries/sql-parser/src/Statements/TruncateStatement.php index 5a08a79bf2..c0cb5fd2c1 100644 --- a/libraries/sql-parser/src/Statements/TruncateStatement.php +++ b/libraries/sql-parser/src/Statements/TruncateStatement.php @@ -9,7 +9,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\FieldFragment; +use SqlParser\Components\Expression; /** * `TRUNCATE` statement. @@ -35,7 +35,7 @@ class TruncateStatement extends Statement /** * The name of the truncated table. * - * @var FieldFragment + * @var Expression */ public $table; } diff --git a/libraries/sql-parser/src/Statements/UpdateStatement.php b/libraries/sql-parser/src/Statements/UpdateStatement.php index 7418d64e51..59b2ff72a3 100644 --- a/libraries/sql-parser/src/Statements/UpdateStatement.php +++ b/libraries/sql-parser/src/Statements/UpdateStatement.php @@ -9,11 +9,11 @@ namespace SqlParser\Statements; use SqlParser\Statement; -use SqlParser\Fragments\FieldFragment; -use SqlParser\Fragments\LimitKeyword; -use SqlParser\Fragments\OrderKeyword; -use SqlParser\Fragments\SetKeyword; -use SqlParser\Fragments\WhereKeyword; +use SqlParser\Components\Expression; +use SqlParser\Components\Limit; +use SqlParser\Components\OrderKeyword; +use SqlParser\Components\SetOperation; +use SqlParser\Components\Condition; /** * `UPDATE` statement. @@ -71,21 +71,21 @@ class UpdateStatement extends Statement /** * Tables used as sources for this statement. * - * @var FieldFragment[] + * @var Expression[] */ public $tables; /** * The updated values. * - * @var SetKeyword[] + * @var SetOperation[] */ public $set; /** * Conditions used for filtering each row of the result set. * - * @var WhereKeyword[] + * @var Condition[] */ public $where; @@ -99,7 +99,7 @@ class UpdateStatement extends Statement /** * Conditions used for limiting the size of the result set. * - * @var LimitKeyword + * @var Limit */ public $limit; } diff --git a/libraries/sql-parser/src/Utils/Query.php b/libraries/sql-parser/src/Utils/Query.php index ba0d384680..bec402ade8 100644 --- a/libraries/sql-parser/src/Utils/Query.php +++ b/libraries/sql-parser/src/Utils/Query.php @@ -13,7 +13,7 @@ use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; use SqlParser\TokensList; -use SqlParser\Fragments\FieldFragment; +use SqlParser\Components\Expression; use SqlParser\Statements\AlterStatement; use SqlParser\Statements\AnalyzeStatement; use SqlParser\Statements\CallStatement; @@ -482,7 +482,7 @@ class Query if (!empty($field->table)) { $field->expr = null; // Force rebuild. $field->alias = null; // Aliases are not required. - $ret[] = FieldFragment::build($field); + $ret[] = Expression::build($field); } } return $ret; diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index f75d0d931a..3d87002424 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -10,8 +10,8 @@ namespace SqlParser\Utils; use SqlParser\Lexer; use SqlParser\Parser; -use SqlParser\Fragments\DataTypeFragment; -use SqlParser\Fragments\ParamDefFragment; +use SqlParser\Components\DataType; +use SqlParser\Components\ParameterDefinition; use SqlParser\Statements\CreateStatement; /** @@ -38,7 +38,7 @@ class Routine $lexer = new Lexer($param); // A dummy parser is used for error reporting. - $type = DataTypeFragment::parse(new Parser(), $lexer->list); + $type = DataType::parse(new Parser(), $lexer->list); if ($type === null) { return array('', '', '', '', ''); @@ -70,7 +70,7 @@ class Routine $lexer = new Lexer('(' . $param . ')'); // A dummy parser is used for error reporting. - $param = ParamDefFragment::parse(new Parser(), $lexer->list); + $param = ParameterDefinition::parse(new Parser(), $lexer->list); if (empty($param[0])) { return array('', '', '', '', ''); diff --git a/tbl_export.php b/tbl_export.php index c88864e6b4..cdae45211c 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -138,8 +138,8 @@ if (! empty($sql_query)) { // Rebuilding the SELECT and FROM clauses. $replaces = array( - array('SELECT', 'SELECT ' . SqlParser\Fragments\FieldListFragment::build($parser->statements[0]->expr)), - array('FROM', 'FROM ' . SqlParser\Fragments\FieldListFragment::build($parser->statements[0]->from)), + array('SELECT', 'SELECT ' . SqlParser\Components\ExpressionArray::build($parser->statements[0]->expr)), + array('FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build($parser->statements[0]->from)), ); // Checking if the WHERE clause has to be replaced. From 7c60eba902e5f73c182f84d4ae8ae944fdf36094 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 10 Jul 2015 03:45:43 +0300 Subject: [PATCH 49/57] Fix HHVM tests. Signed-off-by: Dan Ungureanu --- .../properties/options/PMA_OptionsPropertyItem_test.php | 6 ++++++ .../properties/plugins/PMA_PluginPropertyItem_test.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php b/test/classes/properties/options/PMA_OptionsPropertyItem_test.php index fd77bb185e..eb8e2fad88 100644 --- a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php +++ b/test/classes/properties/options/PMA_OptionsPropertyItem_test.php @@ -95,6 +95,12 @@ class PMA_OptionsPropertyItem_Test extends PHPUnit_Framework_TestCase */ public function testGetPropertyType() { + if ((defined('HHVM_VERSION') + && (version_compare(constant('HHVM_VERSION'), '3.8', 'lt'))) + ) { + $this->markTestSkipped('Due to a bug in early versions of HHVM, this test cannot be completed.'); + } + $this->assertEquals( 'options', $this->stub->getPropertyType() diff --git a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php b/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php index 13195f2866..3567e9403f 100644 --- a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php +++ b/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php @@ -44,6 +44,12 @@ class PMA_PluginPropertyItem_Test extends PHPUnit_Framework_TestCase */ public function testGetPropertyType() { + if ((defined('HHVM_VERSION') + && (version_compare(constant('HHVM_VERSION'), '3.8', 'lt'))) + ) { + $this->markTestSkipped('Due to a bug in early versions of HHVM, this test cannot be completed.'); + } + $this->assertEquals( "plugin", $this->stub->getPropertyType() From 8a5e8a275aebf961310a4cb1198be77910948cf6 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 10 Jul 2015 21:43:00 +0300 Subject: [PATCH 50/57] Using the new parser when generating a table's definition. Fixed a small bug regarding an undefined variable. Updated sql-parser library to udan11/sql-parser@30fdd07. Signed-off-by: Dan Ungureanu --- export.php | 1 + libraries/plugins/export/ExportSql.class.php | 442 +++++++----------- .../src/Components/AlterOperation.php | 6 +- .../sql-parser/src/Components/Condition.php | 23 +- .../sql-parser/src/Components/DataType.php | 4 +- .../src/Components/FieldDefinition.php | 42 +- .../src/Components/FunctionCall.php | 2 +- .../sql-parser/src/Components/JoinKeyword.php | 87 +++- libraries/sql-parser/src/Components/Key.php | 6 +- .../src/Components/OptionsArray.php | 24 +- .../src/Components/ParameterDefinition.php | 10 +- .../sql-parser/src/Components/Reference.php | 4 +- libraries/sql-parser/src/Context.php | 14 +- .../src/Contexts/ContextMySql50000.php | 5 +- .../src/Contexts/ContextMySql50100.php | 5 +- .../src/Contexts/ContextMySql50500.php | 5 +- .../src/Contexts/ContextMySql50600.php | 5 +- .../src/Contexts/ContextMySql50700.php | 5 +- libraries/sql-parser/src/Parser.php | 16 + .../src/Statements/SelectStatement.php | 4 +- libraries/sql-parser/src/Utils/Misc.php | 33 +- 21 files changed, 374 insertions(+), 369 deletions(-) diff --git a/export.php b/export.php index 865194ba25..5b00da7561 100644 --- a/export.php +++ b/export.php @@ -285,6 +285,7 @@ if (!defined('TESTSUITE')) { // export page, Export page aliases are given more // preference over SQL Query aliases. $parser = new SqlParser\Parser($sql_query); + $aliases = array(); if (!empty($parser->statements[0])) { if (!empty($_REQUEST['aliases'])) { $aliases = PMA_mergeAliases( diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 08233d288d..0ce177ee89 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1396,6 +1396,7 @@ class ExportSql extends ExportPlugin if ($result != false && ($row = $GLOBALS['dbi']->fetchRow($result))) { $create_query = $row[1]; unset($row); + // Convert end of line chars to one that we want (note that MySQL // doesn't return query it will accept in all cases) if (/*overload*/mb_strpos($create_query, "(\r\n ")) { @@ -1420,11 +1421,13 @@ class ExportSql extends ExportPlugin $create_query ); } - // substitute aliases in create query + + // Substitute aliases in `CREATE` query. $create_query = $this->replaceWithAliases( $create_query, $aliases, $db, $table, $flag ); - // One warning per view + + // One warning per view. if ($flag && $view) { $warning = $this->_exportComment() . $this->_exportComment( @@ -1435,7 +1438,8 @@ class ExportSql extends ExportPlugin ) . $this->_exportComment(); } - // Should we use IF NOT EXISTS? + + // Adding IF NOT EXISTS, if required. if (isset($GLOBALS['sql_if_not_exists'])) { $create_query = preg_replace( '/^CREATE TABLE/', @@ -1444,14 +1448,15 @@ class ExportSql extends ExportPlugin ); } + // Making the query MSSQL compatible. if ($compat == 'MSSQL') { $create_query = $this->_makeCreateTableMSSQLCompatible( $create_query ); } - // Drizzle (checked on 2011.03.13) returns ROW_FORMAT surrounded - // with quotes, which is not accepted by parser + // Drizzle (checked on 2011.03.13) returns `ROW_FORMAT`'s value + // surrounded with quotes, which is not accepted by parser if (PMA_DRIZZLE) { $create_query = preg_replace( '/ROW_FORMAT=\'(\S+)\'/', @@ -1460,292 +1465,175 @@ class ExportSql extends ExportPlugin ); } - //are there any constraints to cut out? - if (preg_match('@CONSTRAINT|KEY@', $create_query)) { - $has_constraints = 0; - $has_indexes = 0; + // Using appropriate quotes. + if (($compat === 'MSSQL') || ($sql_backquotes === '"')) { + SqlParser\Context::$MODE |= SqlParser\Context::ANSI_QUOTES; + } - //if there are constraints - if (preg_match( - '@CONSTRAINT@', - $create_query - )) { - $has_constraints = 1; - // comments -> constraints for dumped tables - $sql_constraints = $this->generateComment( - $crlf, $sql_constraints, __('Constraints for dumped tables'), - __('Constraints for table'), $table_alias, $compat - ); + /** + * Parser used for analysis. + * @var SqlParser + */ + $parser = new SqlParser\Parser($create_query); - $sql_constraints_query .= 'ALTER TABLE ' - . PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ) - . $crlf; - $sql_constraints .= 'ALTER TABLE ' - . PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ) - . $crlf; - $sql_drop_foreign_keys .= 'ALTER TABLE ' - . PMA_Util::backquoteCompat( - $db_alias, $compat, $sql_backquotes - ) - . '.' - . PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ) - . $crlf; - } - //if there are indexes - // (look for KEY followed by whitespace to avoid matching - // keywords like PACK_KEYS) - if ($update_indexes_increments && preg_match( - '@KEY[\s]+@', - $create_query - )) { - $has_indexes = 1; + /** + * `CREATE TABLE` statement. + * @var SqlParser\Statements\SelectStatement + */ + $statement = $parser->statements[0]; - // comments -> indexes for dumped tables - $sql_indexes = $this->generateComment( - $crlf, $sql_indexes, __('Indexes for dumped tables'), - __('Indexes for table'), $table_alias, $compat - ); - $sql_indexes_query_start = 'ALTER TABLE ' - . PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ); - $sql_indexes_query .= $sql_indexes_query_start; + /** + * Fragments containining definition of each constraint. + * @var array + */ + $constraints = array(); - $sql_indexes_start = 'ALTER TABLE ' - . PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ); - $sql_indexes .= $sql_indexes_start; - } - if ($update_indexes_increments && preg_match( - '@AUTO_INCREMENT@', - $create_query - )) { - // comments -> auto increments for dumped tables - $sql_auto_increments = $this->generateComment( - $crlf, $sql_auto_increments, - __('AUTO_INCREMENT for dumped tables'), - __('AUTO_INCREMENT for table'), $table_alias, $compat - ); - $sql_auto_increments .= 'ALTER TABLE ' - . PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ) - . $crlf; + /** + * Fragments containining definition of each index. + * @var array + */ + $indexes = array(); + + /** + * Fragments containining definition of each FULLTEXT index. + * @var array + */ + $indexes_fulltext = array(); + + /** + * Fragments containining definition of each foreign key that will + * be dropped. + * @var array + */ + $dropped = array(); + + /** + * Fragment containining definition of the `AUTO_INCREMENT`. + * @var array + */ + $auto_increment = array(); + + // Scanning each field of the `CREATE` statement to fill the arrays + // above. + // If the field is used in any of the arrays above, it is removed + // from the original definition. + // Also, AUTO_INCREMENT attribute is removed. + foreach ($statement->fields as $key => $field) { + + if ($field->isConstraint) { + // Creating the parts that add constraints. + $constraints[] = $field::build($field); + unset($statement->fields[$key]); + } elseif (!empty($field->key)) { + // Creating the parts that add indexes (must not be + // constraints). + if ($field->key->type === 'FULLTEXT KEY') { + $indexes_fulltext[] = $field->build($field); + } else { + $indexes[] = $field->build($field); + } + unset($statement->fields[$key]); } - // Split the query into lines, so we can easily handle it. - // We know lines are separated by $crlf (done few lines above). - $sql_lines = explode($crlf, $create_query); - $sql_count = count($sql_lines); - - // lets find first line with constraints - $first_occur = -1; - for ($i = 0; $i < $sql_count; $i++) { - $sql_line = current(explode(' COMMENT ', $sql_lines[$i], 2)); - if (preg_match( - '@[\s]+(CONSTRAINT|KEY)@', - $sql_line - ) && $first_occur == -1) { - $first_occur = $i; + // Creating the parts that drop froeign keys. + if (!empty($field->key)) { + if ($field->key->type === 'FOREIGN KEY') { + $dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name); } + unset($statement->fields[$key]); } - for ($k = 0; $k < $sql_count; $k++) { - if ($update_indexes_increments && preg_match( - '( AUTO_INCREMENT | AUTO_INCREMENT,| AUTO_INCREMENT$)', - $sql_lines[$k] - )) { - //creates auto increment code - $sql_auto_increments .= " MODIFY " . ltrim($sql_lines[$k]); - //removes auto increment code from table definition - $sql_lines[$k] = str_replace( - " AUTO_INCREMENT", "", $sql_lines[$k] - ); + // Dropping AUTO_INCREMENT. + if (!empty($field->options)) { + if ($field->options->has('AUTO_INCREMENT')) { + $auto_increment[] = $field::build($field); + $field->options->remove('AUTO_INCREMENT'); } - if (isset($GLOBALS['sql_auto_increment']) - && $update_indexes_increments && preg_match( - '@[\s]+(AUTO_INCREMENT=)@', - $sql_lines[$k] - )) { - //adds auto increment value - $increment_value = /*overload*/mb_substr( - $sql_lines[$k], - /*overload*/mb_strpos($sql_lines[$k], "AUTO_INCREMENT") - ); - $increment_value_array = explode(' ', $increment_value); - $sql_auto_increments .= $increment_value_array[0] . ";"; - - } - } - - if ($sql_auto_increments != '') { - $sql_auto_increments = /*overload*/mb_substr( - $sql_auto_increments, 0, -1 - ) . ';'; - } - // If we really found a constraint - if ($first_occur != $sql_count) { - // lets find first line - $sql_lines[$first_occur - 1] = preg_replace( - '@,$@', - '', - $sql_lines[$first_occur - 1] - ); - - $first = true; - $sql_index_ended = false; - for ($j = $first_occur; $j < $sql_count; $j++) { - //removes extra space at the beginning, if there is - $sql_lines[$j]=ltrim($sql_lines[$j], ' '); - - //if it's a constraint - if (preg_match( - '@CONSTRAINT|FOREIGN[\s]+KEY@', - $sql_lines[$j] - )) { - if (! $first) { - $sql_constraints .= $crlf; - } - $posConstraint = /*overload*/mb_strpos( - $sql_lines[$j], - 'CONSTRAINT' - ); - $tmp_str = $sql_lines[$j]; - if (! $sql_backquotes) { - $tmp_str = preg_replace_callback( - '/REFERENCES[\s]([\S]*)[\s]\(([\S]*)\)/', - function ($matches) { - global $compat, $sql_backquotes; - - $refTable = PMA_Util::backquoteCompat( - $matches[1], $compat, $sql_backquotes - ); - $refColumn = PMA_Util::backquoteCompat( - $matches[2], $compat, $sql_backquotes - ); - return 'REFERENCES ' . $refTable . ' (' . $refColumn . ')'; - }, - $tmp_str - ); - } - if ($posConstraint === false) { - $tmp_str = preg_replace( - '/(FOREIGN[\s]+KEY)/', - ' ADD \1', - $tmp_str - ); - - $sql_constraints_query .= $tmp_str; - $sql_constraints .= $tmp_str; - - } else { - $tmp_str = preg_replace( - '/(CONSTRAINT)/', - ' ADD \1', - $tmp_str - ); - - $sql_constraints_query .= $tmp_str; - $sql_constraints .= $tmp_str; - preg_match( - '/(CONSTRAINT)([\s])([\S]*)([\s])/', - $sql_lines[$j], - $matches - ); - if (! $first) { - $sql_drop_foreign_keys .= ', '; - } - $sql_drop_foreign_keys .= 'DROP FOREIGN KEY ' - . $matches[3]; - } - $first = false; - } else if ($update_indexes_increments && preg_match( - '@KEY[\s]+@', - $sql_lines[$j] - )) { - //if it's a index - - // if index query was terminated earlier - if ($sql_index_ended) { - // start a new query with ALTER TABLE - $sql_indexes .= $sql_indexes_start; - $sql_indexes_query .= $sql_indexes_query_start; - - $sql_index_ended = false; - } - - $tmp_str = $crlf . " ADD " . $sql_lines[$j]; - $sql_indexes_query .= $tmp_str; - $sql_indexes .= $tmp_str; - - // InnoDB supports one FULLTEXT index creation at a time - // So end the query and start over - if ($update_indexes_increments && preg_match( - '@FULLTEXT KEY[\s]+@', - $sql_lines[$j] - )) { - //removes superfluous comma at the end - $sql_indexes = rtrim($sql_indexes, ','); - $sql_indexes_query = rtrim($sql_indexes_query, ','); - - // add ending semicolon - $sql_indexes .= ';' . $crlf; - $sql_indexes_query .= ';' . $crlf; - - $sql_index_ended = true; - } - } else { - break; - } - } - //removes superfluous comma at the end - $sql_indexes = rtrim($sql_indexes, ','); - $sql_indexes_query = rtrim($sql_indexes_query, ','); - //removes superfluous semicolon at the end - if ($has_constraints == 1) { - $sql_constraints .= ';' . $crlf; - $sql_constraints_query .= ';'; - } - if ($has_indexes == 1 && ! $sql_index_ended) { - $sql_indexes .= ';' . $crlf; - $sql_indexes_query .= ';'; - } - //remove indexes and constraints from the $create_query - $create_query = implode( - $crlf, - array_slice($sql_lines, 0, $first_occur) - ) - . $crlf - . implode( - $crlf, - array_slice($sql_lines, $j, $sql_count - 1) - ); - unset($sql_lines); } } - $schema_create .= $create_query; - } - // remove a possible "AUTO_INCREMENT = value" clause - // that could be there starting with MySQL 5.0.24 - // in Drizzle it's useless as it contains the value given at table - // creation time - if (preg_match('/AUTO_INCREMENT\s*=\s*([0-9])+/', $schema_create)) { - if ($compat == 'MSSQL' || $auto_increment == '') { - $auto_increment = ' '; + /** + * The header of the `ALTER` statement (`ALTER TABLE tbl`). + * @var string + */ + $alter_header = 'ALTER TABLE ' . + PMA_Util::backquoteCompat( + $table_alias, $compat, $sql_backquotes + ); + + /** + * The footer of the `ALTER` statement (usually ';') + * @var string + */ + $alter_footer = ';' . $crlf; + + // Generating constraints-related query. + if (!empty($constraints)) { + $sql_constraints_query = $alter_header . + $crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $constraints) . + $alter_footer; + + $sql_constraints = $this->generateComment( + $crlf, $sql_constraints, __('Constraints for dumped tables'), + __('Constraints for table'), $table_alias, $compat + ) . $sql_constraints_query; } - $schema_create = preg_replace( - '/\sAUTO_INCREMENT\s*=\s*([0-9])+\s/', - $auto_increment, - $schema_create - ); + + // Generating indexes-related query. + $sql_indexes_query = ''; + + if (!empty($indexes)) { + $sql_indexes_query .= $alter_header . + $crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $indexes) . + $alter_footer; + } + + if (!empty($fulltext_indexes)) { + // InnoDB supports one FULLTEXT index creation at a time. + // So FULLTEXT indexes are created one-by-one after other + // indexes where created. + $sql_indexes_query .= $alter_header . + ' ADD ' . implode( + $alter_footer . $alter_header . ' ADD ', $indexes_fulltext + ) . $alter_footer; + } + + if ((!empty($indexes)) || (!empty($fulltext_indexes))) { + $sql_indexes = $this->generateComment( + $crlf, $sql_indexes, __('Indexes for dumped tables'), + __('Indexes for table'), $table_alias, $compat + ) . $sql_indexes_query; + } + + // Generating drop foreign keys-related query. + if (!empty($dropped)) { + $sql_drop_foreign_keys = $alter_header . + $crlf . ' DROP ' . implode(',' . $crlf . ' DROP ', $dropped) . + $alter_footer; + } + + // Generating auto-increment-related query. + if ((!empty($auto_increment)) && ($update_indexes_increments)) { + $sql_auto_increments_query = $alter_header . + $crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment) . + ', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT') + . $alter_footer; + + $sql_auto_increments = $this->generateComment( + $crlf, $sql_auto_increments, + __('AUTO_INCREMENT for dumped tables'), + __('AUTO_INCREMENT for table'), $table_alias, $compat + ) . $sql_auto_increments_query; + } + + // Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE` + // too. + if (!empty($statement->entityOptions)) { + $statement->entityOptions->remove('AUTO_INCREMENT'); + } + + // Rebuilding the query. + $schema_create .= $statement->build(); } $GLOBALS['dbi']->freeResult($result); diff --git a/libraries/sql-parser/src/Components/AlterOperation.php b/libraries/sql-parser/src/Components/AlterOperation.php index aa81689be2..7c528283be 100644 --- a/libraries/sql-parser/src/Components/AlterOperation.php +++ b/libraries/sql-parser/src/Components/AlterOperation.php @@ -91,7 +91,7 @@ class AlterOperation extends Component /** * Unparsed tokens. * - * @var Token[] + * @var Token[]|string */ public $unknown = array(); @@ -194,9 +194,7 @@ class AlterOperation extends Component if (!empty($component->field)) { $ret .= Expression::build($component->field) . ' '; } - foreach ($component->unknown as $token) { - $ret .= $token->token; - } + $ret .= TokensList::build($component->unknown); return $ret; } } diff --git a/libraries/sql-parser/src/Components/Condition.php b/libraries/sql-parser/src/Components/Condition.php index b170356728..46cab2ad1a 100644 --- a/libraries/sql-parser/src/Components/Condition.php +++ b/libraries/sql-parser/src/Components/Condition.php @@ -37,8 +37,16 @@ class Condition extends Component * * @var array */ - public static $OPERATORS = array('AND' => 1, 'BETWEEN' => 1, 'LIKE' => 1, - 'OR' => 1, 'XOR' => 1 + public static $OPERATORS = array( + 'AND' => 1, + 'BETWEEN' => 1, + 'IN' => 1, + 'IS' => 1, + 'LIKE' => 1, + 'NOT NULL' => 1, + 'NULL' => 1, + 'OR' => 1, + 'XOR' => 1, ); /** @@ -118,6 +126,13 @@ class Condition extends Component continue; } + // Replacing all whitespaces (new lines, tabs, etc.) with a single + // space character. + if ($token->type === Token::TYPE_WHITESPACE) { + $expr->expr .= ' '; + continue; + } + // Conditions are delimited by logical operators. if (in_array($token->value, static::$DELIMITERS, true)) { if (($betweenBefore) && ($token->value === 'AND')) { @@ -185,8 +200,8 @@ class Condition extends Component public static function build($component) { $ret = array(); - foreach ($component as $f) { - $ret[] = $f->expr; + foreach ($component as $c) { + $ret[] = $c->expr; } return implode(' ', $ret); } diff --git a/libraries/sql-parser/src/Components/DataType.php b/libraries/sql-parser/src/Components/DataType.php index 60f5bba9a5..e541aaaabc 100644 --- a/libraries/sql-parser/src/Components/DataType.php +++ b/libraries/sql-parser/src/Components/DataType.php @@ -71,8 +71,8 @@ class DataType extends Component /** * Constructor. * - * @param string $name The name of this data type. - * @param array $parameters The parameters (size or possible values). + * @param string $name The name of this data type. + * @param array $parameters The parameters (size or possible values). * @param OptionsArray $options The options of this data type. */ public function __construct($name = null, array $parameters = array(), diff --git a/libraries/sql-parser/src/Components/FieldDefinition.php b/libraries/sql-parser/src/Components/FieldDefinition.php index 97cda27b66..0c3ea4f88e 100644 --- a/libraries/sql-parser/src/Components/FieldDefinition.php +++ b/libraries/sql-parser/src/Components/FieldDefinition.php @@ -94,11 +94,11 @@ class FieldDefinition extends Component /** * Constructor. * - * @param string $name The name of the field. - * @param OptionsArray $options The options of this field. + * @param string $name The name of the field. + * @param OptionsArray $options The options of this field. * @param DataType|Key $type The data type of this field or the key. - * @param bool $isConstraint Whether this field is a constraint or not. - * @param Reference $references References. + * @param bool $isConstraint Whether this field is a constraint or not. + * @param Reference $references References. */ public function __construct($name = null, $options = null, $type = null, $isConstraint = false, $references = null @@ -230,36 +230,38 @@ class FieldDefinition extends Component */ public static function build($component) { - $ret = array(); - - foreach ($component as $f) { + if (is_array($component)) { + $ret = array(); + foreach ($component as $c) { + $ret[] = static::build($c); + } + return "(\n" . implode(",\n", $ret) . "\n)"; + } else { $tmp = ''; - if ($f->isConstraint) { + if ($component->isConstraint) { $tmp .= 'CONSTRAINT '; } - if (!empty($f->name)) { - $tmp .= Context::escape($f->name) . ' '; + if (!empty($component->name)) { + $tmp .= Context::escape($component->name) . ' '; } - if (!empty($f->type)) { - $tmp .= DataType::build($f->type) . ' '; + if (!empty($component->type)) { + $tmp .= DataType::build($component->type) . ' '; } - if (!empty($f->key)) { - $tmp .= Key::build($f->key) . ' '; + if (!empty($component->key)) { + $tmp .= Key::build($component->key) . ' '; } - if (!empty($f->references)) { - $tmp .= 'REFERENCES ' . Reference::build($f->references) . ' '; + if (!empty($component->references)) { + $tmp .= 'REFERENCES ' . Reference::build($component->references) . ' '; } - $tmp .= OptionsArray::build($f->options); + $tmp .= OptionsArray::build($component->options); - $ret[] = trim($tmp); + return trim($tmp); } - - return "(\n" . implode(",\n", $ret) . "\n)"; } } diff --git a/libraries/sql-parser/src/Components/FunctionCall.php b/libraries/sql-parser/src/Components/FunctionCall.php index 572b3f88b3..b86eeb8513 100644 --- a/libraries/sql-parser/src/Components/FunctionCall.php +++ b/libraries/sql-parser/src/Components/FunctionCall.php @@ -42,7 +42,7 @@ class FunctionCall extends Component /** * Constructor. * - * @param string $name The name of the function to be called. + * @param string $name The name of the function to be called. * @param array|ArrayObj $parameters The parameters of this function. */ public function __construct($name = null, $parameters = null) diff --git a/libraries/sql-parser/src/Components/JoinKeyword.php b/libraries/sql-parser/src/Components/JoinKeyword.php index 8b07822c10..a647dcdf9f 100644 --- a/libraries/sql-parser/src/Components/JoinKeyword.php +++ b/libraries/sql-parser/src/Components/JoinKeyword.php @@ -25,6 +25,27 @@ use SqlParser\TokensList; class JoinKeyword extends Component { + /** + * Types of join. + * + * @var array + */ + public static $JOINS = array( + 'FULL JOIN' => 'FULL', + 'INNER JOIN' => 'INNER', + 'JOIN' => 'JOIN', + 'LEFT JOIN' => 'LEFT', + 'RIGHT JOIN' => 'RIGHT', + ); + + /** + * Type of this join. + * + * @see static::$JOINS + * @var string + */ + public $type; + /** * Join expression. * @@ -44,27 +65,38 @@ class JoinKeyword extends Component * @param TokensList $list The list of tokens that are being parsed. * @param array $options Parameters for parsing. * - * @return JoinKeyword + * @return JoinKeyword[] */ public static function parse(Parser $parser, TokensList $list, array $options = array()) { - $ret = new JoinKeyword(); + $ret = array(); + + $expr = new JoinKeyword();; /** * The state of the parser. * * Below are the states of the parser. * - * 0 -----------------------[ expr ]----------------------> 1 + * 0 -----------------------[ JOIN ]----------------------> 1 * - * 1 ------------------------[ ON ]-----------------------> 2 + * 1 -----------------------[ expr ]----------------------> 2 * - * 2 --------------------[ conditions ]-------------------> -1 + * 2 ------------------------[ ON ]-----------------------> 3 + * + * 3 --------------------[ conditions ]-------------------> 0 * * @var int */ $state = 0; + // By design, the parser will parse first token after the keyword. + // In this case, the keyword must be analyzed too, in order to determine + // the type of this join. + if ($list->idx > 0) { + --$list->idx; + } + for (; $list->idx < $list->count; ++$list->idx) { /** * Token parsed at this moment. @@ -83,21 +115,50 @@ class JoinKeyword extends Component } if ($state === 0) { - $ret->expr = Expression::parse($parser, $list, array('skipColumn' => true)); - $state = 1; - } elseif ($state === 1) { - if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON')) { - $state = 2; + if (($token->type === Token::TYPE_KEYWORD) + && (!empty(static::$JOINS[$token->value])) + ) { + $expr->type = static::$JOINS[$token->value]; + $state = 1; + } else { + break; } + } elseif ($state === 1) { + $expr->expr = Expression::parse($parser, $list, array('skipColumn' => true)); + $state = 2; } elseif ($state === 2) { - $ret->on = Condition::parse($parser, $list); - ++$list->idx; - break; + if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON')) { + $state = 3; + } + } else if ($state === 3) { + $expr->on = Condition::parse($parser, $list); + $ret[] = $expr; + $expr = new JoinKeyword(); + $state = 0; } } + if (!empty($expr->type)) { + $ret[] = $expr; + } + --$list->idx; return $ret; } + + /** + * @param JoinKeyword[] $component The component to be built. + * + * @return string + */ + public static function build($component) + { + $ret = array(); + foreach ($component as $c) { + $ret[] = (($c->type === 'JOIN') ? 'JOIN ' : ($c->type . ' JOIN ')) . + Expression::build($c->expr) . ' ON ' . Condition::build($c->on); + } + return implode(' ', $ret); + } } diff --git a/libraries/sql-parser/src/Components/Key.php b/libraries/sql-parser/src/Components/Key.php index a79feefb41..bb8bbf02ed 100644 --- a/libraries/sql-parser/src/Components/Key.php +++ b/libraries/sql-parser/src/Components/Key.php @@ -70,9 +70,9 @@ class Key extends Component /** * Constructor. * - * @param string $name The name of the key. - * @param array $columns The columns covered by this key. - * @param string $type The type of this key. + * @param string $name The name of the key. + * @param array $columns The columns covered by this key. + * @param string $type The type of this key. * @param OptionsArray $options The options of this key. */ public function __construct($name = null, array $columns = array(), diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index 7a3a588fb3..d691e86e8c 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -182,9 +182,29 @@ class OptionsArray extends Component public function has($key) { foreach ($this->options as $option) { - if ((is_array($option)) && ($key === $option['name'])) { + if ($key === $option) { + return true; + } elseif ((is_array($option)) && ($key === $option['name'])) { return $option['value']; - } elseif ($key === $option) { + } + } + return false; + } + + /** + * Removes the option from the array. + * + * @param string $key The key to be removed. + * + * @return bool Whether the key was found and deleted or not. + */ + public function remove($key) + { + foreach ($this->options as $idx => $option) { + if (($key === $option) + || ((is_array($option)) && ($key === $option['name'])) + ) { + unset($this->options[$idx]); return true; } } diff --git a/libraries/sql-parser/src/Components/ParameterDefinition.php b/libraries/sql-parser/src/Components/ParameterDefinition.php index a089c3ebf0..db0f815c1e 100644 --- a/libraries/sql-parser/src/Components/ParameterDefinition.php +++ b/libraries/sql-parser/src/Components/ParameterDefinition.php @@ -145,15 +145,15 @@ class ParameterDefinition extends Component public static function build($component) { $ret = array(); - foreach ($component as $f) { + foreach ($component as $c) { $tmp = ''; - if (!empty($f->inOut)) { - $tmp .= $f->inOut . ' '; + if (!empty($c->inOut)) { + $tmp .= $c->inOut . ' '; } $ret[] = trim( - $tmp . Context::escape($f->name) . ' ' . - DataType::build($f->type) + $tmp . Context::escape($c->name) . ' ' . + DataType::build($c->type) ); } return '(' . implode(', ', $ret) . ')'; diff --git a/libraries/sql-parser/src/Components/Reference.php b/libraries/sql-parser/src/Components/Reference.php index fef8fa465f..fa468875ac 100644 --- a/libraries/sql-parser/src/Components/Reference.php +++ b/libraries/sql-parser/src/Components/Reference.php @@ -61,8 +61,8 @@ class Reference extends Component /** * Constructor. * - * @param string $table The name of the table referenced. - * @param array $columns The columns referenced. + * @param string $table The name of the table referenced. + * @param array $columns The columns referenced. * @param OptionsArray $options The options. */ public function __construct($table = null, array $columns = array(), $options = null) diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index 99137d1f6d..b3bf4a0a0e 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -123,6 +123,10 @@ abstract class Context * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html */ + // Compatibility mode for Microsoft's SQL server. + // This is the equivalent of ANSI_QUOTES. + const COMPAT_MYSQL = 2; + // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_allow_invalid_dates const ALLOW_INVALID_DATES = 1; @@ -446,11 +450,12 @@ abstract class Context /** * Escapes the symbol by adding surrounding backticks. * - * @param array|string $str The string to be escaped. + * @param array|string $str The string to be escaped. + * @param string $quote Quote to be used when escaping. * * @return string */ - public static function escape($str) + public static function escape($str, $quote = '`') { if (is_array($str)) { foreach ($str as $key => $value) { @@ -458,10 +463,11 @@ abstract class Context } return $str; } + if (static::$MODE & Context::ANSI_QUOTES) { - return '"' . str_replace('"', '""', $str) . '"'; + $quote = '"'; } - return '`' . str_replace('`', '``', $str) . '`'; + return $quote . str_replace($quote, $quote . $quote, $str) . $quote; } } diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index 312a53e81d..48a928c00f 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -144,8 +144,9 @@ class ContextMySql50000 extends Context 'SQL_CALC_FOUND_ROWS' => 3, 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, - 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, - 'OR REPLACE' => 7, + 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7, 'NO ACTION' => 7, + 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'INNER JOIN' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7, 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index 0e5a574a82..fa43a6f4fc 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -155,8 +155,9 @@ class ContextMySql50100 extends Context 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, - 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, - 'OR REPLACE' => 7, + 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7, 'NO ACTION' => 7, + 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'INNER JOIN' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7, 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index 426bd5233e..49afca367f 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -160,8 +160,9 @@ class ContextMySql50500 extends Context 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, - 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, - 'OR REPLACE' => 7, + 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7, 'NO ACTION' => 7, + 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'INNER JOIN' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7, 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index e091314ca2..8c91bdb4a6 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -166,8 +166,9 @@ class ContextMySql50600 extends Context 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, - 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, - 'OR REPLACE' => 7, + 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7, 'NO ACTION' => 7, + 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'INNER JOIN' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7, 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 207ffd2837..b522e82bdc 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -174,8 +174,9 @@ class ContextMySql50700 extends Context 'MASTER_SSL_VERIFY_SERVER_CERT' => 3, 'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7, - 'IF EXISTS' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7, - 'OR REPLACE' => 7, + 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7, 'NO ACTION' => 7, + 'ON DELETE' => 7, 'ON UPDATE' => 7, + 'INNER JOIN' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7, 'FOR EACH ROW' => 7, 'SQL SECURITY' => 7, 'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7, 'DATA DIRECTORY' => 7, diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php index 9a57a20fcf..260ea25a53 100644 --- a/libraries/sql-parser/src/Parser.php +++ b/libraries/sql-parser/src/Parser.php @@ -142,6 +142,22 @@ class Parser 'class' => 'SqlParser\\Components\\JoinKeyword', 'field' => 'join', ), + 'LEFT JOIN' => array( + 'class' => 'SqlParser\\Components\\JoinKeyword', + 'field' => 'join', + ), + 'RIGHT JOIN' => array( + 'class' => 'SqlParser\\Components\\JoinKeyword', + 'field' => 'join', + ), + 'INNER JOIN' => array( + 'class' => 'SqlParser\\Components\\JoinKeyword', + 'field' => 'join', + ), + 'FULL JOIN' => array( + 'class' => 'SqlParser\\Components\\JoinKeyword', + 'field' => 'join', + ), 'LIMIT' => array( 'class' => 'SqlParser\\Components\\Limit', 'field' => 'limit', diff --git a/libraries/sql-parser/src/Statements/SelectStatement.php b/libraries/sql-parser/src/Statements/SelectStatement.php index 02624c1a1a..954c2202ec 100644 --- a/libraries/sql-parser/src/Statements/SelectStatement.php +++ b/libraries/sql-parser/src/Statements/SelectStatement.php @@ -90,6 +90,7 @@ class SelectStatement extends Statement '_SELECT' => array('SELECT', 1), 'FROM' => array('FROM', 3), 'PARTITION' => array('PARTITION', 3), + 'JOIN' => array('JOIN', 1), 'WHERE' => array('WHERE', 3), 'GROUP BY' => array('GROUP BY', 3), 'HAVING' => array('HAVING', 3), @@ -98,7 +99,6 @@ class SelectStatement extends Statement 'PROCEDURE' => array('PROCEDURE', 3), 'INTO' => array('INTO', 3), 'UNION' => array('UNION', 3), - 'JOIN' => array('JOIN', 3), ); /** @@ -174,7 +174,7 @@ class SelectStatement extends Statement /** * Joins. * - * @var JoinKeyword + * @var JoinKeyword[] */ public $join; diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php index e0fbb959c2..9d3dfa99f8 100644 --- a/libraries/sql-parser/src/Utils/Misc.php +++ b/libraries/sql-parser/src/Utils/Misc.php @@ -33,8 +33,8 @@ class Misc public static function getAliases($statement, $database) { if (!($statement instanceof SelectStatement) - || (empty($statement->from)) || (empty($statement->expr)) + || (empty($statement->from)) ) { return array(); } @@ -43,28 +43,21 @@ class Misc $tables = array(); - if ((!empty($statement->join->expr->table)) - && (!empty($statement->join->expr->alias)) - ) { - $thisDb = empty($statement->join->expr->database) ? - $database : $statement->join->expr->database; + /** + * Expressions that may contain aliases. + * These are extracted from `FROM` and `JOIN` keywords. + * @var Expression[] + */ + $expressions = $statement->from; - $retval = array( - $thisDb => array( - 'alias' => null, - 'tables' => array( - $statement->join->expr->table => array( - 'alias' => $statement->join->expr->alias, - 'columns' => array(), - ), - ), - ), - ); - - $tables[$thisDb][$statement->join->expr->alias] = $statement->join->expr->table; + // Adding expressions from JOIN. + if (!empty($statement->join)) { + foreach ($statement->join as $join) { + $expressions[] = $join->expr; + } } - foreach ($statement->from as $expr) { + foreach ($expressions as $expr) { if (empty($expr->table)) { continue; } From 8fb797ebe19128770ef5489478f3c27d1624b981 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 10 Jul 2015 21:47:15 +0300 Subject: [PATCH 51/57] Fixed coding style. Signed-off-by: Dan Ungureanu --- libraries/Util.class.php | 2 +- libraries/central_columns.lib.php | 100 +++++++++++++++++++----------- libraries/normalization.lib.php | 6 +- 3 files changed, 70 insertions(+), 38 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 9d6499cc0b..340f740d08 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -585,7 +585,7 @@ class PMA_Util * Displays a MySQL error message in the main panel when $exit is true. * Returns the error message otherwise. * - * @param string|bool $esrver_msg Server's error message. + * @param string|bool $esrver_msg Server's error message. * @param string $sql_query The SQL query that failed. * @param bool $is_modify_link Whether to show a "modify" link or not. * @param string $back_url URL for the "back" link (full path is diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 89241b512c..63e696c9e7 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -435,12 +435,12 @@ function PMA_makeConsistentWithList($db, $selected_tables) if ($column['col_default']) { if ($column['col_default'] != 'CURRENT_TIMESTAMP') { $query .= ' DEFAULT \'' . PMA_Util::sqlAddSlashes( - $column['col_default'] - ) . '\''; + $column['col_default'] + ) . '\''; } else { $query .= ' DEFAULT ' . PMA_Util::sqlAddSlashes( - $column['col_default'] - ); + $column['col_default'] + ); } } $query .= ','; @@ -514,7 +514,7 @@ function PMA_getCentralColumnsFromTable($db, $table, $allFields=false) * @return true|PMA_Message */ function PMA_updateOneColumn($db, $orig_col_name, $col_name, $col_type, - $col_attribute,$col_length, $col_isNull, $collation, $col_extra, $col_default + $col_attribute,$col_length, $col_isNull, $collation, $col_extra, $col_default ) { $cfgCentralColumns = PMA_centralColumnsGetParams(); if (empty($cfgCentralColumns)) { @@ -865,7 +865,8 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) . '' . PMA\Template::get('columns_definitions/column_name') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 0, 'ci_offset' => 0, @@ -875,19 +876,22 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) 'cfgRelation' => array( 'centralcolumnswork' => false ) - )) + ) + ) . ''; $tableHtml .= '' . htmlspecialchars($row['col_type']) . '' . PMA\Template::get('columns_definitions/column_type') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 1, 'ci_offset' => 0, 'type_upper' => /*overload*/mb_strtoupper($row['col_type']), 'columnMeta' => array() - )) + ) + ) . ''; $tableHtml .= '' @@ -922,13 +926,15 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) ? htmlspecialchars($row['col_default']) : 'None') . '' . PMA\Template::get('columns_definitions/column_default') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 3, 'ci_offset' => 0, 'type_upper' => /*overload*/mb_strtoupper($row['col_type']), 'columnMeta' => $meta - )) + ) + ) . ''; $tableHtml .= @@ -946,28 +952,32 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) ? htmlspecialchars($row['col_attribute']) : "" ) . '' . PMA\Template::get('columns_definitions/column_attribute') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 5, 'ci_offset' => 0, 'extracted_columnspec' => array(), 'columnMeta' => $row['col_attribute'], 'submit_attribute' => false, - )) + ) + ) . ''; $tableHtml .= '' . '' . ($row['col_isNull'] ? __('Yes') : __('No')) . '' . PMA\Template::get('columns_definitions/column_null') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 6, 'ci_offset' => 0, 'columnMeta' => array( 'Null' => $row['col_isNull'] ) - )) + ) + ) . ''; $tableHtml .= @@ -1005,7 +1015,8 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . 'value="' . htmlspecialchars($row['col_name']) . '">' . '' . PMA\Template::get('columns_definitions/column_name') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 0, 'ci_offset' => 0, @@ -1015,18 +1026,21 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) 'cfgRelation' => array( 'centralcolumnswork' => false ) - )) + ) + ) . ''; $tableHtml .= '' . PMA\Template::get('columns_definitions/column_type') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 1, 'ci_offset' => 0, 'type_upper' => /*overload*/mb_strtoupper($row['col_type']), 'columnMeta' => array() - )) + ) + ) . ''; $tableHtml .= '' @@ -1056,13 +1070,15 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) $tableHtml .= '' . PMA\Template::get('columns_definitions/column_default') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 3, 'ci_offset' => 0, 'type_upper' => /*overload*/mb_strtoupper($row['col_default']), 'columnMeta' => $meta - )) + ) + ) . ''; $tableHtml .= '' @@ -1074,7 +1090,8 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) $tableHtml .= '' . PMA\Template::get('columns_definitions/column_attribute') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 5, 'ci_offset' => 0, @@ -1083,19 +1100,22 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) ), 'columnMeta' => array(), 'submit_attribute' => false, - )) + ) + ) . ''; $tableHtml .= '' . PMA\Template::get('columns_definitions/column_null') - ->render(array( + ->render( + array( 'columnNumber' => $row_num, 'ci' => 6, 'ci_offset' => 0, 'columnMeta' => array( 'Null' => $row['col_isNull'] ) - )) + ) + ) . ''; $tableHtml .= @@ -1253,7 +1273,8 @@ function PMA_getHTMLforAddNewColumn($db) . '' . '' . PMA\Template::get('columns_definitions/column_name') - ->render(array( + ->render( + array( 'columnNumber' => 0, 'ci' => 0, 'ci_offset' => 0, @@ -1261,17 +1282,20 @@ function PMA_getHTMLforAddNewColumn($db) 'cfgRelation' => array( 'centralcolumnswork' => false ) - )) + ) + ) . '' . '' . PMA\Template::get('columns_definitions/column_type') - ->render(array( + ->render( + array( 'columnNumber' => 0, 'ci' => 1, 'ci_offset' => 0, 'type_upper' => '', 'columnMeta' => array() - )) + ) + ) . '' . '' . PMA\Template::get('columns_definitions/column_length')->render( @@ -1286,13 +1310,15 @@ function PMA_getHTMLforAddNewColumn($db) . '' . '' . PMA\Template::get('columns_definitions/column_default') - ->render(array( + ->render( + array( 'columnNumber' => 0, 'ci' => 3, 'ci_offset' => 0, 'type_upper' => '', 'columnMeta' => array() - )) + ) + ) . '' . '' . PMA_generateCharsetDropdownBox( @@ -1302,23 +1328,27 @@ function PMA_getHTMLforAddNewColumn($db) . '' . '' . PMA\Template::get('columns_definitions/column_attribute') - ->render(array( + ->render( + array( 'columnNumber' => 0, 'ci' => 5, 'ci_offset' => 0, 'extracted_columnspec' => array(), 'columnMeta' => array(), 'submit_attribute' => false, - )) + ) + ) . '' . '' . PMA\Template::get('columns_definitions/column_null') - ->render(array( + ->render( + array( 'columnNumber' => 0, 'ci' => 6, 'ci_offset' => 0, 'columnMeta' => array() - )) + ) + ) . '' . '' . PMA\Template::get('columns_definitions/column_extra')->render( diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index 52a7a89705..a07d928305 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -106,12 +106,14 @@ function PMA_getHtmlForCreateNewColumn( } return PMA\Template::get('columns_definitions/table_fields_definitions') - ->render(array( + ->render( + array( 'is_backup' => true, 'fields_meta' => null, 'mimework' => $cfgRelation['mimework'], 'content_cells' => $content_cells - )); + ) + ); } /** * build the html for step 1.1 of normalization From 617f807c57a97cd5c89e64fd3df769fd43ae4445 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 10 Jul 2015 21:55:17 +0300 Subject: [PATCH 52/57] Minor fixes. Updated sql-parser library to udan11/sql-parser@d8b3a98. Signed-off-by: Dan Ungureanu --- export.php | 4 +++- libraries/Util.class.php | 4 ++-- libraries/sql-parser/src/TokensList.php | 2 +- libraries/sql-parser/src/Utils/Error.php | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/export.php b/export.php index 5b00da7561..82905407e8 100644 --- a/export.php +++ b/export.php @@ -286,7 +286,9 @@ if (!defined('TESTSUITE')) { // preference over SQL Query aliases. $parser = new SqlParser\Parser($sql_query); $aliases = array(); - if (!empty($parser->statements[0])) { + if ((!empty($parser->statements[0])) + && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement) + ) { if (!empty($_REQUEST['aliases'])) { $aliases = PMA_mergeAliases( SqlParser\Utils\Misc::getAliases($parser->statements[0], $db), diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 340f740d08..8e80703d90 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -585,7 +585,7 @@ class PMA_Util * Displays a MySQL error message in the main panel when $exit is true. * Returns the error message otherwise. * - * @param string|bool $esrver_msg Server's error message. + * @param string|bool $server_msg Server's error message. * @param string $sql_query The SQL query that failed. * @param bool $is_modify_link Whether to show a "modify" link or not. * @param string $back_url URL for the "back" link (full path is @@ -642,7 +642,7 @@ class PMA_Util $errors = SqlParser\Utils\Error::get(array($lexer, $parser)); if (empty($sql_query)) { - $formated_sql = ''; + $formatted_sql = ''; } elseif (count($errors)) { $formatted_sql = htmlspecialchars($sql_query); } else { diff --git a/libraries/sql-parser/src/TokensList.php b/libraries/sql-parser/src/TokensList.php index 93fb7c0779..10ff56e717 100644 --- a/libraries/sql-parser/src/TokensList.php +++ b/libraries/sql-parser/src/TokensList.php @@ -58,7 +58,7 @@ class TokensList implements \ArrayAccess /** * Builds an array of tokens by merging their raw value. * - * @param string|Token[]|TokensList $list + * @param string|Token[]|TokensList $list The tokens to be built. * * @return string */ diff --git a/libraries/sql-parser/src/Utils/Error.php b/libraries/sql-parser/src/Utils/Error.php index c1bfee1c0a..df6d5133ce 100644 --- a/libraries/sql-parser/src/Utils/Error.php +++ b/libraries/sql-parser/src/Utils/Error.php @@ -26,7 +26,7 @@ class Error /** * Gets the errors of a lexer and a parser. * - * @param array $objs + * @param array $objs Objects from where the errors will be extracted. * * @return array Each element of the array represents an error. * `$err[0]` holds the error message. From 5fa3bdf0d107d9892020f94124d2ae81e247d559 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 11 Jul 2015 00:42:16 +0300 Subject: [PATCH 53/57] Restore SQL mode after export with certain configuration has finished. Signed-off-by: Dan Ungureanu --- libraries/plugins/export/ExportSql.class.php | 9 +++++++- .../plugin/export/PMA_ExportSql_test.php | 23 +++++++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 0ce177ee89..1ce3921da0 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1392,6 +1392,9 @@ class ExportSql extends ExportPlugin return $this->_exportComment(__('in use') . '(' . $tmp_error . ')'); } + // Old mode is stored so it can be restored once exporting is done. + $old_mode = SqlParser\Context::$MODE; + $warning = ''; if ($result != false && ($row = $GLOBALS['dbi']->fetchRow($result))) { $create_query = $row[1]; @@ -1535,7 +1538,7 @@ class ExportSql extends ExportPlugin unset($statement->fields[$key]); } - // Creating the parts that drop froeign keys. + // Creating the parts that drop foreign keys. if (!empty($field->key)) { if ($field->key->type === 'FOREIGN KEY') { $dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name); @@ -1637,6 +1640,10 @@ class ExportSql extends ExportPlugin } $GLOBALS['dbi']->freeResult($result); + + // Restoring old mode. + SqlParser\Context::$MODE = $old_mode; + return $warning . $schema_create . ($add_semicolon ? ';' . $crlf : ''); } // end of the 'getTableDef()' function diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index 1b724c0e22..ab0f02190f 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -1222,12 +1222,21 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $row = array( '', "CREATE TABLE `table` (\n" . - "`id` INT NOT NULL AUTO_INCREMENT,\n" . - "username VARCHAR(64) NULL,\n" . - "`password` VARCHAR(256) DEFAULT '123456',\n" . - "CONSTRAINT pk_id PRIMARY KEY (`id`),\n" . - "UNIQUE (username)\n" . - ")" + "`payment_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,\n" . + "`customer_id` smallint(5) unsigned NOT NULL,\n" . + "`staff_id` tinyint(3) unsigned NOT NULL,\n" . + "`rental_id` int(11) DEFAULT NULL,\n" . + "`amount` decimal(5,2) NOT NULL,\n" . + "`payment_date` datetime NOT NULL,\n" . + "`last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n" . + "PRIMARY KEY (`payment_id`),\n" . + "KEY `idx_fk_staff_id` (`staff_id`),\n" . + "KEY `idx_fk_customer_id` (`customer_id`),\n" . + "KEY `fk_payment_rental` (`rental_id`),\n" . + "CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,\n" . + "CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,\n" . + "CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE\n" . + ") ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8\n" ); $dbi->expects($this->once()) @@ -1298,7 +1307,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ); $this->assertContains( - 'ALTER TABLE "db"."table"' . "\n", + 'ALTER TABLE "table"', $GLOBALS['sql_drop_foreign_keys'] ); From fd1dc6d6eccff97710b4efc76748086388fb92cb Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 11 Jul 2015 03:37:25 +0300 Subject: [PATCH 54/57] Fixed wrong variable name. Updated sql-parser library to udan11/sql-parser@140040f. Signed-off-by: Dan Ungureanu --- libraries/plugins/export/ExportSql.class.php | 4 +-- libraries/sql-parser/src/Lexer.php | 33 ++++++++----------- .../src/Statements/CreateStatement.php | 16 +++++---- libraries/sql-parser/src/Utils/Routine.php | 4 +-- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 1ce3921da0..3fc0fd6531 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1591,7 +1591,7 @@ class ExportSql extends ExportPlugin $alter_footer; } - if (!empty($fulltext_indexes)) { + if (!empty($indexes_fulltext)) { // InnoDB supports one FULLTEXT index creation at a time. // So FULLTEXT indexes are created one-by-one after other // indexes where created. @@ -1601,7 +1601,7 @@ class ExportSql extends ExportPlugin ) . $alter_footer; } - if ((!empty($indexes)) || (!empty($fulltext_indexes))) { + if ((!empty($indexes)) || (!empty($indexes_fulltext))) { $sql_indexes = $this->generateComment( $crlf, $sql_indexes, __('Indexes for dumped tables'), __('Indexes for table'), $table_alias, $compat diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index 17b3f35df9..d0912212d5 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -516,11 +516,8 @@ class Lexer $state = 1; for (; $this->last < $this->len; ++$this->last) { if ($state === 1) { - if ($this->str[$this->last] === '+') { - // Do nothing. - } elseif ($this->str[$this->last] === '-') { + if ($this->str[$this->last] === '-') { $flags |= Token::FLAG_NUMBER_NEGATIVE; - // Do nothing. } elseif (($this->str[$this->last] === '0') && ($this->last + 1 < $this->len) && (($this->str[$this->last + 1] === 'x') || ($this->str[$this->last + 1] === 'X')) ) { @@ -530,36 +527,33 @@ class Lexer $state = 3; } elseif ($this->str[$this->last] === '.') { $state = 4; - } else { + } elseif ($this->str[$this->last] !== '+') { + // `+` is a valid character in a number. break; } } elseif ($state === 2) { $flags |= Token::FLAG_NUMBER_HEX; - if ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) + if (!((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) || (($this->str[$this->last] >= 'A') && ($this->str[$this->last] <= 'F')) - || (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f')) + || (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f'))) ) { - // Do nothing. - } else { break; } } elseif ($state === 3) { - if (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { - // Do nothing. - } elseif ($this->str[$this->last] === '.') { + if ($this->str[$this->last] === '.') { $state = 4; } elseif (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) { $state = 5; - } else { + } elseif (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) { + // Just digits and `.`, `e` and `E` are valid characters. break; } } elseif ($state === 4) { $flags |= Token::FLAG_NUMBER_FLOAT; - if (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { - // Do nothing. - } elseif (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) { + if (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) { $state = 5; - } else { + } elseif (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) { + // Just digits, `e` and `E` are valid characters. break; } } elseif ($state === 5) { @@ -572,9 +566,8 @@ class Lexer break; } } elseif ($state === 6) { - if (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) { - // Do nothing. - } else { + if (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) { + // Just digits are valid characters. break; } } diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 60846780be..8475448b41 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -215,6 +215,14 @@ class CreateStatement extends Statement */ public function build() { + $fields = ''; + if (!empty($this->fields)) { + if (is_array($this->fields)) { + $fields = FieldDefinition::build($this->fields) . ' '; + } elseif ($this->fields instanceof ArrayObj) { + $fields = ArrayObj::build($this->fields); + } + } if ($this->options->has('DATABASE')) { return 'CREATE ' . OptionsArray::build($this->options) . ' ' @@ -224,17 +232,13 @@ class CreateStatement extends Statement return 'CREATE ' . OptionsArray::build($this->options) . ' ' . Expression::build($this->name) . ' ' - . FieldDefinition::build($this->fields) . ' ' + . $fields . OptionsArray::build($this->entityOptions); } elseif ($this->options->has('VIEW')) { - $tmp = ''; - if (!empty($this->fields)) { - $tmp = ArrayObj::build($this->fields); - } return 'CREATE ' . OptionsArray::build($this->options) . ' ' . Expression::build($this->name) . ' ' - . $tmp . ' AS ' . TokensList::build($this->body) . ' ' + . $fields . ' AS ' . TokensList::build($this->body) . ' ' . OptionsArray::build($this->entityOptions); } elseif ($this->options->has('TRIGGER')) { return 'CREATE ' diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php index 3d87002424..5450cac178 100644 --- a/libraries/sql-parser/src/Utils/Routine.php +++ b/libraries/sql-parser/src/Utils/Routine.php @@ -33,7 +33,7 @@ class Routine * * @return array */ - public function getReturnType($param) + public static function getReturnType($param) { $lexer = new Lexer($param); @@ -65,7 +65,7 @@ class Routine * * @return array */ - public function getParameter($param) + public static function getParameter($param) { $lexer = new Lexer('(' . $param . ')'); From 8d04cd5db8e6113f55b209b2806108724874165d Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 11 Jul 2015 18:10:03 +0300 Subject: [PATCH 55/57] Improved context detection. Use the delimiter specified by user. --- libraries/common.inc.php | 17 +++++++--- libraries/sql-parser/src/Context.php | 48 +++++++++++++++++++++++++++- libraries/sql-parser/src/Lexer.php | 11 +++++++ 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 34ac26c71a..93da663c33 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1065,15 +1065,22 @@ if (! defined('PMA_MINIMUM_COMMON')) { } /** - * SQL Parser code + * Initializes the SQL parsing library. */ include_once './libraries/sql-parser/autoload.php'; - try { - SqlParser\Context::load((PMA_DRIZZLE ? 'Drizzle' : 'MySql') . PMA_MYSQL_INT_VERSION); - } catch (\Exception $e) { - // If this fails, it will continue using the default context. + + // Loads closest context to this version. + SqlParser\Context::loadClosest( + (PMA_DRIZZLE ? 'Drizzle' : 'MySql') . PMA_MYSQL_INT_VERSION + ); + + // Sets the default delimiter (if specified). + if (!empty($_REQUEST['sql_delimiter'])) { + SqlParser\Lexer::$DEFAULT_DELIMITER = $_REQUEST['sql_delimiter']; } + // TODO: Set SQL modes too. + /** * the PMA_List_Database class */ diff --git a/libraries/sql-parser/src/Context.php b/libraries/sql-parser/src/Context.php index b3bf4a0a0e..7f937dc2c4 100644 --- a/libraries/sql-parser/src/Context.php +++ b/libraries/sql-parser/src/Context.php @@ -422,12 +422,58 @@ abstract class Context $context = self::$contextPrefix . $context; } if (!class_exists($context)) { - throw new \Exception('Specified context ("' . $context . '") does not exist.'); + throw new \Exception( + 'Specified context ("' . $context . '") does not exist.' + ); } self::$loadedContext = $context; self::$KEYWORDS = $context::$KEYWORDS; } + /** + * Loads the context with the closest version to the one specified. + * + * The closest context is found by replacing last digits with zero until one + * is loaded succesfully. + * + * @see Context::load() + * + * @param string $context Name of the context or full class name that + * defines the context. + * + * @return string The loaded context. `null` if no context was loaded. + */ + public static function loadClosest($context = '') + { + /** + * The number of replaces done by `preg_replace`. + * This actually represents whether a new context was generated or not. + * @var int + */ + $count = 0; + + // As long as a new context can be generated, we try to laod it. + do { + $loaded = true; + try { + // Trying to load the new context. + static::load($context); + } catch (\Exception $e) { + // If it didn't work, we are looking for a new one and skipping + // over to the next generation that will try the new context. + $context = preg_replace( + '/[1-9](0*)$/', '0$1', $context, -1, $count + ); + continue; + } + // Last generated context was valid (did not throw any exceptions). + // So we return it, to let the user know what context was loaded. + return $context; + } while ($count !== 0); + + return null; + } + /** * Sets the SQL mode. * diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php index d0912212d5..d70641fbdb 100644 --- a/libraries/sql-parser/src/Lexer.php +++ b/libraries/sql-parser/src/Lexer.php @@ -102,8 +102,16 @@ class Lexer */ public $list; + /** + * The default delimiter. This is used, by default, in all new instances. + * + * @var string + */ + public static $DEFAULT_DELIMITER = ';'; + /** * Statements delimiter. + * This may change during lexing. * * @var string */ @@ -145,6 +153,9 @@ class Lexer $this->len = ($str instanceof UtfString) ? $str->length() : strlen($str); $this->strict = $strict; + + $this->delimiter = static::$DEFAULT_DELIMITER; + $this->lex(); } From deada6560127f3085a4eae8ab422df73a58011ca Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 11 Jul 2015 19:14:22 +0300 Subject: [PATCH 56/57] Fixed exporting issues related to views. Signed-off-by: Dan Ungureanu --- libraries/Table.class.php | 27 +- libraries/plugins/export/ExportSql.class.php | 333 ++++++++++--------- 2 files changed, 187 insertions(+), 173 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 0e2eadabdd..2ac3c56e35 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -881,21 +881,24 @@ class PMA_Table */ $parser = new SqlParser\Parser($sql_structure); - /** - * The CREATE statement of this structure. - * @var SqlParser\Statements\CreateStatement $statement - */ - $statement = $parser->statements[0]; + if (!empty($parser->statements[0])) { - // Changing the destination. - $statement->name = $destination; + /** + * The CREATE statement of this structure. + * @var SqlParser\Statements\CreateStatement $statement + */ + $statement = $parser->statements[0]; - // Building back the query. - $sql_structure = $statement->build() . ';'; + // Changing the destination. + $statement->name = $destination; - // Executing it. - $GLOBALS['dbi']->query($sql_structure); - $GLOBALS['sql_query'] .= "\n" . $sql_structure; + // Building back the query. + $sql_structure = $statement->build() . ';'; + + // Executing it. + $GLOBALS['dbi']->query($sql_structure); + $GLOBALS['sql_query'] .= "\n" . $sql_structure; + } // ----------------------------------------------------------------- // Phase 3: Adding constraints. diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 3fc0fd6531..fb1bcc547b 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1468,177 +1468,188 @@ class ExportSql extends ExportPlugin ); } - // Using appropriate quotes. - if (($compat === 'MSSQL') || ($sql_backquotes === '"')) { - SqlParser\Context::$MODE |= SqlParser\Context::ANSI_QUOTES; - } + // Views have no constraints, indexes, etc. They do not require any + // analysis. + if (!$view) { - /** - * Parser used for analysis. - * @var SqlParser - */ - $parser = new SqlParser\Parser($create_query); - - /** - * `CREATE TABLE` statement. - * @var SqlParser\Statements\SelectStatement - */ - $statement = $parser->statements[0]; - - /** - * Fragments containining definition of each constraint. - * @var array - */ - $constraints = array(); - - /** - * Fragments containining definition of each index. - * @var array - */ - $indexes = array(); - - /** - * Fragments containining definition of each FULLTEXT index. - * @var array - */ - $indexes_fulltext = array(); - - /** - * Fragments containining definition of each foreign key that will - * be dropped. - * @var array - */ - $dropped = array(); - - /** - * Fragment containining definition of the `AUTO_INCREMENT`. - * @var array - */ - $auto_increment = array(); - - // Scanning each field of the `CREATE` statement to fill the arrays - // above. - // If the field is used in any of the arrays above, it is removed - // from the original definition. - // Also, AUTO_INCREMENT attribute is removed. - foreach ($statement->fields as $key => $field) { - - if ($field->isConstraint) { - // Creating the parts that add constraints. - $constraints[] = $field::build($field); - unset($statement->fields[$key]); - } elseif (!empty($field->key)) { - // Creating the parts that add indexes (must not be - // constraints). - if ($field->key->type === 'FULLTEXT KEY') { - $indexes_fulltext[] = $field->build($field); - } else { - $indexes[] = $field->build($field); - } - unset($statement->fields[$key]); + // Using appropriate quotes. + if (($compat === 'MSSQL') || ($sql_backquotes === '"')) { + SqlParser\Context::$MODE |= SqlParser\Context::ANSI_QUOTES; } - // Creating the parts that drop foreign keys. - if (!empty($field->key)) { - if ($field->key->type === 'FOREIGN KEY') { - $dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name); - } - unset($statement->fields[$key]); - } + /** + * Parser used for analysis. + * @var SqlParser + */ + $parser = new SqlParser\Parser($create_query); + } - // Dropping AUTO_INCREMENT. - if (!empty($field->options)) { - if ($field->options->has('AUTO_INCREMENT')) { - $auto_increment[] = $field::build($field); - $field->options->remove('AUTO_INCREMENT'); + if (!empty($parser->statements[0]->fields)) { + + /** + * `CREATE TABLE` statement. + * @var SqlParser\Statements\SelectStatement + */ + $statement = $parser->statements[0]; + + /** + * Fragments containining definition of each constraint. + * @var array + */ + $constraints = array(); + + /** + * Fragments containining definition of each index. + * @var array + */ + $indexes = array(); + + /** + * Fragments containining definition of each FULLTEXT index. + * @var array + */ + $indexes_fulltext = array(); + + /** + * Fragments containining definition of each foreign key that will + * be dropped. + * @var array + */ + $dropped = array(); + + /** + * Fragment containining definition of the `AUTO_INCREMENT`. + * @var array + */ + $auto_increment = array(); + + // Scanning each field of the `CREATE` statement to fill the arrays + // above. + // If the field is used in any of the arrays above, it is removed + // from the original definition. + // Also, AUTO_INCREMENT attribute is removed. + foreach ($statement->fields as $key => $field) { + + if ($field->isConstraint) { + // Creating the parts that add constraints. + $constraints[] = $field::build($field); + unset($statement->fields[$key]); + } elseif (!empty($field->key)) { + // Creating the parts that add indexes (must not be + // constraints). + if ($field->key->type === 'FULLTEXT KEY') { + $indexes_fulltext[] = $field->build($field); + } else { + $indexes[] = $field->build($field); + } + unset($statement->fields[$key]); + } + + // Creating the parts that drop foreign keys. + if (!empty($field->key)) { + if ($field->key->type === 'FOREIGN KEY') { + $dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name); + } + unset($statement->fields[$key]); + } + + // Dropping AUTO_INCREMENT. + if (!empty($field->options)) { + if ($field->options->has('AUTO_INCREMENT')) { + $auto_increment[] = $field::build($field); + $field->options->remove('AUTO_INCREMENT'); + } } } + + /** + * The header of the `ALTER` statement (`ALTER TABLE tbl`). + * @var string + */ + $alter_header = 'ALTER TABLE ' . + PMA_Util::backquoteCompat( + $table_alias, $compat, $sql_backquotes + ); + + /** + * The footer of the `ALTER` statement (usually ';') + * @var string + */ + $alter_footer = ';' . $crlf; + + // Generating constraints-related query. + if (!empty($constraints)) { + $sql_constraints_query = $alter_header . + $crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $constraints) . + $alter_footer; + + $sql_constraints = $this->generateComment( + $crlf, $sql_constraints, __('Constraints for dumped tables'), + __('Constraints for table'), $table_alias, $compat + ) . $sql_constraints_query; + } + + // Generating indexes-related query. + $sql_indexes_query = ''; + + if (!empty($indexes)) { + $sql_indexes_query .= $alter_header . + $crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $indexes) . + $alter_footer; + } + + if (!empty($indexes_fulltext)) { + // InnoDB supports one FULLTEXT index creation at a time. + // So FULLTEXT indexes are created one-by-one after other + // indexes where created. + $sql_indexes_query .= $alter_header . + ' ADD ' . implode( + $alter_footer . $alter_header . ' ADD ', $indexes_fulltext + ) . $alter_footer; + } + + if ((!empty($indexes)) || (!empty($indexes_fulltext))) { + $sql_indexes = $this->generateComment( + $crlf, $sql_indexes, __('Indexes for dumped tables'), + __('Indexes for table'), $table_alias, $compat + ) . $sql_indexes_query; + } + + // Generating drop foreign keys-related query. + if (!empty($dropped)) { + $sql_drop_foreign_keys = $alter_header . + $crlf . ' DROP ' . implode(',' . $crlf . ' DROP ', $dropped) . + $alter_footer; + } + + // Generating auto-increment-related query. + if ((!empty($auto_increment)) && ($update_indexes_increments)) { + $sql_auto_increments_query = $alter_header . + $crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment) . + ', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT') + . $alter_footer; + + $sql_auto_increments = $this->generateComment( + $crlf, $sql_auto_increments, + __('AUTO_INCREMENT for dumped tables'), + __('AUTO_INCREMENT for table'), $table_alias, $compat + ) . $sql_auto_increments_query; + } + + // Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE` + // too. + if (!empty($statement->entityOptions)) { + $statement->entityOptions->remove('AUTO_INCREMENT'); + } + + // Rebuilding the query. + $create_query = $statement->build(); } - /** - * The header of the `ALTER` statement (`ALTER TABLE tbl`). - * @var string - */ - $alter_header = 'ALTER TABLE ' . - PMA_Util::backquoteCompat( - $table_alias, $compat, $sql_backquotes - ); - - /** - * The footer of the `ALTER` statement (usually ';') - * @var string - */ - $alter_footer = ';' . $crlf; - - // Generating constraints-related query. - if (!empty($constraints)) { - $sql_constraints_query = $alter_header . - $crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $constraints) . - $alter_footer; - - $sql_constraints = $this->generateComment( - $crlf, $sql_constraints, __('Constraints for dumped tables'), - __('Constraints for table'), $table_alias, $compat - ) . $sql_constraints_query; - } - - // Generating indexes-related query. - $sql_indexes_query = ''; - - if (!empty($indexes)) { - $sql_indexes_query .= $alter_header . - $crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $indexes) . - $alter_footer; - } - - if (!empty($indexes_fulltext)) { - // InnoDB supports one FULLTEXT index creation at a time. - // So FULLTEXT indexes are created one-by-one after other - // indexes where created. - $sql_indexes_query .= $alter_header . - ' ADD ' . implode( - $alter_footer . $alter_header . ' ADD ', $indexes_fulltext - ) . $alter_footer; - } - - if ((!empty($indexes)) || (!empty($indexes_fulltext))) { - $sql_indexes = $this->generateComment( - $crlf, $sql_indexes, __('Indexes for dumped tables'), - __('Indexes for table'), $table_alias, $compat - ) . $sql_indexes_query; - } - - // Generating drop foreign keys-related query. - if (!empty($dropped)) { - $sql_drop_foreign_keys = $alter_header . - $crlf . ' DROP ' . implode(',' . $crlf . ' DROP ', $dropped) . - $alter_footer; - } - - // Generating auto-increment-related query. - if ((!empty($auto_increment)) && ($update_indexes_increments)) { - $sql_auto_increments_query = $alter_header . - $crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment) . - ', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT') - . $alter_footer; - - $sql_auto_increments = $this->generateComment( - $crlf, $sql_auto_increments, - __('AUTO_INCREMENT for dumped tables'), - __('AUTO_INCREMENT for table'), $table_alias, $compat - ) . $sql_auto_increments_query; - } - - // Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE` - // too. - if (!empty($statement->entityOptions)) { - $statement->entityOptions->remove('AUTO_INCREMENT'); - } - - // Rebuilding the query. - $schema_create .= $statement->build(); + $schema_create .= $create_query; } + $GLOBALS['dbi']->freeResult($result); // Restoring old mode. From 053f7fc2e994185531cfa305ef43703e186ff53f Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Sat, 11 Jul 2015 23:03:31 +0300 Subject: [PATCH 57/57] Fixed test. --- test/classes/plugin/export/PMA_ExportSql_test.php | 8 ++++---- test/classes/plugin/import/ImportCsv_test.php | 12 ++---------- test/classes/plugin/import/ImportOds_test.php | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index ab0f02190f..c4f7a18f37 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -1248,7 +1248,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['DisableIS'] = false; $result = $this->object->getTableDef( - 'db', 'table', "\n", "example.com/err", true, true, true + 'db', 'table', "\n", "example.com/err", true, true, false ); $this->assertContains( @@ -1402,7 +1402,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $row = array( '', - "CREATE TABLE `db`.`table` (\n" . + "CREATE TABLE `table` (\n" . "`id` INT NOT NULL AUTO_INCREMENT,\n" . "username VARCHAR(64) NULL,\n" . "`password` VARCHAR(256) DEFAULT '123456',\n" . @@ -1420,7 +1420,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['DisableIS'] = false; $result = $this->object->getTableDef( - 'db', 'table', "\n", "example.com/err", true, true, true + 'db', 'table', "\n", "example.com/err", true, true, false ); $this->assertContains( @@ -1533,7 +1533,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['DisableIS'] = false; $result = $this->object->getTableDef( - 'db', 'table', "\n", "example.com/err", true, true, true + 'db', 'table', "\n", "example.com/err", true, true, false ); $this->assertContains( diff --git a/test/classes/plugin/import/ImportCsv_test.php b/test/classes/plugin/import/ImportCsv_test.php index b1ac9c5e55..2707c0d859 100644 --- a/test/classes/plugin/import/ImportCsv_test.php +++ b/test/classes/plugin/import/ImportCsv_test.php @@ -145,10 +145,7 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase $sql_query ); } - $this->assertContains( - 'SET utf8 COLLATE utf8_general_ci', - $sql_query - ); + $this->assertContains( 'CREATE TABLE IF NOT EXISTS `CSV_DB`.`TBL_NAME`', $sql_query @@ -158,7 +155,6 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase true, $GLOBALS['finished'] ); - } /** @@ -211,10 +207,7 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase $sql_query ); } - $this->assertContains( - 'SET utf8 COLLATE utf8_general_ci', - $sql_query - ); + $this->assertContains( 'CREATE TABLE IF NOT EXISTS `CSV_DB`.`TBL_NAME`', $sql_query @@ -224,6 +217,5 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase true, $GLOBALS['finished'] ); - } } diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOds_test.php index 79439f6d96..3a2778f0c6 100644 --- a/test/classes/plugin/import/ImportOds_test.php +++ b/test/classes/plugin/import/ImportOds_test.php @@ -138,7 +138,7 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase //asset that all sql are executed if (PMA_DRIZZLE) { $this->assertContains( - 'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT COLLATE utf8_general_ci', + 'CREATE DATABASE IF NOT EXISTS `ODS_DB` COLLATE utf8_general_ci', $sql_query ); } else {