diff --git includes/database.inc includes/database.inc
index 0b5ead4..ffd23a5 100644
--- includes/database.inc
+++ includes/database.inc
@@ -62,7 +62,7 @@ define('DB_ERROR', 'a515ac9c2796ca0e23adbe92c68fc9fc');
  *      query: the SQL query executed, passed through check_plain()
  */
 function update_sql($sql) {
-  $result = db_query($sql, true);
+  $result = db_query($sql, TRUE);
   return array('success' => $result !== FALSE, 'query' => check_plain($sql));
 }
 
diff --git includes/database.mysql.inc includes/database.mysql.inc
index 43342e9..a06bd17 100644
--- includes/database.mysql.inc
+++ includes/database.mysql.inc
@@ -365,7 +365,7 @@ function db_distinct_field($table, $field, $query) {
   $matches = array();
   if (preg_match('/^SELECT(.*?)FROM(.*)/is', $query, $matches)) {
     $select = preg_replace(
-      '/((?:^|,)\s*)(?<!DISTINCT\()(?:'. $table .'\.)?'. $field .'(\s*(?:,|$))/is',
+      '/((?:^|,|\()\s*)(?<!DISTINCT\()(?:'. $table .'\.)?'. $field .'(\s*(?:,|\sAS|\)|$))/is',
       '\1'. $field_to_select .'\2', $matches[1], 1
     );
     
diff --git includes/database.mysqli.inc includes/database.mysqli.inc
index a2415a1..8929630 100644
--- includes/database.mysqli.inc
+++ includes/database.mysqli.inc
@@ -367,11 +367,11 @@ function db_distinct_field($table, $field, $query) {
   $matches = array();
   if (preg_match('/^SELECT(.*?)FROM(.*)/is', $query, $matches)) {
     $select = preg_replace(
-      '/((?:^|,)\s*)(?<!DISTINCT\()(?:'. $table .'\.)?'. $field .'(\s*(?:,|$))/is',
+      '/((?:^|,|\()\s*)(?<!DISTINCT\()(?:'. $table .'\.)?'. $field .'(\s*(?:,|\sAS|\)|$))/is',
       '\1'. $field_to_select .'\2', $matches[1], 1
     );
     
-    return 'SELECT'. $select .'FROM'.$matches[2];
+    return 'SELECT'. $select .'FROM'. $matches[2];
   }
   return $query;
 }
diff --git includes/database.pgsql.inc includes/database.pgsql.inc
index 92a0822..9f2c836 100644
--- includes/database.pgsql.inc
+++ includes/database.pgsql.inc
@@ -419,13 +419,68 @@ function db_check_setup() {
  * @return SQL query with the DISTINCT wrapper surrounding the given table.field.
  */
 function db_distinct_field($table, $field, $query) {
+  // The first regex tries to avoids touching the query if we have a subquery
+  // The second regex avoids messing with the query if there is already a
+  // DISTINCT on the whole query (to respect the function documentation).
+  // This may or may not be a good idea, but we leave it as is for now.
   if (!preg_match('/FROM\s+\S+\s+AS/si', $query)
-  && !preg_match('/DISTINCT\s+ON\s*\(\s*(' . $table . '\s*\.\s*)?' . $field . '\s*\)/si', $query)
-  && !preg_match('/DISTINCT[ (]' . $field . '/si', $query)
-  && preg_match('/(.*FROM\s+)(.*?\s)(\s*(WHERE|GROUP|HAVING|ORDER|LIMIT|FOR).*)/Asi', $query, $m)) {
-    $query = $m[1];
-    $query .= preg_replace('/([\{\w+\}]+)\s+(' . $table . ')\s/Usi', '(SELECT DISTINCT ON (' . $field . ') * FROM \1) \2 ', $m[2]);
-    $query .= $m[3];
+  && !preg_match('/DISTINCT\s+ON\s*\(\s*('. $table .'\s*\.\s*)?'. $field .'\s*\)/si', $query)) {
+    $matches = array();
+    if (preg_match('/DISTINCT[ (]'. preg_quote($table .'.'. $field) .'/si', $query, $matches)) {
+      // We should replace DISTINCT(), which doesn't do anything different than
+      // DISTINCT on the whole query with a DISTINCT ON. ().  However, as
+      // DISTINCT() never works as developers seem to understand it on either
+      // MySql or PostgreSQL (at least in postgres 8.4.1 and MySQL 5.1.37),
+      // this could cause unintended regressions, and there is no similar
+      // solution for MySql anyway.
+      // So we leave the query as is for now.
+      ;
+    }
+    else {
+      $qualified_primary_field = $table .'.'. $field;
+
+      $regex = '/^SELECT\s+(.*?)\s+FROM\s+(.*?)(ORDER BY\s+(.*?))?(LIMIT.*|OFFSET.*|\s*$)/is';
+      if (preg_match($regex, $query, $matches)) {
+        //$matches[1] is the select list
+        //$matches[2] is everything after FROM and before ORDER BY
+        //$matches[3] is the order by as a whole (if it exists)
+        //$matches[4] is the order by content (if it exists)
+        //$matches[5] is the rest of the query
+
+        // If there is an ORDER BY, modify it to make sure that the primary
+        // field is at the begining (Postgres must have the content of
+        // distinct on at the begining of the order by (if there is an ORDER
+        // BY)
+        if (!empty($matches[3])) {
+          $order_by_elements = preg_split('/\s*,\s*/', $matches[4]);
+          $key_found = FALSE;
+          foreach ($order_by_elements as $key => $value) {
+            if (strstr($value, $qualified_primary_field)) {
+              $key_found = $key;
+              break;
+            }
+          }
+          if ($key_found !== FALSE) {
+            $prepend_to_order_by = $order_by_elements[$key_found];
+            unset($order_by_elements[$key_found]);
+          }
+          else {
+            $prepend_to_order_by = $qualified_primary_field;
+          }
+          array_unshift($order_by_elements, $prepend_to_order_by);
+          $order_by = 'ORDER BY '. implode(', ', $order_by_elements);
+        }
+        else {
+          $order_by = '';
+        }
+        $field_to_select = 'DISTINCT ON ('. $qualified_primary_field .') '. $qualified_primary_field;
+        $field_to_select_count = 'DISTINCT('. $qualified_primary_field .')';
+        $patterns = array('/'. preg_quote($qualified_primary_field) .'(?=\s|,|$)/', '/(?<=COUNT\()'. preg_quote($qualified_primary_field) . '(?=\))/');
+        $replacements = array($field_to_select, $field_to_select_count);
+        $select_list_replacement = preg_replace($patterns, $replacements, $matches[1]);
+        $query = preg_replace($regex, "SELECT $select_list_replacement FROM \\2$order_by\\5", $query);
+      }
+    }
   }
   return $query;
 }