Skip to content

fix: gracefully handle missing workspace.branch column after OpenCode v2 migration #22

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
bet4it wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: gracefully handle missing workspace.branch column after OpenCode v2 migration #22

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
11 changes: 6 additions & 5 deletions src-tauri/src/providers/opencode/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,18 +289,19 @@ impl SessionProvider for OpenCodeProvider {
}
}

// Batch: git branch per session from workspace
// Batch: git branch per session from workspace. Only exists in
// OpenCode v1's schema; v2's `workspace` table replaces the columns
// with provider bindings, so the column is absent after a v2 run.
let mut branch_map: std::collections::HashMap<String, String> =
std::collections::HashMap::new();
{
// Check if workspace table exists
let has_workspace: bool = conn
let has_branch_col: bool = conn
.prepare(
"SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='workspace'",
"SELECT COUNT(*) FROM pragma_table_info('workspace') WHERE name = 'branch'",
)
.and_then(|mut s| s.query_row([], |row| row.get::<_, i64>(0)))?
> 0;
if has_workspace {
if has_branch_col {
let mut stmt = conn.prepare(
"SELECT s.id, w.branch
FROM session s
Expand Down