johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-27 12:17:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update diesel to version 2

Browse source
This commit is contained in:
Elias Projahn 2022-12-19 17:09:28 +01:00
parent d6b79fae59
commit 8b45ec4940
11 changed files with 259 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/database/src/persons.rs
View file

@ -44,10 +44,10 @@ impl Database {
person.last_used = Some(Utc::now().timestamp());
self.connection.transaction(|| {
self.connection.lock().unwrap().transaction(|connection| {
diesel::replace_into(persons::table)
.values(person)
.execute(&self.connection)
.execute(connection)
})?;
Ok(())
@ -57,7 +57,7 @@ impl Database {
pub fn get_person(&self, id: &str) -> Result<Option<Person>> {
let person = persons::table
.filter(persons::id.eq(id))
.load::<Person>(&self.connection)?
.load::<Person>(&mut *self.connection.lock().unwrap())?
.into_iter()
.next();
@ -67,13 +67,14 @@ impl Database {
/// Delete an existing person.
pub fn delete_person(&self, id: &str) -> Result<()> {
info!("Deleting person {}", id);
diesel::delete(persons::table.filter(persons::id.eq(id))).execute(&self.connection)?;
diesel::delete(persons::table.filter(persons::id.eq(id)))
.execute(&mut *self.connection.lock().unwrap())?;
Ok(())
}
/// Get all existing persons.
pub fn get_persons(&self) -> Result<Vec<Person>> {
let persons = persons::table.load::<Person>(&self.connection)?;
let persons = persons::table.load::<Person>(&mut *self.connection.lock().unwrap())?;
Ok(persons)
}
@ -82,7 +83,7 @@ impl Database {
pub fn get_recent_persons(&self) -> Result<Vec<Person>> {
let persons = persons::table
.order(persons::last_used.desc())
.load::<Person>(&self.connection)?;
.load::<Person>(&mut *self.connection.lock().unwrap())?;
Ok(persons)
}