ForgeFlux/starchart
2
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

fix: user_exists was a copy of hostname_exists, now fixed

Browse source
This commit is contained in:
Aravinth Manivannan 2022-04-30 23:50:59 +05:30
parent a57759ea80
commit cb9b8d6d0d
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
2 changed files with 61 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
db/db-sqlx-sqlite/sqlx-data.json
View file

@ -18,6 +18,24 @@
},
"query": "SELECT ID FROM starchart_forges WHERE hostname = $1"
},
"2afb17ba3753aa440465a836b46b7a1466f25791cfc4d0acdd38bc2755ae3e86": {
"describe": {
"columns": [
{
"name": "ID",
"ordinal": 0,
"type_info": "Int64"
}
],
"nullable": [
false
],
"parameters": {
"Right": 1
}
},
"query": "SELECT ID FROM starchart_users WHERE username = $1"
},
"30de2d37dd1bd602249cd2adfab499e41105249c20dc58cb360f539d6a782fa1": {
"describe": {
"columns": [
@ -46,6 +64,24 @@
},
"query": "INSERT INTO\n starchart_forges (hostname, verified_on, forge_type ) \n VALUES ($1, $2, (SELECT ID FROM starchart_forge_type WHERE name = $3))"
},
"a81dd4b5df666e22fac211092e7b8425d838dd9023aa2b17659352f30831944d": {
"describe": {
"columns": [
{
"name": "ID",
"ordinal": 0,
"type_info": "Int64"
}
],
"nullable": [
false
],
"parameters": {
"Right": 2
}
},
"query": "SELECT ID FROM starchart_users WHERE username = $1 AND \n hostname_id = (SELECT ID FROM starchart_forges WHERE hostname = $2)"
},
"b4985ad11fafa367302ca9c0126b95bc70f6ae387f9de649aabb2ef424f676db": {
"describe": {
"columns": [],

21
db/db-sqlx-sqlite/src/lib.rs
View file

@ -191,9 +191,12 @@ impl SCDatabase for Database {
/// check if an user exists. When hostname of a forge instace is provided, username search is
/// done only on that forge
async fn user_exists(&self, username: &str, hostname: Option<&str>) -> DBResult<bool> {
match sqlx::query!(
"SELECT ID FROM starchart_forges WHERE hostname = $1",
hostname
match hostname {
Some(hostname) => match sqlx::query!(
"SELECT ID FROM starchart_users WHERE username = $1 AND
hostname_id = (SELECT ID FROM starchart_forges WHERE hostname = $2)",
username,
hostname,
)
.fetch_one(&self.pool)
.await
@ -201,6 +204,18 @@ impl SCDatabase for Database {
Ok(_) => Ok(true),
Err(Error::RowNotFound) => Ok(false),
Err(e) => Err(DBError::DBError(Box::new(e).into())),
},
None => match sqlx::query!(
"SELECT ID FROM starchart_users WHERE username = $1",
username
)
.fetch_one(&self.pool)
.await
{
Ok(_) => Ok(true),
Err(Error::RowNotFound) => Ok(false),
Err(e) => Err(DBError::DBError(Box::new(e).into())),
},
}
}
}