Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SqlParallel - Enable more tests. Fix compatiblity with release_time #22326

Merged
merged 1 commit into from
Dec 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CRM/Queue/Queue/SqlParallel.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,13 @@ public function claimItem($lease_time = 3600) {
$sql = "SELECT id, queue_name, submit_time, release_time, data
FROM civicrm_queue_item
WHERE queue_name = %1
AND release_time IS NULL
AND (release_time IS NULL OR release_time < %2)
ORDER BY weight ASC, id ASC
LIMIT 1
";
$params = [
1 => [$this->getName(), 'String'],
2 => [CRM_Utils_Time::getTime(), 'Timestamp'],
];
$dao = CRM_Core_DAO::executeQuery($sql, $params, TRUE, 'CRM_Queue_DAO_QueueItem');
if (is_a($dao, 'DB_Error')) {
Expand Down
6 changes: 6 additions & 0 deletions tests/phpunit/CRM/Queue/QueueTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ public function getQueueSpecs() {
'name' => 'test-queue',
],
];
$queueSpecs[] = [
[
'type' => 'SqlParallel',
'name' => 'test-queue-sqlparallel',
],
];
return $queueSpecs;
}

Expand Down