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

Optimize matching

Browse Source 
- avoid calling twice same preg_match
- do case sensitive match as we have the string in lower case
This commit is contained in:
Michal Čihař 2011-08-04 16:15:13 +02:00
parent 04c5a81b8c
commit b604a67c50
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/common.lib.php
View File

@ -2636,20 +2636,16 @@ function PMA_extractFieldSpec($fieldspec) {
// strip the "BINARY" attribute, except if we find "BINARY(" because
// this would be a BINARY or VARBINARY field type
if (!preg_match('@BINARY[\(]@i', $shorttype)) {
$shorttype = preg_replace('@BINARY@i', '', $shorttype);
if (!preg_match('@binary[\(]@', $shorttype)) {
$binary = strstr($shorttype, 'blob') || strstr($shorttype, 'binary');
$shorttype = preg_replace('@binary@', '', $shorttype);
}
$shorttype = preg_replace('@ZEROFILL@i', '', $shorttype);
$shorttype = preg_replace('@UNSIGNED@i', '', $shorttype);
$zerofill = strstr($shorttype, 'zerofill');
$shorttype = preg_replace('@zerofill@', '', $shorttype);
$unsigned = strstr($shorttype, 'unsigned');
$shorttype = preg_replace('@unsigned@', '', $shorttype);
$shorttype = trim($shorttype);
if (!preg_match('@BINARY[\(]@i', $fieldspec)) {
$binary = stristr($fieldspec, 'blob') || stristr($fieldspec, 'binary');
} else {
$binary = false;
}
$unsigned = stristr($fieldspec, 'unsigned');
$zerofill = stristr($fieldspec, 'zerofill');
}
return array(