]> git.joonet.de Git - adminer.git/commitdiff
Apply text length on geometry data
authorJakub Vrana <jakub@vrana.cz>
Sun, 9 Sep 2012 17:19:07 +0000 (10:19 -0700)
committerJakub Vrana <jakub@vrana.cz>
Sun, 9 Sep 2012 17:19:07 +0000 (10:19 -0700)
adminer/select.inc.php

index 18bda99e93d244815e11f61a6440ef89cd7d8597..e8b28c102569770e986552d36b00859285dabdee 100644 (file)
@@ -18,7 +18,7 @@ foreach ($fields as $key => $field) {
        $name = $adminer->fieldName($field);
        if (isset($field["privileges"]["select"]) && $name != "") {
                $columns[$key] = html_entity_decode(strip_tags($name));
-               if (ereg('text|lob', $field["type"])) {
+               if (ereg('text|lob|geometry|point|linestring|polygon', $field["type"])) {
                        $text_length = $adminer->selectLengthProcess();
                }
        }
@@ -349,7 +349,7 @@ if (!$columns) {
                                                        if ($val === "") { // === - may be int
                                                                $val = "&nbsp;";
                                                        } elseif (is_utf8($val)) {
-                                                               if ($text_length != "" && ereg('text|blob', $field["type"])) {
+                                                               if ($text_length != "" && ereg('text|lob|geometry|point|linestring|polygon', $field["type"])) {
                                                                        $val = shorten_utf8($val, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
                                                                } else {
                                                                        $val = h($val);