File oss-moodle-postgresql-order-by.patch of Package oss-moodle

Overview Repositories Revisions Requests Users Attributes Meta

File oss-moodle-postgresql-order-by.patch of Package oss-moodle (Revision e837b33a4613bdcc2ce60ce47eeeb92d)

Currently displaying revision e837b33a4613bdcc2ce60ce47eeeb92d , Show latest

diff -up ./blocks/quickmail/classes/repos/notification_repo.php.orig ./blocks/quickmail/classes/repos/notification_repo.php
--- ./blocks/quickmail/classes/repos/notification_repo.php.orig	2019-10-16 14:03:10.000000000 +0200
+++ ./blocks/quickmail/classes/repos/notification_repo.php	2019-11-03 09:25:03.380304710 +0100
@@ -143,8 +143,11 @@ class notification_repo extends repo imp
             $sql .= ' AND n.user_id = :user_id';
         }
 
-        $sql .= ' AND n.timedeleted = 0 
-                 ORDER BY ' . $sort_by . ' ' . $sort_dir;
+        $sql .= ' AND n.timedeleted = 0';
+
+        if (! $as_count) {
+            $sql .= ' ORDER BY ' . $sort_by . ' ' . $sort_dir;
+        }
 
         return $sql;
     }
diff -up ./blocks/quickmail/classes/repos/queued_repo.php.orig ./blocks/quickmail/classes/repos/queued_repo.php
--- ./blocks/quickmail/classes/repos/queued_repo.php.orig	2019-10-16 14:03:10.000000000 +0200
+++ ./blocks/quickmail/classes/repos/queued_repo.php	2019-11-03 09:24:33.172480694 +0100
@@ -193,7 +193,11 @@ class queued_repo extends repo implement
 			$sql .= ' AND m.course_id = :course_id';
 		}
 							
-		$sql .= ' AND m.to_send_at <> 0 AND m.timedeleted = 0 AND m.sent_at = 0 AND m.is_draft = 0 ORDER BY ' . $sort_by . ' ' . $sort_dir;
+		$sql .= ' AND m.to_send_at <> 0 AND m.timedeleted = 0 AND m.sent_at = 0 AND m.is_draft = 0';
+
+		if (!$as_count) {
+			$sql .= ' ORDER BY ' . $sort_by . ' ' . $sort_dir;
+		}
 
 		return $sql;
 	}
diff -up ./blocks/quickmail/classes/repos/sent_repo.php.orig ./blocks/quickmail/classes/repos/sent_repo.php
--- ./blocks/quickmail/classes/repos/sent_repo.php.orig	2019-10-16 14:03:10.000000000 +0200
+++ ./blocks/quickmail/classes/repos/sent_repo.php	2019-11-03 09:21:23.725583297 +0100
@@ -126,9 +126,13 @@ class sent_repo extends repo implements
         if ($course_id) {
             $sql .= ' AND m.course_id = :course_id';
         }
-                  
-        $sql .= ' AND m.is_draft = 0 AND m.timedeleted = 0 AND m.sent_at > 0 ORDER BY ' . $sort_by . ' ' . $sort_dir;
+                  
+        $sql .= ' AND m.is_draft = 0 AND m.timedeleted = 0 AND m.sent_at > 0';
 
+        if (! $as_count) {
+            $sql .= ' ORDER BY ' . $sort_by . ' ' . $sort_dir;
+        }
+        
         return $sql;
     }

Places

File oss-moodle-postgresql-order-by.patch of Package oss-moodle (Revision e837b33a4613bdcc2ce60ce47eeeb92d)

Places