robin/nextcloud-config-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/nextcloud-config-parser.git synced 2026-06-03 16:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

default to sqlite

Browse source
This commit is contained in:
Robin Appelman 2021-08-11 13:52:37 +02:00
commit 7445dda2ff
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -85,8 +85,6 @@ pub enum Error {
ReadFailed(std::io::Error, PathBuf), ReadFailed(std::io::Error, PathBuf),
#[error("invalid database configuration: {0}")] #[error("invalid database configuration: {0}")]
InvalidDb(#[from] DbError), InvalidDb(#[from] DbError),
#[error("no database configuration")]
NoDb,
#[error("Invalid redis configuration")] #[error("Invalid redis configuration")]
Redis, Redis,
#[error("`overwrite.cli.url` not set`")] #[error("`overwrite.cli.url` not set`")]

3
src/nc.rs
View file

@ -271,7 +271,7 @@ fn parse_db_options(parsed: &Value) -> Result<Database> {
ssl_options, ssl_options,
}) })
} }
Some("sqlite3" | "sqlite") => { Some("sqlite3" | "sqlite") | None => {
let data_dir = parsed["datadirectory"] let data_dir = parsed["datadirectory"]
.as_str() .as_str()
.ok_or(DbError::NoDataDirectory)?; .ok_or(DbError::NoDataDirectory)?;
@ -281,7 +281,6 @@ fn parse_db_options(parsed: &Value) -> Result<Database> {
}) })
} }
Some(ty) => Err(Error::InvalidDb(DbError::Unsupported(ty.into()))), Some(ty) => Err(Error::InvalidDb(DbError::Unsupported(ty.into()))),
None => Err(Error::NoDb),
} }
} }