From c3b20fd3bde8379e173f5a80d2649ed7d624788e Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 12 Apr 2010 04:04:15 +0000 Subject: [PATCH] BUGFIX #5315 FileSubsites::augmentSQL() should not apply ordering when doing COUNT() selects, as this breaks some databases like SQL Server --- code/FileSubsites.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/FileSubsites.php b/code/FileSubsites.php index b7b038c..7fb9779 100755 --- a/code/FileSubsites.php +++ b/code/FileSubsites.php @@ -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; } }