GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-24 18:06:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Comments and rustfmt

Browse source
This commit is contained in:
dbr 2021-04-29 11:01:46 +10:00
parent a3c9a76f1d
commit ff894f6ff6
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
taskchampion/src/storage/sqlite.rs
View file

@ -34,6 +34,7 @@ impl ToSql for StoredUuid {
/// Wraps [`TaskMap`] (type alias for HashMap) so we can implement rusqlite conversion traits for it /// Wraps [`TaskMap`] (type alias for HashMap) so we can implement rusqlite conversion traits for it
struct StoredTaskMap(TaskMap); struct StoredTaskMap(TaskMap);
/// Parses TaskMap stored as JSON in string column
impl FromSql for StoredTaskMap { impl FromSql for StoredTaskMap {
fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> { fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
let o: TaskMap = serde_json::from_str(value.as_str()?) let o: TaskMap = serde_json::from_str(value.as_str()?)
@ -42,6 +43,7 @@ impl FromSql for StoredTaskMap {
} }
} }
/// Stores TaskMap in string column
impl ToSql for StoredTaskMap { impl ToSql for StoredTaskMap {
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> { fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
let s = serde_json::to_string(&self.0) let s = serde_json::to_string(&self.0)
@ -50,7 +52,6 @@ impl ToSql for StoredTaskMap {
} }
} }
/// Stores [`Operation`] in SQLite /// Stores [`Operation`] in SQLite
impl FromSql for Operation { impl FromSql for Operation {
fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> { fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
@ -60,6 +61,7 @@ impl FromSql for Operation {
} }
} }
/// Parsers Operation stored as JSON in string column
impl ToSql for Operation { impl ToSql for Operation {
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> { fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
let s = serde_json::to_string(&self) let s = serde_json::to_string(&self)
@ -68,7 +70,6 @@ impl ToSql for Operation {
} }
} }
/// SqliteStorage is an on-disk storage backed by SQLite3. /// SqliteStorage is an on-disk storage backed by SQLite3.
pub struct SqliteStorage { pub struct SqliteStorage {
con: Connection, con: Connection,
@ -220,9 +221,7 @@ impl<'t> StorageTxn for Txn<'t> {
|r| r.get("value"), |r| r.get("value"),
) )
.optional()?; .optional()?;
Ok(version Ok(version.map(|u| u.0).unwrap_or(DEFAULT_BASE_VERSION))
.map(|u| u.0)
.unwrap_or(DEFAULT_BASE_VERSION))
} }
fn set_base_version(&mut self, version: VersionId) -> anyhow::Result<()> { fn set_base_version(&mut self, version: VersionId) -> anyhow::Result<()> {
@ -254,11 +253,8 @@ impl<'t> StorageTxn for Txn<'t> {
fn add_operation(&mut self, op: Operation) -> anyhow::Result<()> { fn add_operation(&mut self, op: Operation) -> anyhow::Result<()> {
let t = self.get_txn()?; let t = self.get_txn()?;
t.execute( t.execute("INSERT INTO operations (data) VALUES (?)", params![&op])
"INSERT INTO operations (data) VALUES (?)", .context("Add operation query")?;
params![&op],
)
.context("Add operation query")?;
Ok(()) Ok(())
} }