Skip to content

[6.x] Ensure Laravel support tables exist during upgrades - #19889

Merged
brandonkelly merged 4 commits into
6.xfrom
fix/missing-jobs-table
Oct 7, 2026
Merged

brandonkelly merged 4 commits into
6.xfrom
fix/missing-jobs-table

Conversation

@riasvdv

@riasvdv riasvdv commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

Description

Upgrading to Craft 6 could finish without creating Laravel’s queue and other supporting tables, causing subsequent requests to fail with a missing jobs table.

Share idempotent table setup between fresh installs and an early upgrade migration, covering password resets, cache and locks, queues, sessions, notifications, and Passport. Preserve existing host application tables and keep legacy password-verification column cleanup working when the token table already exists.

@github-actions

github-actions Bot commented Oct 7, 2026 •

Copy link
Copy Markdown

📚 Storybook previews

@craftcms/ui — open Storybook

No changed components detected in this Storybook.

resources/js — open Storybook

No changed components detected in this Storybook.

@riasvdv
riasvdv requested a review from brandonkelly October 7, 2026 18:29
@github-actions

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

I resolved the merge conflict and committed the merge as 875023e. Nothing was pushed.

CHANGELOG.md was the only file in conflict. Both sides had added a different entry under "Unreleased": this branch added the fix for missing Laravel queue and supporting tables (#19889), and 6.x added the fix for new control panel assets not being published during updates. The two entries don't overlap, so I kept both, with this branch's entry first. Nothing about it was ambiguous, so I didn't add any CONFLICT-REVIEW comments.

phpstan.neon and src/Support/Composer.php came in from 6.x without conflicts, and I left them as merged. I didn't run tests or composer ci on the result.

@brandonkelly
brandonkelly merged commit 3090afa into 6.x Oct 7, 2026
@brandonkelly
brandonkelly deleted the fix/missing-jobs-table branch October 7, 2026 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants