GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-10 21:36:55 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

pass db json back as bytes

Browse source
This commit is contained in:
Damien Elmes 2020-06-12 20:20:29 +10:00
parent 2845941a28
commit cf6d4f1cb9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rslib/src/backend/dbproxy.rs
View file

@ -67,7 +67,7 @@ impl FromSql for SqlValue {
} }
} }
pub(super) fn db_command_bytes(ctx: &SqliteStorage, input: &[u8]) -> Result<String> { pub(super) fn db_command_bytes(ctx: &SqliteStorage, input: &[u8]) -> Result<Vec<u8>> {
let req: DBRequest = serde_json::from_slice(input)?; let req: DBRequest = serde_json::from_slice(input)?;
let resp = match req { let resp = match req {
DBRequest::Query { DBRequest::Query {
@ -95,7 +95,7 @@ pub(super) fn db_command_bytes(ctx: &SqliteStorage, input: &[u8]) -> Result<Stri
} }
DBRequest::ExecuteMany { sql, args } => db_execute_many(ctx, &sql, &args)?, DBRequest::ExecuteMany { sql, args } => db_execute_many(ctx, &sql, &args)?,
}; };
Ok(serde_json::to_string(&resp)?) Ok(serde_json::to_vec(&resp)?)
} }
pub(super) fn db_query_row(ctx: &SqliteStorage, sql: &str, args: &[SqlValue]) -> Result<DBResult> { pub(super) fn db_query_row(ctx: &SqliteStorage, sql: &str, args: &[SqlValue]) -> Result<DBResult> {

2
rslib/src/backend/mod.rs
View file

@ -1525,7 +1525,7 @@ impl Backend {
} }
} }
pub fn db_command(&self, input: &[u8]) -> Result<String> { pub fn db_command(&self, input: &[u8]) -> Result<Vec<u8>> {
self.with_col(|col| db_command_bytes(&col.storage, input)) self.with_col(|col| db_command_bytes(&col.storage, input))
} }
} }

4
rspy/src/lib.rs
View file

@ -147,8 +147,8 @@ impl Backend {
.db_command(in_bytes) .db_command(in_bytes)
.map_err(|e| DBError::py_err(e.localized_description(&self.backend.i18n()))) .map_err(|e| DBError::py_err(e.localized_description(&self.backend.i18n())))
}); });
let out_string = out_res?; let out_bytes = out_res?;
let out_obj = PyBytes::new(py, out_string.as_bytes()); let out_obj = PyBytes::new(py, &out_bytes);
Ok(out_obj.into()) Ok(out_obj.into())
} }
} }