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

bug #3477063 [edit] Missing set fields and values in generated INSERT query

Browse Source
This commit is contained in:
Madhura Jayaratne
2012-01-22 11:55:28 +05:30
parent 5da1aaa0fe
commit 3c7b233d9c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
- bug #3463933 [display] SELECT DISTINCT displays wrong total records found - bug #3463933 [display] SELECT DISTINCT displays wrong total records found
- patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
- bug #3469254 [edit] Setting data to NULL and drop-downs - bug #3469254 [edit] Setting data to NULL and drop-downs
- bug #3477063 [edit] Missing set fields and values in generated INSERT query
3.4.9.0 (2011-12-21) 3.4.9.0 (2011-12-21)
- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown

2
libraries/tbl_replace_fields.inc.php
View File

@@ -79,6 +79,8 @@ if (false !== $possibly_uploaded_val) {
if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) {
$val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]);
$val = "'" . PMA_sqlAddslashes($val) . "'"; $val = "'" . PMA_sqlAddslashes($val) . "'";
} else {
$val = "''";
} }
} elseif ($type == 'protected') { } elseif ($type == 'protected') {
// here we are in protected mode (asked in the config) // here we are in protected mode (asked in the config)

7
tbl_replace.php
View File

@@ -218,7 +218,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
if ($is_insert && $using_key && isset($me_fields_type) && is_array($me_fields_type) && isset($where_clause)) { if ($is_insert && $using_key && isset($me_fields_type) && is_array($me_fields_type) && isset($where_clause)) {
$prot_row = PMA_DBI_fetch_single_row('SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $where_clause . ';'); $prot_row = PMA_DBI_fetch_single_row('SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $where_clause . ';');
} }
// When a select field is nullified, it's not present in $_REQUEST // When a select field is nullified, it's not present in $_REQUEST
// so initialize it; this way, the foreach($me_fields) will process it // so initialize it; this way, the foreach($me_fields) will process it
foreach ($me_fields_name as $key => $val) { foreach ($me_fields_name as $key => $val) {
@@ -227,7 +227,10 @@ foreach ($loop_array as $rownumber => $where_clause) {
} }
} }
foreach ($me_fields as $key => $val) { // Iterate in the order of $me_fields_name, not $me_fields, to avoid problems
// when inserting multiple entries
foreach ($me_fields_name as $key => $field_name) {
$val = $me_fields[$key];
// Note: $key is an md5 of the fieldname. The actual fieldname is available in $me_fields_name[$key] // Note: $key is an md5 of the fieldname. The actual fieldname is available in $me_fields_name[$key]