Rename distinct to count distinct

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@975 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 9e9f8070c5bc977dd5b7c30c9b6825f4ee363ca9..461c896b0231c290ccce8eb4e39217909b7782c3 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1,7 +1,7 @@
 <?php
 class Adminer {
        var $functions = array("char_length", "from_unixtime", "hex", "lower", "round", "sec_to_time", "time_to_sec", "unix_timestamp", "upper");
-       var $grouping = array("avg", "count", "distinct", "group_concat", "max", "min", "sum"); // distinct is short for COUNT(DISTINCT)
+       var $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
        var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "REGEXP", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL");
        
        /** Name in title and navigation

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 2daaf4286076d270602b74be771abb195161fe19..d112766483d5865fbbe3774a93124b7de30a4b79 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -18,7 +18,7 @@ foreach ($fields as $key => $field) {
 
 function apply_sql_function($function, $column) {
        return ($function
-               ? ($function == "distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)"
+               ? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)"
                : $column
        );
 }