Archives
/
gobang
mirror of https://github.com/TaKO8Ki/gobang
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "feature connection alias"

Browse Source 
This reverts commit 88b70c1c33.
pull/129/head
susiyaki 3 years ago
parent 4a40990261
commit 7243c20686
1 changed files with 31 additions and 90 deletions
Show Stats Download Patch File Download Diff File

121
src/config.rs
Unescape Escape View File

@ -51,7 +51,6 @@ impl Default for Config {
Self { Self {
conn: vec![Connection { conn: vec![Connection {
r#type: DatabaseType::MySql, r#type: DatabaseType::MySql,
name: None,
user: Some("root".to_string()), user: Some("root".to_string()),
host: Some("localhost".to_string()), host: Some("localhost".to_string()),
port: Some(3306), port: Some(3306),
@ -68,7 +67,6 @@ impl Default for Config {
#[derive(Debug, Deserialize, Clone)] #[derive(Debug, Deserialize, Clone)]
pub struct Connection { pub struct Connection {
r#type: DatabaseType, r#type: DatabaseType,
name: Option<String>,
user: Option<String>, user: Option<String>,
host: Option<String>, host: Option<String>,
port: Option<u64>, port: Option<u64>,
@ -183,7 +181,6 @@ impl Connection {
pub fn database_url(&self) -> anyhow::Result<String> { pub fn database_url(&self) -> anyhow::Result<String> {
match self.r#type { match self.r#type {
DatabaseType::MySql => { DatabaseType::MySql => {
let name = self.name.as_ref().map_or(String::new(), |n| n.to_string());
let user = self let user = self
.user .user
.as_ref() .as_ref()
@ -202,48 +199,24 @@ impl Connection {
.map_or(String::new(), |p| p.to_string()); .map_or(String::new(), |p| p.to_string());
match self.database.as_ref() { match self.database.as_ref() {
Some(database) => Ok(if name.is_empty() { Some(database) => Ok(format!(
format!( "mysql://{user}:{password}@{host}:{port}/{database}",
"mysql://{user}:{password}@{host}:{port}/{database}", user = user,
user = user, password = password,
password = password, host = host,
host = host, port = port,
port = port, database = database
database = database )),
) None => Ok(format!(
} else { "mysql://{user}:{password}@{host}:{port}",
format!( user = user,
"[{name}] mysql://{user}:{password}@{host}:{port}/{database}", password = password,
name = name, host = host,
user = user, port = port,
password = password, )),
host = host,
port = port,
database = database
)
}),
None => Ok(if name.is_empty() {
format!(
"mysql://{user}:{password}@{host}:{port}",
user = user,
password = password,
host = host,
port = port,
)
} else {
format!(
"[{name}] mysql://{user}:{password}@{host}:{port}",
name = name,
user = user,
password = password,
host = host,
port = port,
)
}),
} }
} }
DatabaseType::Postgres => { DatabaseType::Postgres => {
let name = self.name.as_ref().map_or(String::new(), |n| n.to_string());
let user = self let user = self
.user .user
.as_ref() .as_ref()
@ -262,48 +235,24 @@ impl Connection {
.map_or(String::new(), |p| p.to_string()); .map_or(String::new(), |p| p.to_string());
match self.database.as_ref() { match self.database.as_ref() {
Some(database) => Ok(if name.is_empty() { Some(database) => Ok(format!(
format!( "postgres://{user}:{password}@{host}:{port}/{database}",
"postgres://{user}:{password}@{host}:{port}/{database}", user = user,
user = user, password = password,
password = password, host = host,
host = host, port = port,
port = port, database = database
database = database )),
) None => Ok(format!(
} else { "postgres://{user}:{password}@{host}:{port}",
format!( user = user,
"[{name}] postgres://{user}:{password}@{host}:{port}/{database}", password = password,
name = name, host = host,
user = user, port = port,
password = password, )),
host = host,
port = port,
database = database
)
}),
None => Ok(if name.is_empty() {
format!(
"postgres://{user}:{password}@{host}:{port}",
user = user,
password = password,
host = host,
port = port,
)
} else {
format!(
"[{name}] postgres://{user}:{password}@{host}:{port}",
name = name,
user = user,
password = password,
host = host,
port = port,
)
}),
} }
} }
DatabaseType::Sqlite => { DatabaseType::Sqlite => {
let name = self.name.as_ref().map_or(String::new(), |n| n.to_string());
let path = self.path.as_ref().map_or( let path = self.path.as_ref().map_or(
Err(anyhow::anyhow!("type sqlite needs the path field")), Err(anyhow::anyhow!("type sqlite needs the path field")),
|path| { |path| {
@ -311,15 +260,7 @@ impl Connection {
}, },
)?; )?;
Ok(if name.is_empty() { Ok(format!("sqlite://{path}", path = path.to_str().unwrap()))
format!("sqlite://{path}", path = path.to_str().unwrap())
} else {
format!(
"[{name}] sqlite://{path}",
name = name,
path = path.to_str().unwrap()
)
})
} }
} }
} }

Write Preview
Loading…
Cancel
Save