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

Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Madhura Jayaratne 2016-03-08 16:04:31 +11:00
commit e04585df5b
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -49,6 +49,8 @@ phpMyAdmin - ChangeLog
- issue Fix SQL syntax highlighting in database search page
- issue #12056 Fix error when we can not generate random string
- issue #12055 Fixed PHP syntax error in templates
- issue #12054 Fixed processing of queries with escaped quotes
- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT
- issue #12073 Hide edit and delete buttons when the results are not related to a table
4.5.5.1 (2016-02-29)

1
libraries/sql-parser/src/Components/Condition.php
View File

@ -38,6 +38,7 @@ class Condition extends Component
* @var array
*/
public static $ALLOWED_KEYWORDS = array(
'ALL' => 1,
'AND' => 1,
'BETWEEN' => 1,
'EXISTS' => 1,

3
libraries/sql-parser/src/Components/Expression.php
View File

@ -254,6 +254,9 @@ class Expression extends Component
continue;
}
$isExpr = true;
} elseif ($brackets === 0 && count($ret->expr) > 0) {
/* End of expression */
break;
}
}

1
libraries/sql-parser/src/Statements/DropStatement.php
View File

@ -39,6 +39,7 @@ class DropStatement extends Statement
'SCHEMA' => 1,
'SERVER' => 1,
'TABLE' => 1,
'VIEW' => 1,
'TABLESPACE' => 1,
'TRIGGER' => 1,

4
libraries/sql-parser/src/Utils/BufferedQuery.php
View File

@ -209,14 +209,14 @@ class BufferedQuery
*/
if ($this->status === static::STATUS_STRING_SINGLE_QUOTES) {
// Single-quoted strings like 'foo'.
if ($this->query[$i] === '\'') {
if ($this->query[$i] === '\'' && $this->query[$i - 1] !== '\\') {
$this->status = 0;
}
$this->current .= $this->query[$i];
continue;
} elseif ($this->status === static::STATUS_STRING_DOUBLE_QUOTES) {
// Double-quoted strings like "bar".
if ($this->query[$i] === '"') {
if ($this->query[$i] === '"' && $this->query[$i - 1] !== '\\') {
$this->status = 0;
}
$this->current .= $this->query[$i];