From 71748b1f8c75e1d7821a86cb4161b1df1d30ef08 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 24 May 2013 05:28:58 -0400 Subject: [PATCH] bug #3942 Warnings about reserved word for many non reserved words --- ChangeLog | 1 + libraries/sqlparser.data.php | 284 +++-------------------------------- 2 files changed, 22 insertions(+), 263 deletions(-) diff --git a/ChangeLog b/ChangeLog index db76259abf..6c5d0ec1c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3941 Recent tables list always empty - bug #3933 Do not translate "Open Document" in export settings - bug #3927 List of tables is missing after expanding in the navigation frame +- bug #3942 Warnings about reserved word for many non reserved words 4.0.2.0 (not yet released) - bug #3902 Cannot browse when table name contains keyword "call" diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 8aad5a1592..fab1177d88 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -675,196 +675,106 @@ $PMA_SQPdata_reserved_word = array ( ); /** - * words forbidden to be used as column or table name wihtout quotes - * as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html + * 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', // 5.1 - 'ACTION', + 'ACCESSIBLE', 'ADD', - 'AFTER', - 'AGAINST', - 'AGGREGATE', - 'ALGORITHM', 'ALL', 'ALTER', 'ANALYZE', 'AND', - 'ANY', 'AS', 'ASC', - 'ASCII', 'ASENSITIVE', - 'AUTO_INCREMENT', - 'AVG', - 'AVG_ROW_LENGTH', - 'BACKUP', - 'BDB', 'BEFORE', - 'BEGIN', - 'BERKELEYDB', 'BETWEEN', 'BIGINT', 'BINARY', - 'BINLOG', - 'BIT', 'BLOB', - 'BOOL', - 'BOOLEAN', 'BOTH', - 'BTREE', 'BY', - 'BYTE', - 'CACHE', 'CALL', 'CASCADE', - 'CASCADED', 'CASE', - 'CHAIN', 'CHANGE', - 'CHANGED', 'CHAR', 'CHARACTER', - 'CHARSET', 'CHECK', - 'CHECKSUM', - 'CIPHER', - 'CLOSE', 'COLLATE', - 'COLLATION', 'COLUMN', - 'COLUMNS', - 'COMMENT', - 'COMMIT', - 'COMMITTED', - 'COMPACT', - 'COMPRESSED', - 'CONCURRENT', 'CONDITION', - 'CONNECTION', - 'CONSISTENT', 'CONSTRAINT', - 'CONTAINS', 'CONTINUE', 'CONVERT', 'CREATE', 'CROSS', - 'CUBE', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER', 'CURSOR', - 'DATA', 'DATABASE', 'DATABASES', - 'DATE', - 'DATETIME', - 'DAY', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', - 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', - 'DEFINER', 'DELAYED', - 'DELAY_KEY_WRITE', 'DELETE', 'DESC', 'DESCRIBE', - 'DES_KEY_FILE', 'DETERMINISTIC', - 'DIRECTORY', - 'DISABLE', - 'DISCARD', 'DISTINCT', 'DISTINCTROW', 'DIV', - 'DO', 'DOUBLE', 'DROP', 'DUAL', - 'DUMPFILE', - 'DUPLICATE', - 'DYNAMIC', 'EACH', 'ELSE', 'ELSEIF', - 'ENABLE', 'ENCLOSED', - 'END', - 'ENGINE', - 'ENGINES', - 'ENUM', - 'ERRORS', - 'ESCAPE', 'ESCAPED', - 'EVENTS', - 'EXECUTE', 'EXISTS', 'EXIT', - 'EXPANSION', 'EXPLAIN', - 'EXTENDED', 'FALSE', - 'FAST', 'FETCH', - 'FIELDS', - 'FILE', - 'FIRST', - 'FIXED', 'FLOAT', 'FLOAT4', 'FLOAT8', - 'FLUSH', 'FOR', 'FORCE', 'FOREIGN', - 'FOUND', - 'FRAC_SECOND', 'FROM', - 'FULL', 'FULLTEXT', - 'FUNCTION', - 'GEOMETRY', - 'GEOMETRYCOLLECTION', - 'GET_FORMAT', - 'GLOBAL', - 'GOTO', + 'GENERAL', + 'GET', 'GRANT', - 'GRANTS', 'GROUP', - 'HANDLER', - 'HASH', 'HAVING', - 'HELP', 'HIGH_PRIORITY', - 'HOSTS', - 'HOUR', 'HOUR_MICROSECOND', 'HOUR_MINUTE', 'HOUR_SECOND', - 'IDENTIFIED', 'IF', 'IGNORE', - 'IMPORT', + 'IGNORE_SERVER_IDS', 'IN', 'INDEX', - 'INDEXES', 'INFILE', 'INNER', - 'INNOBASE', - 'INNODB', 'INOUT', 'INSENSITIVE', 'INSERT', - 'INSERT_METHOD', 'INT', 'INT1', 'INT2', @@ -874,102 +784,50 @@ $PMA_SQPdata_forbidden_word = array ( 'INTEGER', 'INTERVAL', 'INTO', - 'INVOKER', - 'IO_THREAD', + 'IO_AFTER_GTIDS', + 'IO_BEFORE_GTIDS', 'IS', - 'ISOLATION', - 'ISSUER', 'ITERATE', 'JOIN', 'KEY', 'KEYS', 'KILL', - 'LABEL', - 'LANGUAGE', - 'LAST', 'LEADING', 'LEAVE', - 'LEAVES', 'LEFT', 'LIKE', 'LIMIT', - 'LINEAR', // 5.1 + 'LINEAR', 'LINES', - 'LINESTRING', 'LOAD', - 'LOCAL', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK', - 'LOCKS', - 'LOGS', 'LONG', 'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', - 'MASTER', - 'MASTER_CONNECT_RETRY', - 'MASTER_HOST', - 'MASTER_LOG_FILE', - 'MASTER_LOG_POS', - 'MASTER_PASSWORD', - 'MASTER_PORT', - 'MASTER_SERVER_ID', - 'MASTER_SSL', - 'MASTER_SSL_CA', - 'MASTER_SSL_CAPATH', - 'MASTER_SSL_CERT', - 'MASTER_SSL_CIPHER', - 'MASTER_SSL_KEY', - 'MASTER_USER', + 'MASTER_BIND', + 'MASTER_HEARTBEAT_PERIOD', + 'MASTER_SSL_VERIFY_SERVER_CERT', 'MATCH', - 'MAX_CONNECTIONS_PER_HOUR', - 'MAX_QUERIES_PER_HOUR', - 'MAX_ROWS', - 'MAX_UPDATES_PER_HOUR', - 'MAX_USER_CONNECTIONS', - 'MEDIUM', + 'MAXVALUE', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', - 'MERGE', - 'MICROSECOND', 'MIDDLEINT', - 'MIGRATE', - 'MINUTE', 'MINUTE_MICROSECOND', 'MINUTE_SECOND', - 'MIN_ROWS', 'MOD', - 'MODE', 'MODIFIES', - 'MODIFY', - 'MONTH', - 'MULTILINESTRING', - 'MULTIPOINT', - 'MULTIPOLYGON', - 'MUTEX', - 'NATIONAL', 'NATURAL', - 'NCHAR', - 'NDB', - 'NDBCLUSTER', - 'NEW', - 'NEXT', - 'NO', - 'NONE', 'NOT', 'NO_WRITE_TO_BINLOG', 'NULL', 'NUMERIC', - 'NVARCHAR', - 'OFFSET', - 'OLD_PASSWORD', 'ON', - 'ONE', 'ONE_SHOT', - 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY', @@ -978,187 +836,87 @@ $PMA_SQPdata_forbidden_word = array ( 'OUT', 'OUTER', 'OUTFILE', - 'PACK_KEYS', - 'PARTIAL', - 'PASSWORD', - 'PHASE', - 'POINT', - 'POLYGON', + 'PARTITION', 'PRECISION', - 'PREPARE', - 'PREV', 'PRIMARY', - 'PRIVILEGES', 'PROCEDURE', - 'PROCESSLIST', 'PURGE', - 'QUARTER', - 'QUERY', - 'QUICK', - 'RAID0', - 'RAID_CHUNKS', - 'RAID_CHUNKSIZE', - 'RAID_TYPE', - 'RANGE', // 5.1 + 'RANGE', 'READ', 'READS', - 'READ_ONLY', // 5.1 - 'READ_WRITE', // 5.1 + 'READ_WRITE', 'REAL', - 'RECOVER', - 'REDUNDANT', 'REFERENCES', 'REGEXP', - 'RELAY_LOG_FILE', - 'RELAY_LOG_POS', - 'RELAY_THREAD', 'RELEASE', - 'RELOAD', 'RENAME', - 'REPAIR', 'REPEAT', - 'REPEATABLE', 'REPLACE', - 'REPLICATION', 'REQUIRE', - 'RESET', - 'RESTORE', + 'RESIGNAL', 'RESTRICT', - 'RESUME', 'RETURN', - 'RETURNS', 'REVOKE', 'RIGHT', 'RLIKE', - 'ROLLBACK', - 'ROLLUP', - 'ROUTINE', - 'ROW', - 'ROWS', - 'ROW_FORMAT', - 'RTREE', - 'SAVEPOINT', 'SCHEMA', 'SCHEMAS', - 'SECOND', 'SECOND_MICROSECOND', - 'SECURITY', 'SELECT', 'SENSITIVE', 'SEPARATOR', - 'SERIAL', - 'SERIALIZABLE', - 'SESSION', 'SET', - 'SHARE', 'SHOW', - 'SHUTDOWN', - 'SIGNED', - 'SIMPLE', - 'SLAVE', + 'SIGNAL', + 'SLOW', 'SMALLINT', - 'SNAPSHOT', - 'SOME', - 'SONAME', - 'SOUNDS', 'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', + 'SQL_AFTER_GTIDS', + 'SQL_BEFORE_GTIDS', 'SQL_BIG_RESULT', - 'SQL_BUFFER_RESULT', - 'SQL_CACHE', 'SQL_CALC_FOUND_ROWS', - 'SQL_NO_CACHE', 'SQL_SMALL_RESULT', - 'SQL_THREAD', - 'SQL_TSI_DAY', - 'SQL_TSI_FRAC_SECOND', - 'SQL_TSI_HOUR', - 'SQL_TSI_MINUTE', - 'SQL_TSI_MONTH', - 'SQL_TSI_QUARTER', - 'SQL_TSI_SECOND', - 'SQL_TSI_WEEK', - 'SQL_TSI_YEAR', 'SSL', - 'START', 'STARTING', - 'STATUS', - 'STOP', - 'STORAGE', 'STRAIGHT_JOIN', - 'STRING', - 'STRIPED', - 'SUBJECT', - 'SUPER', - 'SUSPEND', 'TABLE', - 'TABLES', - 'TABLESPACE', - 'TEMPORARY', - 'TEMPTABLE', 'TERMINATED', - 'TEXT', 'THEN', - 'TIME', - 'TIMESTAMP', - 'TIMESTAMPADD', - 'TIMESTAMPDIFF', 'TINYBLOB', 'TINYINT', 'TINYTEXT', 'TO', 'TRAILING', - 'TRANSACTION', 'TRIGGER', - 'TRIGGERS', 'TRUE', - 'TRUNCATE', - 'TYPE', - 'TYPES', - 'UNCOMMITTED', - 'UNDEFINED', 'UNDO', - 'UNICODE', 'UNION', 'UNIQUE', - 'UNKNOWN', 'UNLOCK', 'UNSIGNED', - 'UNTIL', 'UPDATE', 'USAGE', 'USE', - 'USER', - 'USER_RESOURCES', - 'USE_FRM', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', - 'VALUE', 'VALUES', 'VARBINARY', 'VARCHAR', 'VARCHARACTER', - 'VARIABLES', 'VARYING', - 'VIEW', - 'WARNINGS', - 'WEEK', 'WHEN', 'WHERE', 'WHILE', 'WITH', - 'WORK', 'WRITE', - 'X509', - 'XA', 'XOR', - 'YEAR', 'YEAR_MONTH', 'ZEROFILL' );