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

support for NO ACTION

Browse Source
This commit is contained in:
Marc Delisle
2003-09-05 17:40:47 +00:00
parent 49820ab5a3
commit d628a9aa66
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-09-05 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3: NO ACTION was not correctly treated
2003-09-03 Michal Cihar <nijel@users.sourceforge.net> 2003-09-03 Michal Cihar <nijel@users.sourceforge.net>
* lang/italian: Updated, thanks to Pietro Danesi (danone). * lang/italian: Updated, thanks to Pietro Danesi (danone).

13
libraries/sqlparser.lib.php3
View File

@@ -1383,7 +1383,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$foreign_key_number = -1; $foreign_key_number = -1;
for ($i = 0; $i < $size; $i++) { for ($i = 0; $i < $size; $i++) {
// DEBUG echo $arr[$i]['data'] . " " . $arr[$i]['type'] . "<br>"; // DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br>";
if ($arr[$i]['type'] == 'alpha_reservedWord') { if ($arr[$i]['type'] == 'alpha_reservedWord') {
$upper_data = strtoupper($arr[$i]['data']); $upper_data = strtoupper($arr[$i]['data']);
@@ -1421,7 +1421,16 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
if ($second_upper_data == 'UPDATE') { if ($second_upper_data == 'UPDATE') {
$clause = 'on_update'; $clause = 'on_update';
} }
if (isset($clause) && $arr[$i+2]['type'] == 'alpha_reservedWord') { if (isset($clause)
&& ($arr[$i+2]['type'] == 'alpha_reservedWord'
// ugly workaround because currently, NO is not
// in the list of reserved words in sqlparser.data
// (we got a bug report about not being able to use
// 'no' as an identifier)
|| ($arr[$i+2]['type'] == 'alpha_identifier'
&& strtoupper($arr[$i+2]['data'])=='NO') )
) {
$third_upper_data = strtoupper($arr[$i+2]['data']); $third_upper_data = strtoupper($arr[$i+2]['data']);
if ($third_upper_data == 'CASCADE' if ($third_upper_data == 'CASCADE'
|| $third_upper_data == 'RESTRICT') { || $third_upper_data == 'RESTRICT') {