alihan/gobang-tui-database-management
1
0
Fork 0
mirror of https://github.com/TaKO8Ki/gobang.git synced 2021-09-19 22:32:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' of github.com:TaKO8Ki/gobang

Browse Source
This commit is contained in:
Takayuki Maeda
2021-09-08 10:24:03 +09:00
parent 95a0824f6b 0fb5d77dc6
commit 3c3a496b73
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -105,6 +105,7 @@ type = "mysql"
user = "root"
host = "localhost"
port = 3306
password = "password"
database = "foo"
[[conn]]

22
src/config.rs
View File

@@ -51,6 +51,7 @@ impl Default for Config {
host: Some("localhost".to_string()),
port: Some(3306),
path: None,
password: None,
database: None,
}],
key_config: KeyConfig::default(),
@@ -66,6 +67,7 @@ pub struct Connection {
host: Option<String>,
port: Option<u64>,
path: Option<std::path::PathBuf>,
password: Option<String>,
pub database: Option<String>,
}
@@ -172,18 +174,24 @@ impl Connection {
.port
.as_ref()
.ok_or_else(|| anyhow::anyhow!("type mysql needs the port field"))?;
let password = self
.password
.as_ref()
.map_or(String::new(), |p| p.to_string());
match self.database.as_ref() {
Some(database) => Ok(format!(
"mysql://{user}:@{host}:{port}/{database}",
"mysql://{user}:{password}@{host}:{port}/{database}",
user = user,
password = password,
host = host,
port = port,
database = database
)),
None => Ok(format!(
"mysql://{user}:@{host}:{port}",
"mysql://{user}:{password}@{host}:{port}",
user = user,
password = password,
host = host,
port = port,
)),
@@ -202,18 +210,24 @@ impl Connection {
.port
.as_ref()
.ok_or_else(|| anyhow::anyhow!("type postgres needs the port field"))?;
let password = self
.password
.as_ref()
.map_or(String::new(), |p| p.to_string());
match self.database.as_ref() {
Some(database) => Ok(format!(
"postgres://{user}@{host}:{port}/{database}",
"postgres://{user}:{password}@{host}:{port}/{database}",
user = user,
password = password,
host = host,
port = port,
database = database
)),
None => Ok(format!(
"postgres://{user}@{host}:{port}",
"postgres://{user}:{password}@{host}:{port}",
user = user,
password = password,
host = host,
port = port,
)),