From a703df518257454f4f3e7b8b774d6f0f461988e2 Mon Sep 17 00:00:00 2001 From: John Regan Date: Sun, 13 Aug 2023 11:57:20 -0400 Subject: [PATCH] Check if proposed name change is an API name (#3256) Fixes #3234 --- db/query.sql | 2 +- db/query.sql.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/query.sql b/db/query.sql index 03e9ed446..c987e7a4a 100644 --- a/db/query.sql +++ b/db/query.sql @@ -101,7 +101,7 @@ UPDATE users SET authenticated_at = CURRENT_TIMESTAMP WHERE id = $1; SELECT id, body, hidden_at, timestamp FROM messages WHERE eventType = 'CHAT' AND user_id = $1 ORDER BY TIMESTAMP DESC; -- name: IsDisplayNameAvailable :one -SELECT count(*) FROM users WHERE display_name = $1 AND authenticated_at is not null AND disabled_at is NULL; +SELECT count(*) FROM users WHERE display_name = $1 AND ( type='API' OR authenticated_at IS NOT NULL ) AND disabled_at IS NULL; -- name: ChangeDisplayName :exec UPDATE users SET display_name = $1, previous_names = previous_names || $2, namechanged_at = $3 WHERE id = $4; diff --git a/db/query.sql.go b/db/query.sql.go index 97f73a665..b42e42ee7 100644 --- a/db/query.sql.go +++ b/db/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.15.0 +// sqlc v1.19.1 // source: query.sql package db @@ -667,7 +667,7 @@ func (q *Queries) GetUserDisplayNameByToken(ctx context.Context, token string) ( } const isDisplayNameAvailable = `-- name: IsDisplayNameAvailable :one -SELECT count(*) FROM users WHERE display_name = $1 AND authenticated_at is not null AND disabled_at is NULL +SELECT count(*) FROM users WHERE display_name = $1 AND ( type='API' OR authenticated_at IS NOT NULL ) AND disabled_at IS NULL ` func (q *Queries) IsDisplayNameAvailable(ctx context.Context, displayName string) (int64, error) {