diff options
| -rw-r--r-- | includes/database/select.inc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/includes/database/select.inc b/includes/database/select.inc index 633965dcc..ef0455fca 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -568,6 +568,12 @@ class SelectQueryExtender implements SelectQueryInterface { $expressions =& $count->getExpressions(); $expressions = array(); + // Also remove 'all_fields' statements, which are expanded into tablename.* + // when the query is executed. + foreach ($count->tables as $alias => &$table) { + unset($table['all_fields']); + } + // Ordering a count query is a waste of cycles, and breaks on some // databases anyway. $orders = &$count->getOrderBy(); @@ -1030,6 +1036,13 @@ class SelectQuery extends Query implements SelectQueryInterface { $expressions =& $count->getExpressions(); $expressions = array(); + + // Also remove 'all_fields' statements, which are expanded into tablename.* + // when the query is executed. + foreach ($count->tables as $alias => &$table) { + unset($table['all_fields']); + } + // Ordering a count query is a waste of cycles, and breaks on some // databases anyway. $orders = &$count->getOrderBy(); |