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

Browsing a table containing geometry columns

Browse Source
This commit is contained in:
Marc Delisle
2010-10-03 09:20:32 -04:00
parent 22fa5adee3
commit 1623c7e065
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -529,7 +529,7 @@ function PMA_DBI_get_fields_meta($result)
// so this would override TINYINT and mark all TINYINT as string // so this would override TINYINT and mark all TINYINT as string
// https://sf.net/tracker/?func=detail&aid=1532111&group_id=23067&atid=377408 // https://sf.net/tracker/?func=detail&aid=1532111&group_id=23067&atid=377408
//$typeAr[MYSQLI_TYPE_CHAR] = 'string'; //$typeAr[MYSQLI_TYPE_CHAR] = 'string';
$typeAr[MYSQLI_TYPE_GEOMETRY] = 'unknown'; $typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry';
$typeAr[MYSQLI_TYPE_BIT] = 'bit'; $typeAr[MYSQLI_TYPE_BIT] = 'bit';
$fields = mysqli_fetch_fields($result); $fields = mysqli_fetch_fields($result);

8
libraries/display_tbl.lib.php
View File

@@ -1343,6 +1343,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">&nbsp;</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">&nbsp;</td>' . "\n";
} }
} }
// g e o m e t r y
} elseif ($meta->type == 'geometry') {
$geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta);
$vertical_display['data'][$row_no][$i] = ' <td align="left"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $geometry_text . '</td>';
unset($geometry_text);
// n o t n u m e r i c a n d n o t B L O B // n o t n u m e r i c a n d n o t B L O B
} else { } else {
if (!isset($row[$i]) || is_null($row[$i])) { if (!isset($row[$i]) || is_null($row[$i])) {
@@ -2246,7 +2252,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
* @uses PMA_formatByteDown() * @uses PMA_formatByteDown()
* @uses strpos() * @uses strpos()
* @uses str_replace() * @uses str_replace()
* @param string $category BLOB|BINARY * @param string $category BLOB|BINARY|GEOMETRY
* @param string $content the binary content * @param string $content the binary content
* @param string $transform_function * @param string $transform_function
* @param string $transform_options * @param string $transform_options