Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cc002a1

Browse files
mafredrimafredri
committed
chore: Fix null issues
1 parent 5ac5860 commit cc002a1

File tree

8 files changed

+50
-39
lines changed

8 files changed

+50
-39
lines changed

‎coderd/audit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (api *API) convertAuditLog(ctx context.Context, dblog database.GetAuditLogs
198198
Username: dblog.UserUsername.String,
199199
Email: dblog.UserEmail.String,
200200
CreatedAt: dblog.UserCreatedAt.Time,
201-
Status: codersdk.UserStatus(dblog.UserStatus),
201+
Status: codersdk.UserStatus(dblog.UserStatus.UserStatus),
202202
Roles: []codersdk.Role{},
203203
AvatarURL: dblog.UserAvatarUrl.String,
204204
}

‎coderd/database/databasefake/databasefake.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3324,7 +3324,7 @@ func (q *fakeQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAu
33243324
UserUsername: sql.NullString{String: user.Username, Valid: userValid},
33253325
UserEmail: sql.NullString{String: user.Email, Valid: userValid},
33263326
UserCreatedAt: sql.NullTime{Time: user.CreatedAt, Valid: userValid},
3327-
UserStatus: user.Status,
3327+
UserStatus: database.NullUserStatus{UserStatus: user.Status, Valid: true},
33283328
UserRoles: user.RBACRoles,
33293329
Count: 0,
33303330
})

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000090_sqlc_upgrade_fix_nullable_values.down.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BEGIN;
2+
ALTER TABLE parameter_schemas ALTER COLUMN default_source_scheme DROP NOT NULL;
3+
4+
ALTER TABLE parameter_schemas ALTER COLUMN default_destination_scheme DROP NOT NULL;
5+
COMMIT;

‎coderd/database/migrations/000090_sqlc_upgrade_fix_nullable_values.up.sql

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
BEGIN;
2+
UPDATE parameter_schemas SET default_source_scheme = 'none' WHERE default_source_scheme IS NULL;
3+
ALTER TABLE parameter_schemas ALTER COLUMN default_source_scheme SET NOT NULL;
4+
5+
UPDATE parameter_schemas SET default_destination_scheme = 'none' WHERE default_destination_scheme IS NULL;
6+
ALTER TABLE parameter_schemas ALTER COLUMN default_destination_scheme SET NOT NULL;
7+
COMMIT;

‎coderd/database/models.go

Lines changed: 17 additions & 17 deletions
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: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codersdk/workspaceagents.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package codersdk
22

3-
43
import (
54
"context"
65
"encoding/json"

0 commit comments

Comments
 (0)