From 7e15690d54ff849596401b43d163df9353062850 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Sun, 23 Mar 2025 15:33:23 -0400 Subject: Rename `user` to `login` at the database. --- src/token/repo/auth.rs | 4 ++-- src/token/repo/token.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/token') 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, -- cgit v1.2.3