Skip to content

fix(db): resolve relaunch merge integration conflicts #416

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

Merged
harlan-zw merged 1 commit into from
Oct 5, 2026
Merged

fix(db): resolve relaunch merge integration conflicts #416

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
0 ...tions/0137_repository_identity_nocase.sql → ...tions/0138_repository_identity_nocase.sql
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions test/unit/starred-repository-identity.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ describe('starred repository identity', () => {
d1.raw.exec(`
INSERT OR REPLACE INTO users (id, github_id, login, created_at, last_login_at, onboarded_at) VALUES (1, 11, 'test-user', 1, 1, 1);
INSERT INTO repos (owner, repo, repo_kind, default_branch) VALUES ('leonxlnx', 'taste-skill', 'catalog', 'main');
INSERT INTO skills (owner, repo, name, slug, display_name, current_sha, rendered_skill_path)
VALUES ('leonxlnx', 'taste-skill', 'brandkit', 'leonxlnx/taste-skill/brandkit', 'Brandkit', 'blob', 'skills/brandkit/SKILL.md');
INSERT INTO skills (owner, repo, name, slug, display_name, current_sha, rendered_skill_path, source_resolved)
VALUES ('leonxlnx', 'taste-skill', 'brandkit', 'leonxlnx/taste-skill/brandkit', 'Brandkit', 'blob', 'skills/brandkit/SKILL.md', 1);
INSERT INTO activity (id, owner, repo, name, type, occurred_at, ingested_at, sha) VALUES (1, 'leonxlnx', 'taste-skill', 'brandkit', 'skill_updated', 10, 10, 'blob');
`)
vi.stubGlobal('defineEventHandler', (handler: EventHandler) => handler)
Expand Down