The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
refactor(storage): improve sql query formatting and structure
Steven Enamakel49cce9c1dbfc
diff --git a/crates/openhuman-core/src/storage/import/scope_move.rs b/crates/openhuman-core/src/storage/import/scope_move.rsindex 7687ecf1a9..51247b6d56 100644--- a/crates/openhuman-core/src/storage/import/scope_move.rs+++ b/crates/openhuman-core/src/storage/import/scope_move.rs@@ -93,9 +93,12 @@ impl LegacyScopeInventory {// Admission rows are the authoritative inventory for v1 scopes that// happen to have no documents, streams, or blobs yet.if table_exists(&conn, "_tsd_scope_admissions")? {- let mut statement = conn.prepare("SELECT scope FROM _tsd_scope_admissions ORDER BY scope")?;+ let mut statement =+ conn.prepare("SELECT scope FROM _tsd_scope_admissions ORDER BY scope")?;let rows = statement.query_map([], |row| row.get::<_, String>(0))?;- for row in rows { scopes.insert(row?); }+ for row in rows {+ scopes.insert(row?);+ }}if table_exists(&conn, "docs")? {@@ -106,13 +109,19 @@ impl LegacyScopeInventory {}}let select = |name: &str, fallback: &str| {- if columns.contains(name) { format!("\"{name}\"") } else { fallback.to_owned() }+ if columns.contains(name) {+ format!("\"{name}\"")+ } else {+ fallback.to_owned()+ }};let sql = format!("SELECT scope, coll, id, {}, {}, {}, {}, {}, bodyFROM docs ORDER BY scope, coll, id",- select("schema", "0"), select("created_ms", "0"),- select("updated_ms", "0"), select("expires_ms", "NULL"),+ select("schema", "0"),+ select("created_ms", "0"),+ select("updated_ms", "0"),+ select("expires_ms", "NULL"),select("deleted", "0"),);let mut statement = conn.prepare(&sql)?;@@ -169,11 +178,16 @@ impl LegacyScopeInventory {}}let select = |name: &str, fallback: &str| {- if columns.contains(name) { format!("\"{name}\"") } else { fallback.to_owned() }+ if columns.contains(name) {+ format!("\"{name}\"")+ } else {+ fallback.to_owned()+ }};let sql = format!("SELECT scope, name, base, len, {}, {} FROM stream_heads ORDER BY scope, name",- select("sealed", "0"), select("sealed_ms", "NULL"),+ select("sealed", "0"),+ select("sealed_ms", "NULL"),);let mut statement = conn.prepare(&sql)?;let rows = statement.query_map([], |row| {@@ -201,9 +215,8 @@ impl LegacyScopeInventory {bail!("legacy streams table is missing required column `{required}`");}}- let mut statement = conn.prepare(- "SELECT scope, name, seq, body FROM streams ORDER BY scope, name, seq",- )?;+ let mut statement = conn+ .prepare("SELECT scope, name, seq, body FROM streams ORDER BY scope, name, seq")?;let rows = statement.query_map([], |row| {Ok((row.get::<_, String>(0)?,@@ -258,11 +271,16 @@ impl LegacyScopeInventory {}}let select = |name: &str, fallback: &str| {- if columns.contains(name) { format!("\"{name}\"") } else { fallback.to_owned() }+ if columns.contains(name) {+ format!("\"{name}\"")+ } else {+ fallback.to_owned()+ }};let sql = format!("SELECT scope, key, {}, {}, bytes FROM blobs ORDER BY scope, key",- select("content_type", "NULL"), select("expires_ms", "NULL"),+ select("content_type", "NULL"),+ select("expires_ms", "NULL"),);let mut statement = conn.prepare(&sql)?;let rows = statement.query_map([], |row| {@@ -300,7 +318,10 @@ fn table_exists(conn: &Connection, name: &str) -> rusqlite::Result<bool> {}fn table_columns(conn: &Connection, table: &str) -> rusqlite::Result<HashSet<String>> {- let mut statement = conn.prepare(&format!("PRAGMA table_info(\"{}\")", table.replace('"', "\"\"")))?;+ let mut statement = conn.prepare(&format!(+ "PRAGMA table_info(\"{}\")",+ table.replace('"', "\"\"")+ ))?;let rows = statement.query_map([], |row| row.get::<_, String>(1))?;rows.collect()}diff --git a/crates/openhuman-core/src/storage/scope_move.rs b/crates/openhuman-core/src/storage/scope_move.rsindex e9ee86832e..080ac17527 100644--- a/crates/openhuman-core/src/storage/scope_move.rs+++ b/crates/openhuman-core/src/storage/scope_move.rs@@ -170,9 +170,15 @@ pub async fn copy_inventory(let mut report = MoveReport::default();let mut source_scopes: Vec<&str> = inventory.scopes.iter().map(String::as_str).collect();- for row in &inventory.documents { source_scopes.push(&row.scope); }- for row in &inventory.streams { source_scopes.push(&row.scope); }- for row in &inventory.blobs { source_scopes.push(&row.scope); }+ for row in &inventory.documents {+ source_scopes.push(&row.scope);+ }+ for row in &inventory.streams {+ source_scopes.push(&row.scope);+ }+ for row in &inventory.blobs {+ source_scopes.push(&row.scope);+ }source_scopes.sort_unstable();source_scopes.dedup();for source in source_scopes {