Skip to content

Commit 76a95d9

Browse files
committed
chore: replace suspened column by status
1 parent d4c7536 commit 76a95d9

File tree

14 files changed

+124
-68
lines changed

14 files changed

+124
-68
lines changed

coderd/database/databasefake/databasefake.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,7 @@ func (q *fakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
11181118
CreatedAt: arg.CreatedAt,
11191119
UpdatedAt: arg.UpdatedAt,
11201120
Username: arg.Username,
1121+
Status: database.UserStatusTypeActive,
11211122
}
11221123
q.users = append(q.users, user)
11231124
return user, nil
@@ -1139,15 +1140,15 @@ func (q *fakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUs
11391140
return database.User{}, sql.ErrNoRows
11401141
}
11411142

1142-
func (q *fakeQuerier) UpdateUserSuspended(_ context.Context, arg database.UpdateUserSuspendedParams) (database.User, error) {
1143+
func (q *fakeQuerier) UpdateUserStatus(_ context.Context, arg database.UpdateUserStatusParams) (database.User, error) {
11431144
q.mutex.Lock()
11441145
defer q.mutex.Unlock()
11451146

11461147
for index, user := range q.users {
11471148
if user.ID != arg.ID {
11481149
continue
11491150
}
1150-
user.Suspended = arg.Suspended
1151+
user.Status = arg.Status
11511152
user.UpdatedAt = arg.UpdatedAt
11521153
q.users[index] = user
11531154
return user, nil

coderd/database/dump.sql

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DROP TYPE user_status_type;
2+
3+
ALTER TABLE ONLY users
4+
DROP COLUMN IF EXISTS status;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CREATE TYPE user_status_type AS ENUM ('active', 'suspended');
2+
3+
ALTER TABLE ONLY users
4+
ADD COLUMN IF NOT EXISTS status user_status_type NOT NULL DEFAULT 'active';

coderd/database/migrations/000007_user_suspended.down.sql

Lines changed: 0 additions & 2 deletions
This file was deleted.

coderd/database/migrations/000007_user_suspended.up.sql

Lines changed: 0 additions & 2 deletions
This file was deleted.

coderd/database/models.go

Lines changed: 26 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries.sql.go

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries/users.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ LIMIT
9191
-- A null limit means "no limit", so -1 means return all
9292
NULLIF(@limit_opt :: int, -1);
9393

94-
-- name: UpdateUserSuspended :one
94+
-- name: UpdateUserStatus :one
9595
UPDATE
9696
users
9797
SET
98-
suspended = $2,
98+
status = $2,
9999
updated_at = $3
100100
WHERE
101101
id = $1 RETURNING *;

0 commit comments

Comments
 (0)