Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#459786 by DamZ: Remove all_fields from extended queries to prevent breaking under PostgreSQL and certain MySQL versions.

merge-requests/26/head
Angie Byron 2009-05-11 20:13:43 +00:00
parent 6445ba5986
commit a81eaade50
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
includes/database/select.inc
View File

@ -568,6 +568,12 @@ class SelectQueryExtender implements SelectQueryInterface {
$expressions =& $count->getExpressions(); $expressions =& $count->getExpressions();
$expressions = array(); $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 // Ordering a count query is a waste of cycles, and breaks on some
// databases anyway. // databases anyway.
$orders = &$count->getOrderBy(); $orders = &$count->getOrderBy();
@ -1030,6 +1036,13 @@ class SelectQuery extends Query implements SelectQueryInterface {
$expressions =& $count->getExpressions(); $expressions =& $count->getExpressions();
$expressions = array(); $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 // Ordering a count query is a waste of cycles, and breaks on some
// databases anyway. // databases anyway.
$orders = &$count->getOrderBy(); $orders = &$count->getOrderBy();