sqlite: fix database reset sequence

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
pull/473/head
Manos Pitsidianakis 2 months ago
parent 604ae11128
commit 86e25bc017
No known key found for this signature in database
GPG Key ID: 7729C7707F7E09D0

@ -179,7 +179,7 @@ impl DatabaseDescription {
} }
self.reset_db()?; self.reset_db()?;
second_try = true; second_try = true;
return Ok(conn); return Ok(None);
} }
if version == 0 { if version == 0 {
@ -190,12 +190,12 @@ impl DatabaseDescription {
.map_err(|err| Error::new(err.to_string()))?; .map_err(|err| Error::new(err.to_string()))?;
} }
Ok(conn) Ok(Some(conn))
}; };
inner_fn().unwrap(); inner_fn().unwrap();
match inner_fn() { match inner_fn() {
Ok(_) if second_try => continue, Ok(None) => continue,
Ok(conn) => return Ok(conn), Ok(Some(conn)) => return Ok(conn),
Err(err) => { Err(err) => {
return Err(Error::new(format!( return Err(Error::new(format!(
"{}: Could not open or create database", "{}: Could not open or create database",
@ -219,6 +219,11 @@ impl DatabaseDescription {
.set_kind(ErrorKind::from(err.kind())) .set_kind(ErrorKind::from(err.kind()))
.set_source(Some(Arc::new(err))) .set_source(Some(Arc::new(err)))
})?; })?;
log::info!(
"{} {} database reset successful",
self.name,
db_path.display()
);
Ok(()) Ok(())
} }
} }

Loading…
Cancel
Save