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

bug #2897536 [parser] Copying table with bit field with default

Browse Source
This commit is contained in:
Marc Delisle
2009-11-15 13:50:32 +00:00
parent ad48d9f31c
commit 58d880b6ab
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -57,6 +57,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ [lang] Russian update, thanks to Victor Volkov + [lang] Russian update, thanks to Victor Volkov
- bug #2823599 [edit] UUID Primary Key wrongly updated - bug #2823599 [edit] UUID Primary Key wrongly updated
- bug #2895894 [structure] Empty default value not set properly - bug #2895894 [structure] Empty default value not set properly
- bug #2897536 [parser] Copying table with bit field with default
3.2.3.0 (2009-10-30) 3.2.3.0 (2009-10-30)
- patch #2856664 [export] Date, time, and datetime column types now export correctly to - patch #2856664 [export] Date, time, and datetime column types now export correctly to

11
libraries/sqlparser.lib.php
View File

@@ -676,7 +676,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if ($t_cur == 'alpha') { if ($t_cur == 'alpha') {
$t_suffix = '_identifier'; $t_suffix = '_identifier';
if (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) { // for example: `thebit` bit(8) NOT NULL DEFAULT b'0'
if ($t_prev == 'alpha' && $d_prev == 'DEFAULT' && $d_cur == 'b' && $t_next == 'quote_single') {
$t_suffix = '_bitfield_constant_introducer';
} elseif (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
$t_suffix = '_identifier'; $t_suffix = '_identifier';
} elseif (($t_next == 'punct_bracket_open_round') } elseif (($t_next == 'punct_bracket_open_round')
&& PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) { && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) {
@@ -2183,6 +2186,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} }
switch ($typearr[2]) { switch ($typearr[2]) {
case 'alpha_bitfield_constant_introducer':
$before = ' ';
$after = '';
break;
case 'white_newline': case 'white_newline':
$before = ''; $before = '';
break; break;
@@ -2417,7 +2424,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// the @ is incorrectly marked as alpha_variable // the @ is incorrectly marked as alpha_variable
// in the parser, and here, the '%' gets a blank before, // in the parser, and here, the '%' gets a blank before,
// which is a syntax error // which is a syntax error
if ($typearr[1] != 'punct_user') { if ($typearr[1] != 'punct_user' && $typearr[1] != 'alpha_bitfield_constant_introducer') {
$before .= ' '; $before .= ' ';
} }
if ($infunction && $typearr[3] == 'punct_bracket_close_round') { if ($infunction && $typearr[3] == 'punct_bracket_close_round') {