gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11403 from udan11/update

Browse Source 
Update sql-parser.
This commit is contained in:
Isaac Bennetch 2015-08-16 22:23:06 -04:00
commit d818847412
8 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libraries/sql-parser/src/Components/AlterOperation.php
View File

@ -31,47 +31,55 @@ class AlterOperation extends Component
* @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,
// table_options
'ENGINE' => array(1, 'var='),
'AUTO_INCREMENT' => array(1, 'var='),
'AVG_ROW_LENGTH' => array(1, 'var'),
'MAX_ROWS' => array(1, 'var'),
'ROW_FORMAT' => array(1, 'var'),
'DEFAULT CHARACTER SET' => array(5, 'var'),
'DEFAULT CHARSET' => array(5, 'var'),
'ADD' => 1,
'ALTER' => 1,
'ANALYZE' => 1,
'CHANGE' => 1,
'CHECK' => 1,
'COALESCE' => 1,
'CONVERT' => 1,
'DISABLE' => 1,
'DISCARD' => 1,
'DROP' => 1,
'ENABLE' => 1,
'IMPORT' => 1,
'MODIFY' => 1,
'OPTIMIZE' => 1,
'ORDER' => 1,
'PARTITION' => 1,
'REBUILD' => 1,
'REMOVE' => 1,
'RENAME' => 1,
'REORGANIZE' => 1,
'REPAIR' => 1,
'COLLATE' => array(6, 'var'),
'COLUMN' => 2,
'CONSTRAINT' => 2,
'DEFAULT' => 2,
'TO' => 2,
'BY' => 2,
'FOREIGN' => 2,
'FULLTEXT' => 2,
'KEY' => 2,
'KEYS' => 2,
'PARTITIONING' => 2,
'PRIMARY KEY' => 2,
'SPATIAL' => 2,
'TABLESPACE' => 2,
'INDEX' => 2,
'DEFAULT CHARACTER SET' => array(3, 'var'),
'DEFAULT CHARSET' => array(3, 'var'),
'COLLATE' => array(4, 'var'),
);
/**

6
libraries/sql-parser/src/Components/IntoKeyword.php
View File

@ -138,12 +138,12 @@ class IntoKeyword extends Component
*/
public static function build($component)
{
if ($component->type === 'OUTFILE') {
return 'OUTFILE "' . $component->dest . '"';
} else {
if ($component->dest instanceof Expression) {
$columns = !empty($component->columns) ?
'(' . implode(', ', $component->columns) . ')' : '';
return Expression::build($component->dest) . $columns;
} else {
return 'OUTFILE "' . $component->dest . '"';
}
}
}

2
libraries/sql-parser/src/Components/PartitionDefinition.php
View File

@ -71,7 +71,7 @@ class PartitionDefinition extends Component
/**
* The expression used to defined this partition.
*
* @var Expression
* @var Expression|string
*/
public $expr;

2
libraries/sql-parser/src/Contexts/ContextMySql50000.php
View File

@ -3,6 +3,8 @@
/**
* Context for MySQL 5.
*
* This file was auto-generated.
*
* @package SqlParser
* @subpackage Contexts
* @link https://dev.mysql.com/doc/refman/5.0/en/keywords.html

2
libraries/sql-parser/src/Contexts/ContextMySql50100.php
View File

@ -3,6 +3,8 @@
/**
* Context for MySQL 5.1.
*
* This file was auto-generated.
*
* @package SqlParser
* @subpackage Contexts
* @link https://dev.mysql.com/doc/refman/5.1/en/keywords.html

2
libraries/sql-parser/src/Contexts/ContextMySql50500.php
View File

@ -3,6 +3,8 @@
/**
* Context for MySQL 5.5.
*
* This file was auto-generated.
*
* @package SqlParser
* @subpackage Contexts
* @link https://dev.mysql.com/doc/refman/5.5/en/keywords.html

2
libraries/sql-parser/src/Contexts/ContextMySql50600.php
View File

@ -3,6 +3,8 @@
/**
* Context for MySQL 5.6.
*
* This file was auto-generated.
*
* @package SqlParser
* @subpackage Contexts
* @link https://dev.mysql.com/doc/refman/5.6/en/keywords.html

2
libraries/sql-parser/src/Contexts/ContextMySql50700.php
View File

@ -3,6 +3,8 @@
/**
* Context for MySQL 5.7.
*
* This file was auto-generated.
*
* @package SqlParser
* @subpackage Contexts
* @link https://dev.mysql.com/doc/refman/5.7/en/keywords.html