diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/invite/repo.rs | 2 | ||||
| -rw-r--r-- | src/login/repo.rs | 10 | ||||
| -rw-r--r-- | src/setup/repo.rs | 2 | ||||
| -rw-r--r-- | src/token/repo/auth.rs | 4 | ||||
| -rw-r--r-- | src/token/repo/token.rs | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/invite/repo.rs b/src/invite/repo.rs index c1dc701..c716ed9 100644 --- a/src/invite/repo.rs +++ b/src/invite/repo.rs @@ -74,7 +74,7 @@ impl Invites<'_> { issuer.display_name as "issuer_name: nfc::String", invite.issued_at as "invite_issued_at: DateTime" from invite - join login as issuer on (invite.issuer = issuer.id) + join user as issuer on (invite.issuer = issuer.id) where invite.id = $1 "#, invite, diff --git a/src/login/repo.rs b/src/login/repo.rs index 03f2c17..128d6b8 100644 --- a/src/login/repo.rs +++ b/src/login/repo.rs @@ -34,7 +34,7 @@ impl Logins<'_> { sqlx::query!( r#" insert - into login (id, display_name, canonical_name, password_hash, created_sequence, created_at) + into user (id, display_name, canonical_name, password_hash, created_sequence, created_at) values ($1, $2, $3, $4, $5, $6) "#, id, @@ -67,7 +67,7 @@ impl Logins<'_> { sqlx::query_scalar!( r#" - update login + update user set password_hash = $1 where id = $2 returning id as "id: Id" @@ -90,7 +90,7 @@ impl Logins<'_> { canonical_name as "canonical_name: String", created_sequence as "created_sequence: Sequence", created_at as "created_at: DateTime" - from login + from user where created_sequence <= $1 order by canonical_name "#, @@ -122,8 +122,8 @@ impl Logins<'_> { canonical_name as "canonical_name: String", created_sequence as "created_sequence: Sequence", created_at as "created_at: DateTime" - from login - where login.created_sequence > $1 + from user + where created_sequence > $1 "#, resume_at, ) diff --git a/src/setup/repo.rs b/src/setup/repo.rs index ac01496..c4f5fd8 100644 --- a/src/setup/repo.rs +++ b/src/setup/repo.rs @@ -17,7 +17,7 @@ impl Setup<'_> { let completed = sqlx::query_scalar!( r#" select count(*) > 0 as "completed: bool" - from login + from user "#, ) .fetch_one(&mut *self.0) diff --git a/src/token/repo/auth.rs b/src/token/repo/auth.rs index 0deed10..8900704 100644 --- a/src/token/repo/auth.rs +++ b/src/token/repo/auth.rs @@ -32,7 +32,7 @@ impl Auth<'_> { created_sequence as "created_sequence: Sequence", created_at as "created_at: DateTime", password_hash as "password_hash: StoredHash" - from login + from user where canonical_name = $1 "#, name, @@ -61,7 +61,7 @@ impl Auth<'_> { created_sequence as "created_sequence: Sequence", created_at as "created_at: DateTime", password_hash as "password_hash: StoredHash" - from login + from user where id = $1 "#, login.id, diff --git a/src/token/repo/token.rs b/src/token/repo/token.rs index ff42fad..3428030 100644 --- a/src/token/repo/token.rs +++ b/src/token/repo/token.rs @@ -37,7 +37,7 @@ impl Tokens<'_> { let secret = sqlx::query_scalar!( r#" insert - into token (id, secret, login, issued_at, last_used_at) + into token (id, secret, user, issued_at, last_used_at) values ($1, $2, $3, $4, $4) returning secret as "secret!: Secret" "#, @@ -91,7 +91,7 @@ impl Tokens<'_> { r#" delete from token - where login = $1 + where user = $1 returning id as "id: Id" "#, login, @@ -139,12 +139,12 @@ impl Tokens<'_> { where secret = $2 returning id as "token: Id", - login as "login: login::Id" + user as "user: login::Id" "#, used_at, secret, ) - .map(|row| (row.token, row.login)) + .map(|row| (row.token, row.user)) .fetch_one(&mut *self.0) .await?; @@ -156,7 +156,7 @@ impl Tokens<'_> { canonical_name as "canonical_name: String", created_sequence as "created_sequence: Sequence", created_at as "created_at: DateTime" - from login + from user where id = $1 "#, login, |