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

SERIAL and BOOLEAN types have no length.

Browse Source
This commit is contained in:
Rouslan Placella 2011-07-11 12:28:09 +01:00
parent 125467978e
commit a4dd7561b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/rte/rte_routines.lib.php
View File

@ -681,7 +681,7 @@ function PMA_RTN_getQueryFromRequest()
htmlspecialchars($_REQUEST['item_param_dir'][$i]));
}
if ($_REQUEST['item_param_length'][$i] != ''
&& !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$@i',
&& !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN)$@i',
$_REQUEST['item_param_type'][$i])) {
$params .= "(" . $_REQUEST['item_param_length'][$i] . ")";
} else if ($_REQUEST['item_param_length'][$i] == ''
@ -726,7 +726,7 @@ function PMA_RTN_getQueryFromRequest()
$errors[] = __('You must provide a valid return type for the routine.');
}
if (! empty($_REQUEST['item_returnlength'])
&& !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$@i',
&& !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN)$@i',
$_REQUEST['item_returntype'])) {
$query .= "(" . intval($_REQUEST['item_returnlength']) . ")";
} else if (empty($_REQUEST['item_returnlength'])