Skip to content

[stable34] fix(background-jobs): preserve Snowflake IDs as strings #62457

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.

Sign up for GitHub

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

Open
backportbot wants to merge 3 commits into
base: stable34
Choose a base branch
from
+26 −6
Open

[stable34] fix(background-jobs): preserve Snowflake IDs as strings #62457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2f4c26
fix(background-jobs): bind Snowflake job IDs as strings
joshtrichards Jul 22, 2026
6061ff1
fix(dav): bind Snowflake job IDs as strings in UserStatusAutomation
joshtrichards Jul 22, 2026
ec7c6a6
test(background-jobs): cover string-bound Snowflake job IDs
joshtrichards Jul 22, 2026
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
2 changes: 1 addition & 1 deletion apps/dav/lib/BackgroundJob/UserStatusAutomation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected function setLastRunToNextToggleTime(string $userId, int $timestamp): v

$query->update('jobs')
->set('last_run', $query->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
->where($query->expr()->eq('id', $query->createNamedParameter($this->getId())));
$query->executeStatement();

$this->logger->debug('Updated user status automation last_run to ' . $timestamp . ' for user ' . $userId);
Expand Down
10 changes: 5 additions & 5 deletions lib/private/BackgroundJob/JobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function remove(IJob|string $job, mixed $argument = null): void {
public function removeById(string $id): void {
$query = $this->connection->getQueryBuilder();
$query->delete('jobs')
->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
->where($query->expr()->eq('id', $query->createNamedParameter($id)));
$query->executeStatement();
}

Expand Down Expand Up @@ -265,7 +265,7 @@ public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = nu
$reset->update('jobs')
->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'])));
$reset->executeStatement();

// Background job from disabled app, try again.
Expand Down Expand Up @@ -358,7 +358,7 @@ public function unlockJob(IJob $job): void {
$query = $this->connection->getQueryBuilder();
$query->update('jobs')
->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));
$query->executeStatement();
}

Expand All @@ -383,7 +383,7 @@ public function setExecutionTime(IJob $job, $timeTaken): void {
$query->update('jobs')
->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));
$query->executeStatement();
}

Expand All @@ -393,7 +393,7 @@ public function resetBackgroundJob(IJob $job): void {
$query->update('jobs')
->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT));
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));
$query->executeStatement();
}

Expand Down
20 changes: 20 additions & 0 deletions tests/lib/BackgroundJob/JobListTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,26 @@ public function testSetLastRun(): void {
$this->assertLessThanOrEqual($timeEnd, $addedJob->getLastRun());
}

public function testRemoveByIdWithSnowflakeId(): void {
$this->instance->add(new TestJob(), 'remove-by-id');
$job = $this->instance->getJobs(null, 1, 0)[0];

$this->instance->removeById($job->getId());

$this->assertNull($this->instance->getById($job->getId()));
}

public function testResetBackgroundJobWithSnowflakeId(): void {
$this->instance->add(new TestJob(), 'reset');
$job = $this->instance->getJobs(null, 1, 0)[0];

$this->instance->resetBackgroundJob($job);

$row = $this->instance->getDetailsById($job->getId());
$this->assertSame('0', (string)$row['last_run']);
$this->assertSame('0', (string)$row['reserved_at']);
}

public function testHasReservedJobs(): void {
$this->clearJobsList();

Expand Down
Loading