Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc92fb1b

Browse files
committed
ensure that users.IsSystem is not nullable
1 parent82f955c commitc92fb1b

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ func (q *FakeQuerier) AllUserIDs(_ context.Context, includeSystem bool) ([]uuid.
15551555
deferq.mutex.RUnlock()
15561556
userIDs:=make([]uuid.UUID,0,len(q.users))
15571557
foridx:=rangeq.users {
1558-
if!includeSystem&&q.users[idx].IsSystem.Valid&&q.users[idx].IsSystem.Bool {
1558+
if!includeSystem&&q.users[idx].IsSystem {
15591559
continue
15601560
}
15611561

@@ -2656,7 +2656,7 @@ func (q *FakeQuerier) GetActiveUserCount(_ context.Context, includeSystem bool)
26562656

26572657
active:=int64(0)
26582658
for_,u:=rangeq.users {
2659-
if!includeSystem&&u.IsSystem.Valid&&u.IsSystem.Bool {
2659+
if!includeSystem&&u.IsSystem {
26602660
continue
26612661
}
26622662

@@ -6221,7 +6221,7 @@ func (q *FakeQuerier) GetUserCount(_ context.Context, includeSystem bool) (int64
62216221
existing++
62226222
}
62236223

6224-
if!includeSystem&&u.IsSystem.Valid&&u.IsSystem.Bool {
6224+
if!includeSystem&&u.IsSystem {
62256225
continue
62266226
}
62276227
}

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000301_system_user.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ALTERTABLE users
2-
ADD COLUMN is_system bool DEFAULT false;
2+
ADD COLUMN is_system bool DEFAULT falseNOT NULL;
33

44
CREATEINDEXuser_is_system_idxON users USING btree (is_system);
55

‎coderd/database/models.go

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

‎coderd/database/queries.sql.go

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

‎coderd/users_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,7 +2450,7 @@ func TestSystemUserBehaviour(t *testing.T) {
24502450

24512451
varsystemUser,regularUser database.GetUsersRow
24522452
for_,u:=rangeusers {
2453-
ifu.IsSystem.Bool {
2453+
ifu.IsSystem {
24542454
systemUser=u
24552455
}else {
24562456
regularUser=u
@@ -2459,9 +2459,9 @@ func TestSystemUserBehaviour(t *testing.T) {
24592459
require.NotNil(t,systemUser)
24602460
require.NotNil(t,regularUser)
24612461

2462-
require.True(t,systemUser.IsSystem.Bool)
2462+
require.True(t,systemUser.IsSystem)
24632463
require.Equal(t,systemUser.ID,prebuilds.SystemUserID)
2464-
require.False(t,regularUser.IsSystem.Bool)
2464+
require.False(t,regularUser.IsSystem)
24652465
require.Equal(t,regularUser.ID,other.ID)
24662466

24672467
// =================================================================================================================
@@ -2474,7 +2474,7 @@ func TestSystemUserBehaviour(t *testing.T) {
24742474
// Then: only regular users are returned.
24752475
require.NoError(t,err)
24762476
require.Len(t,users,1)
2477-
require.False(t,users[0].IsSystem.Bool)
2477+
require.False(t,users[0].IsSystem)
24782478

24792479
// =================================================================================================================
24802480

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp