From db208469891dba550193c55542e7b8ce6ce8631f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Mon, 21 Apr 2008 11:52:30 +0000 Subject: [PATCH] Fix: space missing in order syntax in database handlers --- htdocs/lib/databases/mssql.lib.php | 29 +++++++++++++++++++++++++++++ htdocs/lib/databases/mysql.lib.php | 2 +- htdocs/lib/databases/mysqli.lib.php | 2 +- htdocs/lib/databases/pgsql.lib.php | 2 +- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 33bcd5940d9..2865d6c1d69 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -499,6 +499,35 @@ class DoliDb } + /** + \brief D�fini le tri de la requ�te. + \param sortfield liste des champ de tri + \param sortorder ordre du tri + \return string chaine exprimant la syntax sql de l'ordre de tri + \TODO A mutualiser dans classe mere + */ + function order($sortfield=0,$sortorder=0) + { + if ($sortfield) + { + $return=''; + $fields=split(',',$sortfield); + foreach($fields as $val) + { + if (! $return) $return.=' ORDER BY '; + else $return.=','; + + $return.=$val; + if ($sortorder) $return.=' '.$sortorder; + } + return $return; + } + else + { + return ''; + } + } + /** \brief Formatage (par la base de donn�es) d'un champ de la base au format TMS ou Date (YYYY-MM-DD HH:MM:SS) afin de retourner une donn�e toujours au format universel date TMS unix. diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index 6638316a91b..c07b1fc3e89 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -506,7 +506,7 @@ class DoliDb $fields=split(',',$sortfield); foreach($fields as $val) { - if (! $return) $return.='ORDER BY '; + if (! $return) $return.=' ORDER BY '; else $return.=','; $return.=$val; diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 12a834c7ab3..af9300eba0a 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -521,7 +521,7 @@ class DoliDb $fields=split(',',$sortfield); foreach($fields as $val) { - if (! $return) $return.='ORDER BY '; + if (! $return) $return.=' ORDER BY '; else $return.=','; $return.=$val; diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index abf01f5d81a..972aee0d2fc 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -444,7 +444,7 @@ class DoliDb $fields=split(',',$sortfield); foreach($fields as $val) { - if (! $return) $return.='ORDER BY '; + if (! $return) $return.=' ORDER BY '; else $return.=','; $return.=$val; -- GitLab