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

Fix parsing of CHAR column type (bug #1573502).

Browse Source
This commit is contained in:
Michal Čihař
2006-10-10 14:44:25 +00:00
parent 861d70b5a2
commit d9c440c01b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -14,6 +14,8 @@ $Source$
this case. this case.
* libraries/export/excel.php: Fix MIME type and extension to state before * libraries/export/excel.php: Fix MIME type and extension to state before
plugins were introduced (patch #1570742, thanks to ssevennm - ssevennm). plugins were introduced (patch #1570742, thanks to ssevennm - ssevennm).
* libraries/sqlparser.lib.php: Fix parsing of CHAR column type (bug
#1573502).
2006-10-09 Michal Čihař <michal@cihar.com> 2006-10-09 Michal Čihař <michal@cihar.com>
* lang/german: Fix typo (translation #1570611). * lang/german: Fix typo (translation #1570611).

11
libraries/sqlparser.lib.php
View File

@@ -602,8 +602,13 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
* found here and the token is wrongly marked as alpha_functionName. * found here and the token is wrongly marked as alpha_functionName.
* But we compensate for this when analysing for timestamp_not_null * But we compensate for this when analysing for timestamp_not_null
* later in this script. * later in this script.
*
* Same applies to CHAR vs. CHAR() function.
*/ */
$t_suffix = '_functionName'; $t_suffix = '_functionName';
/* There are functions which might be as well column types */
if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) {
}
} elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) { } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) {
$t_suffix = '_columnType'; $t_suffix = '_columnType';
@@ -713,7 +718,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
* *
* @access public * @access public
*/ */
function PMA_SQP_analyze($arr) function PMA_SQP_analyze(&$arr)
{ {
if ($arr == array()) { if ($arr == array()) {
return array(); return array();
@@ -1738,9 +1743,13 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
if ($seen_create_table && $in_create_table_fields && isset($current_identifier)) { if ($seen_create_table && $in_create_table_fields && isset($current_identifier)) {
$create_table_fields[$current_identifier]['type'] = $upper_data; $create_table_fields[$current_identifier]['type'] = $upper_data;
if ($upper_data == 'TIMESTAMP') { if ($upper_data == 'TIMESTAMP') {
$arr[$i]['type'] = 'alpha_columnType';
$in_timestamp_options = TRUE; $in_timestamp_options = TRUE;
} else { } else {
$in_timestamp_options = FALSE; $in_timestamp_options = FALSE;
if ($upper_data == 'CHAR') {
$arr[$i]['type'] = 'alpha_columnType';
}
} }
} }
} }