fixup! Merge branch 'main' into dean/scaletest

coder · deansheather · Dec 15, 2022 · Dec 6, 2022 · Dec 12, 2022 · Dec 12, 2022
commit 03a5834615241d33dfd5aecc9a579dcc7d8f1e8d
diff --git a/cli/testdata/coder_--help.golden b/cli/testdata/coder_--help.golden
@@ -23,6 +23,7 @@ Commands:
   port-forward   Forward ports from machine to a workspace
   publickey      Output your Coder public key used for Git operations
   reset-password Directly connect to the database to reset a user's password
+  scaletest      Run a scale test against the Coder API
   server         Start a Coder server
   state          Manually manage Terraform state to fix broken workspaces
   templates      Manage templates

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -448,7 +448,7 @@ func (q *fakeQuerier) GetUserByEmailOrUsername(_ context.Context, arg database.G
 	defer q.mutex.RUnlock()
 
 	for _, user := range q.users {
-		if strings.EqualFold(user.Email, arg.Email) || strings.EqualFold(user.Username, arg.Username) {
+		if !user.Deleted && (strings.EqualFold(user.Email, arg.Email) || strings.EqualFold(user.Username, arg.Username)) {
 			return user, nil
 		}
 	}

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -20,15 +20,18 @@ SELECT
 FROM
 	users
 WHERE
-	LOWER(username) = LOWER(@username) OR LOWER(email) = LOWER(@email)
+	(LOWER(username) = LOWER(@username) OR LOWER(email) = LOWER(@email)) AND
+	deleted = false
 LIMIT
 	1;
 
 -- name: GetUserCount :one
 SELECT
 	COUNT(*)
 FROM
-	users WHERE deleted = false;
+	users
+WHERE
+	deleted = false;
 
 -- name: GetActiveUserCount :one
 SELECT