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

Bug #3194559 Error when editing records with geometry fields. Editing geometry fields disabled till GIS data is officially supported in PMA. Refer Bug #3038193

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-03-27 02:50:04 +05:30
parent 68eaccee9e
commit 0ac18e564a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tbl_change.php
View File

@@ -537,6 +537,9 @@ foreach ($rows as $row_id => $vrow) {
$idindex = ($o_rows * $fields_cnt) + $i + 1; $idindex = ($o_rows * $fields_cnt) + $i + 1;
$tabindex = $idindex; $tabindex = $idindex;
// These GIS data types are not yet supported.
$no_support_types = array('geometry', 'point', 'linestring', 'polygon', 'multipoint', 'multilinestring', 'multipolygon', 'geometrycollection');
// The function column // The function column
// ------------------- // -------------------
// We don't want binary data to be destroyed // We don't want binary data to be destroyed
@@ -547,7 +550,7 @@ foreach ($rows as $row_id => $vrow) {
if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload)
|| ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) {
echo ' <td align="center">' . __('Binary') . '</td>' . "\n"; echo ' <td align="center">' . __('Binary') . '</td>' . "\n";
} elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || 'geometry' == $field['pma_type']) { } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || in_array($field['pma_type'], $no_support_types)) {
echo ' <td align="center">--</td>' . "\n"; echo ' <td align="center">--</td>' . "\n";
} else { } else {
?> ?>
@@ -965,7 +968,7 @@ foreach ($rows as $row_id => $vrow) {
} // end if (web-server upload directory) } // end if (web-server upload directory)
} // end elseif (binary or blob) } // end elseif (binary or blob)
elseif ('geometry' == $field['pma_type']) { elseif (in_array($field['pma_type'], $no_support_types)) {
// ignore this column to avoid changing it // ignore this column to avoid changing it
} }
else { else {