Disable SQL export when applying functions in select

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 7856033077298298a8053da48a3eb6ca462c73b8..fbc0d19d2433328682dc2f2caddcd3b84ac8672c 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -472,6 +472,12 @@ if (!$columns) {
 <?php
                        }
                        $format = $adminer->dumpFormat();
+                       foreach ((array) $_GET["columns"] as $column) {
+                               if ($column["fun"]) {
+                                       unset($format['sql']);
+                                       break;
+                               }
+                       }
                        if ($format) {
                                print_fieldset("export", lang('Export'));
                                $output = $adminer->dumpOutput();

diff --git a/changes.txt b/changes.txt
index 641a627ee89b741fb0eb397b9f47e4bc910f2168..b71301371de0318b7e255e1f8c7c1753ee9bc363 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 3.6.5-dev:
 Print run time next to executed queries
+Disable SQL export when applying functions in select
 Fix handling of POINT data type (bug #3582578)
 Don't export binary and geometry columns twice in select