BUGFIX #5315 FileSubsites::augmentSQL() should not apply ordering when doing COUNT() selects, as this breaks some databases like SQL Server

This commit is contained in:
Sean Harvey 2010-04-12 04:04:15 +00:00
parent 8ee35be254
commit c3b20fd3bd

View File

@ -57,8 +57,10 @@ class FileSubsites extends DataObjectDecorator {
break;
}
// Ordering when deleting doesn't make sense
if(!$query->delete) {
$isCounting = strpos($query->select[0], 'COUNT') !== false;
// Ordering when deleting or counting doesn't apply
if(!$query->delete && !$isCounting) {
$query->orderby = "\"SubsiteID\"" . ($query->orderby ? ', ' : '') . $query->orderby;
}
}