Hostea
/
gitpad
mirror of https://github.com/realaravinth/gitpad
4
0
Fork 0
Code Issues 3 Projects Releases Wiki Activity

feat: db-sqlx-postgres: reaname admin_users -> gists_users

Browse Source
master
Aravinth Manivannan 2 years ago
parent 9bf3dad060
commit e96550b6c0
Signed by: realaravinth
GPG Key ID: AD9F0F08E855ED88
5 changed files with 289 additions and 90 deletions
Show Stats Download Patch File Download Diff File

2
database/db-sqlx-postgres/migrations/20211017084123_admin_users.sql → database/db-sqlx-postgres/migrations/20220213111215_gists_users.sql
Unescape Escape View File

@ -1,4 +1,4 @@
CREATE TABLE IF NOT EXISTS admin_users (
CREATE TABLE IF NOT EXISTS gists_users (
username VARCHAR(100) NOT NULL UNIQUE,
email VARCHAR(100) UNIQUE DEFAULT NULL,
email_verified BOOLEAN DEFAULT NULL,

146
database/db-sqlx-postgres/sqlx-data.json
Unescape Escape View File

@ -1,78 +1,100 @@
{
"db": "PostgreSQL",
"08e90ce06e795bdb9bf0ea5b18df3b69b107764ad9d224de601b3588fbeac211": {
"query": "UPDATE admin_users set secret = $1\n WHERE username = $2",
"0b6e7311c44fa5278b5279b1ecfb8eba57a80f5ddc5f0e1a78f126113a31187b": {
"query": "insert into gists_users \n (username , password, email, secret) values ($1, $2, $3, $4)",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text"
"Text",
"Varchar",
"Varchar"
]
},
"nullable": []
}
},
"150c8d182ca90bd50fdd419e5b1b2bb48c8eb5d060d7ab0207dfc04e8eda6fee": {
"query": "INSERT INTO admin_users \n (username , password, secret) VALUES ($1, $2, $3)",
"405772009a7aee0194b6b25c42955c2674c3ff92b812d7f15c4075d243879c60": {
"query": "SELECT password FROM gists_users WHERE username = ($1)",
"describe": {
"columns": [],
"columns": [
{
"ordinal": 0,
"name": "password",
"type_info": "Text"
}
],
"parameters": {
"Left": [
"Varchar",
"Text",
"Varchar"
"Text"
]
},
"nullable": []
"nullable": [
false
]
}
},
"1c6e0ac5913665e512c5d6c8b99af61e6adbac6482de651ff8aeab4210ba4120": {
"query": "UPDATE admin_users set email = $1\n WHERE username = $2",
"4eb5627f85e0395422df67fb6d9bb8a1325bb751293b55a370f3906b42fec554": {
"query": "UPDATE gists_users set password = $1\n WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text",
"Text"
]
},
"nullable": []
}
},
"29f35f75a0ddedaabdfecd6a22ee16747f91b2b928641361fe43738eb21e7607": {
"query": "DELETE FROM admin_users WHERE username = ($1)",
"7cc18cdd39aa42dcbb75b0b0d06b6df05ac654654b86db71be07344e3f09510d": {
"query": "UPDATE gists_users set username = $1 WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text"
]
},
"nullable": []
}
},
"2f9e7d2c4e5335a1c221f8162f5c47c44efbea37cc41670873303f6892e62375": {
"query": "UPDATE admin_users set password = $1\n WHERE username = $2",
"87e92bd84adbe95b27200a84c861d30b7c09b0a7976df7a02caa645b46cdf7dd": {
"query": "SELECT username, password FROM gists_users WHERE email = ($1)",
"describe": {
"columns": [],
"columns": [
{
"ordinal": 0,
"name": "username",
"type_info": "Varchar"
},
{
"ordinal": 1,
"name": "password",
"type_info": "Text"
}
],
"parameters": {
"Left": [
"Text",
"Text"
]
},
"nullable": []
"nullable": [
false,
false
]
}
},
"3e91a474c261bae1ca27f1a5fcf9a276b5fa000039f5118b6daf5640b8708894": {
"query": "SELECT secret FROM admin_users WHERE username = ($1)",
"8c7af53d14214f2bd23b089d3c9134909c2d1cc13cd42e88778bfb20f497c2dd": {
"query": "SELECT EXISTS (SELECT 1 from gists_users WHERE email = $1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "secret",
"type_info": "Varchar"
"name": "exists",
"type_info": "Bool"
}
],
"parameters": {
@ -81,12 +103,12 @@
]
},
"nullable": [
false
null
]
}
},
"4899a9845675082afcfca09d016da313f09932882f5e71ca7da26db94aa14dc1": {
"query": "UPDATE admin_users set username = $1 WHERE username = $2",
"9aaf3a384bf79f278bf79c99b34fadcc172cfa4e7857111502782e6ad7110b7b": {
"query": "UPDATE gists_users set email = $1\n WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
@ -98,75 +120,53 @@
"nullable": []
}
},
"524065157b7c8e0a2ff02eb8efd7ddf79f585b2f1428f9d2bab92b3d2b2b9b71": {
"query": "insert into admin_users \n (username , password, email, secret) values ($1, $2, $3, $4)",
"aa899a667f05d021e1d537f1ab53289edcec5fc76a88b56abb08909bbc5b8478": {
"query": "UPDATE gists_users set secret = $1\n WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text",
"Varchar",
"Varchar"
"Text"
]
},
"nullable": []
}
},
"583d7cf4a5a111471f7898bea0001c2e4c18200d8840456a3b28fedf6d7c1359": {
"query": "SELECT EXISTS (SELECT 1 from admin_users WHERE username = $1)",
"b3c2a524999bb13149704c53c059a856c5003ef537b9e966548123a52c01802b": {
"query": "DELETE FROM gists_users WHERE username = ($1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
}
],
"columns": [],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
null
]
"nullable": []
}
},
"677c618882d6b7e621f9f2b040671d8260518383796efad120a8ffdb596e9d7a": {
"query": "SELECT username, password FROM admin_users WHERE email = ($1)",
"e3604664ce429e2f49c0c4cc2601c5336be3f8690c06b9883b64b53085c9c9a6": {
"query": "INSERT INTO gists_users \n (username , password, secret) VALUES ($1, $2, $3)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "username",
"type_info": "Varchar"
},
{
"ordinal": 1,
"name": "password",
"type_info": "Text"
}
],
"columns": [],
"parameters": {
"Left": [
"Text"
"Varchar",
"Text",
"Varchar"
]
},
"nullable": [
false,
false
]
"nullable": []
}
},
"9b53b26143e9583dac3454eafb34fdfb5976144b64cdc0504138b74f8b950ccd": {
"query": "SELECT EXISTS (SELECT 1 from admin_users WHERE email = $1)",
"e7aadec10bcf05eeac542b2f89ce27fcf2efd5d5e8c4ff929fce35c47d7feed1": {
"query": "SELECT secret FROM gists_users WHERE username = ($1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
"name": "secret",
"type_info": "Varchar"
}
],
"parameters": {
@ -175,18 +175,18 @@
]
},
"nullable": [
null
false
]
}
},
"dadfd47b8d33b0b636a79716afa5c8afdf9873304ff9fe883de7eae3aa5e8504": {
"query": "SELECT password FROM admin_users WHERE username = ($1)",
"fdd95c62a27eab173de335225e9e319b901832962b7a562ec4d1749ff74f8fd4": {
"query": "SELECT EXISTS (SELECT 1 from gists_users WHERE username = $1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "password",
"type_info": "Text"
"name": "exists",
"type_info": "Bool"
}
],
"parameters": {
@ -195,7 +195,7 @@
]
},
"nullable": [
false
null
]
}
}

6
database/db-sqlx-postgres/src/errors.rs
Unescape Escape View File

@ -9,11 +9,11 @@ pub fn map_register_err(e: Error) -> DBError {
if let Error::Database(err) = e {
if err.code() == Some(Cow::from("23505")) {
let msg = err.message();
if msg.contains("admin_users_username_key") {
if msg.contains("gists_users_username_key") {
DBError::DuplicateUsername
} else if msg.contains("admin_users_email_key") {
} else if msg.contains("gists_users_email_key") {
DBError::DuplicateEmail
} else if msg.contains("admin_users_secret_key") {
} else if msg.contains("gists_users_secret_key") {
DBError::DuplicateSecret
} else {
DBError::DBError(Box::new(Error::Database(err)))

24
database/db-sqlx-postgres/src/lib.rs
Unescape Escape View File

@ -88,7 +88,7 @@ impl GistDatabase for Database {
async fn email_login(&self, email: &str) -> DBResult<Creds> {
sqlx::query_as!(
Creds,
r#"SELECT username, password FROM admin_users WHERE email = ($1)"#,
r#"SELECT username, password FROM gists_users WHERE email = ($1)"#,
email,
)
.fetch_one(&self.pool)
@ -102,7 +102,7 @@ impl GistDatabase for Database {
async fn username_login(&self, username: &str) -> DBResult<Password> {
sqlx::query_as!(
Password,
r#"SELECT password FROM admin_users WHERE username = ($1)"#,
r#"SELECT password FROM gists_users WHERE username = ($1)"#,
username,
)
.fetch_one(&self.pool)
@ -115,7 +115,7 @@ impl GistDatabase for Database {
async fn email_register(&self, payload: &EmailRegisterPayload) -> DBResult<()> {
sqlx::query!(
"insert into admin_users
"insert into gists_users
(username , password, email, secret) values ($1, $2, $3, $4)",
&payload.username,
&payload.password,
@ -130,7 +130,7 @@ impl GistDatabase for Database {
async fn username_register(&self, payload: &UsernameRegisterPayload) -> DBResult<()> {
sqlx::query!(
"INSERT INTO admin_users
"INSERT INTO gists_users
(username , password, secret) VALUES ($1, $2, $3)",
&payload.username,
&payload.password,
@ -144,7 +144,7 @@ impl GistDatabase for Database {
async fn update_email(&self, payload: &UpdateEmailPayload) -> DBResult<()> {
let x = sqlx::query!(
"UPDATE admin_users set email = $1
"UPDATE gists_users set email = $1
WHERE username = $2",
&payload.email,
&payload.username,
@ -160,7 +160,7 @@ impl GistDatabase for Database {
}
async fn update_password(&self, payload: &Creds) -> DBResult<()> {
let x = sqlx::query!(
"UPDATE admin_users set password = $1
"UPDATE gists_users set password = $1
WHERE username = $2",
&payload.password,
&payload.username,
@ -177,7 +177,7 @@ impl GistDatabase for Database {
async fn email_exists(&self, email: &str) -> DBResult<bool> {
let res = sqlx::query!(
"SELECT EXISTS (SELECT 1 from admin_users WHERE email = $1)",
"SELECT EXISTS (SELECT 1 from gists_users WHERE email = $1)",
&email
)
.fetch_one(&self.pool)
@ -195,7 +195,7 @@ impl GistDatabase for Database {
}
async fn delete_account(&self, username: &str) -> DBResult<()> {
sqlx::query!("DELETE FROM admin_users WHERE username = ($1)", username,)
sqlx::query!("DELETE FROM gists_users WHERE username = ($1)", username,)
.execute(&self.pool)
.await
.map_err(|e| DBError::DBError(Box::new(e)))?;
@ -204,7 +204,7 @@ impl GistDatabase for Database {
async fn username_exists(&self, username: &str) -> DBResult<bool> {
let res = sqlx::query!(
"SELECT EXISTS (SELECT 1 from admin_users WHERE username = $1)",
"SELECT EXISTS (SELECT 1 from gists_users WHERE username = $1)",
&username
)
.fetch_one(&self.pool)
@ -223,7 +223,7 @@ impl GistDatabase for Database {
async fn update_username(&self, payload: &UpdateUsernamePayload) -> DBResult<()> {
let x = sqlx::query!(
"UPDATE admin_users set username = $1 WHERE username = $2",
"UPDATE gists_users set username = $1 WHERE username = $2",
&payload.new_username,
&payload.old_username,
)
@ -237,7 +237,7 @@ impl GistDatabase for Database {
}
async fn update_secret(&self, username: &str, secret: &str) -> DBResult<()> {
let x = sqlx::query!(
"UPDATE admin_users set secret = $1
"UPDATE gists_users set secret = $1
WHERE username = $2",
secret,
username,
@ -258,7 +258,7 @@ impl GistDatabase for Database {
}
let secret = sqlx::query_as!(
Secret,
r#"SELECT secret FROM admin_users WHERE username = ($1)"#,
r#"SELECT secret FROM gists_users WHERE username = ($1)"#,
username,
)
.fetch_one(&self.pool)

201
sqlx-data.json
Unescape Escape View File

@ -1,3 +1,202 @@
{
"db": "PostgreSQL"
"db": "PostgreSQL",
"0b6e7311c44fa5278b5279b1ecfb8eba57a80f5ddc5f0e1a78f126113a31187b": {
"query": "insert into gists_users \n (username , password, email, secret) values ($1, $2, $3, $4)",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text",
"Varchar",
"Varchar"
]
},
"nullable": []
}
},
"405772009a7aee0194b6b25c42955c2674c3ff92b812d7f15c4075d243879c60": {
"query": "SELECT password FROM gists_users WHERE username = ($1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "password",
"type_info": "Text"
}
],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
false
]
}
},
"4eb5627f85e0395422df67fb6d9bb8a1325bb751293b55a370f3906b42fec554": {
"query": "UPDATE gists_users set password = $1\n WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Text",
"Text"
]
},
"nullable": []
}
},
"7cc18cdd39aa42dcbb75b0b0d06b6df05ac654654b86db71be07344e3f09510d": {
"query": "UPDATE gists_users set username = $1 WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text"
]
},
"nullable": []
}
},
"87e92bd84adbe95b27200a84c861d30b7c09b0a7976df7a02caa645b46cdf7dd": {
"query": "SELECT username, password FROM gists_users WHERE email = ($1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "username",
"type_info": "Varchar"
},
{
"ordinal": 1,
"name": "password",
"type_info": "Text"
}
],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
false,
false
]
}
},
"8c7af53d14214f2bd23b089d3c9134909c2d1cc13cd42e88778bfb20f497c2dd": {
"query": "SELECT EXISTS (SELECT 1 from gists_users WHERE email = $1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
null
]
}
},
"9aaf3a384bf79f278bf79c99b34fadcc172cfa4e7857111502782e6ad7110b7b": {
"query": "UPDATE gists_users set email = $1\n WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text"
]
},
"nullable": []
}
},
"aa899a667f05d021e1d537f1ab53289edcec5fc76a88b56abb08909bbc5b8478": {
"query": "UPDATE gists_users set secret = $1\n WHERE username = $2",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text"
]
},
"nullable": []
}
},
"b3c2a524999bb13149704c53c059a856c5003ef537b9e966548123a52c01802b": {
"query": "DELETE FROM gists_users WHERE username = ($1)",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Text"
]
},
"nullable": []
}
},
"e3604664ce429e2f49c0c4cc2601c5336be3f8690c06b9883b64b53085c9c9a6": {
"query": "INSERT INTO gists_users \n (username , password, secret) VALUES ($1, $2, $3)",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text",
"Varchar"
]
},
"nullable": []
}
},
"e7aadec10bcf05eeac542b2f89ce27fcf2efd5d5e8c4ff929fce35c47d7feed1": {
"query": "SELECT secret FROM gists_users WHERE username = ($1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "secret",
"type_info": "Varchar"
}
],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
false
]
}
},
"fdd95c62a27eab173de335225e9e319b901832962b7a562ec4d1749ff74f8fd4": {
"query": "SELECT EXISTS (SELECT 1 from gists_users WHERE username = $1)",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
null
]
}
}
}
Write Preview
Loading…
Cancel
Save