From e3310672d209734889e8adafe16f86a44a7836d8 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Tue, 18 Aug 2009 09:19:54 +0000 Subject: [PATCH] Move apply_sql_function git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@976 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/functions.inc.php | 4 ++++ adminer/select.inc.php | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index fd499834..a0e297bd 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -359,6 +359,10 @@ function dump_csv($row) { echo implode(",", $row) . "\n"; } +function apply_sql_function($function, $column) { + return ($function ? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)" : $column); +} + function is_email($email) { $atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name $domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component diff --git a/adminer/select.inc.php b/adminer/select.inc.php index d1127664..2f2eacbe 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -16,13 +16,6 @@ foreach ($fields as $key => $field) { $rights += $field["privileges"]; } -function apply_sql_function($function, $column) { - return ($function - ? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)" - : $column - ); -} - list($select, $group) = $adminer->selectColumnsProcess($columns, $indexes); $where = $adminer->selectSearchProcess($fields, $indexes); $order = $adminer->selectOrderProcess($fields, $indexes);