Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Postgresql COUNT and ORDER BY fixes. #289

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Postgresql COUNT and ORDER BY fixes. #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions classes/repos/notification_repo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,11 @@ private static function get_all_for_course_sql($courseid, $userid = null, $sortb
$sql .= ' AND n.user_id = :user_id';
}

$sql .= ' AND n.timedeleted = 0
ORDER BY ' . $sortby . ' ' . $sortdir;
$sql .= ' AND n.timedeleted = 0';

if (! $as_count) {
$sql .= ' ORDER BY ' . $sort_by . ' ' . $sort_dir;
}

return $sql;
}
Expand Down
13 changes: 8 additions & 5 deletions classes/repos/queued_repo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,14 @@ private static function get_for_user_sql($courseid, $sortby, $sortdir, $ascount
$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 ' . $sortby . ' ' . $sortdir;
$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;
}
Expand Down
6 changes: 5 additions & 1 deletion classes/repos/sent_repo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,12 @@ private static function get_for_user_sql($courseid, $sortby, $sortdir, $ascount
$sql .= ' AND m.course_id = :course_id';
}

$sql .= ' AND m.is_draft = 0 AND m.timedeleted = 0 AND m.sent_at > 0 ORDER BY ' . $sortby . ' ' . $sortdir;
$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;
}

Expand Down