zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-07 17:17:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase - Broken tab

Browse Source
This commit is contained in:
Mikayla Maki 2022-10-19 09:33:16 -07:00
parent ea03b48243
commit 72c1ee904b
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crates/db/src/items.rs
View File

@ -148,18 +148,38 @@ impl Db {
let tx = lock.transaction()?; let tx = lock.transaction()?;
// When working with transactions in rusqlite, need to make this kind of scope // When working with transactions in rusqlite, need to make this kind of scope
// To make the borrow stuff work correctly. Don't know why, rust is wild. // To make the borrow stuff work correctly. Don't know why, rust is wild.
let result = { let result = {
let mut editors_stmt = tx.prepare_cached( let mut read_editors = tx
r#" .prepare_cached(
r#"
SELECT items.id, item_path.path SELECT items.id, item_path.path
FROM items FROM items
LEFT JOIN item_path LEFT JOIN item_path
ON items.id = item_path.item_id ON items.id = item_path.item_id
WHERE items.kind = ?; WHERE items.kind = "Editor";
"#, "#r,
)?; )?
.query_map([], |row| {
let buf: Vec<u8> = row.get(2)?;
let path: PathBuf = OsStr::from_bytes(&buf).into();
Ok(SerializedItem::Editor(id, path))
})?;
let mut read_stmt = tx.prepare_cached(
"
SELECT items.id, items.kind, item_path.path, item_query.query
FROM items
LEFT JOIN item_path
ON items.id = item_path.item_id
LEFT JOIN item_query
ON items.id = item_query.item_id
WHERE
ORDER BY items.id;
",
)?;
let editors_iter = editors_stmt.query_map( let editors_iter = editors_stmt.query_map(
[SerializedItemKind::Editor.to_string()], [SerializedItemKind::Editor.to_string()],