Dec 8, 2023 · Dec 6, 2023 · Dec 6, 2023 · Dec 6, 2023 · Dec 6, 2023 · Dec 6, 2023
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000175_add_user_theme_preference.down.sql b/coderd/database/migrations/000175_add_user_theme_preference.down.sql
 ALTER TABLE users DROP COLUMN "theme_preference";
diff --git a/coderd/database/migrations/000175_add_user_theme_preference.up.sql b/coderd/database/migrations/000175_add_user_theme_preference.up.sql
 ALTER TABLE users ADD COLUMN "theme_preference" text NOT NULL DEFAULT '';

 COMMENT ON COLUMN "users"."theme_preference" IS '"" can be interpreted as "the user does not care", falling back to the default theme';
diff --git a/coderd/database/migrations/create_migration.sh b/coderd/database/migrations/create_migration.sh
 #!/usr/bin/env bash

 # Usage:
 # ./create_migration name of migration
 # ./create_migration "name of migration"
 # ./create_migration name_of_migration
 # ./create_migration.sh name of migration
 # ./create_migration.sh "name of migration"
 # ./create_migration.sh name_of_migration

 set -euo pipefail


 ALTER TABLE users
 ALTER COLUMN login_type DROP DEFAULT, -- if the column has a default, it must be dropped first
 ALTER COLUMN login_type TYPE new_logintype USING (login_type::text::new_logintype), -- converts the old enumuntil the new enum using text as an intermediary
 ALTER COLUMN login_type TYPE new_logintype USING (login_type::text::new_logintype), -- converts the old enuminto the new enum using text as an intermediary
 ALTER COLUMN login_type SET DEFAULT 'password'::new_logintype; -- re-add the default using the new enum

 DROP TYPE login_type;
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
 users:=make([]User,len(rows))
 fori,r:=rangerows {
 users[i]=User{
 ID:r.ID,
 Email:r.Email,
 Username:r.Username,
 HashedPassword:r.HashedPassword,
 CreatedAt:r.CreatedAt,
 UpdatedAt:r.UpdatedAt,
 Status:r.Status,
 RBACRoles:r.RBACRoles,
 LoginType:r.LoginType,
 AvatarURL:r.AvatarURL,
 Deleted:r.Deleted,
 LastSeenAt:r.LastSeenAt,
 ID:r.ID,
 Email:r.Email,
 Username:r.Username,
 HashedPassword:r.HashedPassword,
 CreatedAt:r.CreatedAt,
 UpdatedAt:r.UpdatedAt,
 Status:r.Status,
 RBACRoles:r.RBACRoles,
 LoginType:r.LoginType,
 AvatarURL:r.AvatarURL,
 Deleted:r.Deleted,
 LastSeenAt:r.LastSeenAt,
 ThemePreference:r.ThemePreference,
 }
 }

diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
 &i.Deleted,
 &i.LastSeenAt,
 &i.QuietHoursSchedule,
 &i.ThemePreference,
 &i.Count,
 ); err != nil {
 return nil, err
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE users DROP COLUMN "theme_preference";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE users ADD COLUMN "theme_preference" text NOT NULL DEFAULT '';

		COMMENT ON COLUMN "users"."theme_preference" IS '"" can be interpreted as "the user does not care", falling back to the default theme';
Original file line number	Diff line number	Diff line change
		@@ -1,9 +1,9 @@
		#!/usr/bin/env bash

		# Usage:
		# ./create_migration name of migration
		# ./create_migration "name of migration"
		# ./create_migration name_of_migration
		# ./create_migration.sh name of migration
		# ./create_migration.sh "name of migration"
		# ./create_migration.sh name_of_migration

		set -euo pipefail

Expand All		@@ -27,7 +27,7 @@ CREATE TYPE new_logintype AS ENUM (

		ALTER TABLE users
		ALTER COLUMN login_type DROP DEFAULT, -- if the column has a default, it must be dropped first
		ALTER COLUMN login_type TYPE new_logintype USING (login_type::text::new_logintype), -- converts the old enumuntil the new enum using text as an intermediary
		ALTER COLUMN login_type TYPE new_logintype USING (login_type::text::new_logintype), -- converts the old enuminto the new enum using text as an intermediary
		ALTER COLUMN login_type SET DEFAULT 'password'::new_logintype; -- re-add the default using the new enum

		DROP TYPE login_type;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -332,18 +332,19 @@ func ConvertUserRows(rows []GetUsersRow) []User {
		users:=make([]User,len(rows))
		fori,r:=rangerows {
		users[i]=User{
		ID:r.ID,
		Email:r.Email,
		Username:r.Username,
		HashedPassword:r.HashedPassword,
		CreatedAt:r.CreatedAt,
		UpdatedAt:r.UpdatedAt,
		Status:r.Status,
		RBACRoles:r.RBACRoles,
		LoginType:r.LoginType,
		AvatarURL:r.AvatarURL,
		Deleted:r.Deleted,
		LastSeenAt:r.LastSeenAt,
		ID:r.ID,
		Email:r.Email,
		Username:r.Username,
		HashedPassword:r.HashedPassword,
		CreatedAt:r.CreatedAt,
		UpdatedAt:r.UpdatedAt,
		Status:r.Status,
		RBACRoles:r.RBACRoles,
		LoginType:r.LoginType,
		AvatarURL:r.AvatarURL,
		Deleted:r.Deleted,
		LastSeenAt:r.LastSeenAt,
		ThemePreference:r.ThemePreference,
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -316,6 +316,7 @@ func (q *sqlQuerier) GetAuthorizedUsers(ctx context.Context, arg GetUsersParams,
		&i.Deleted,
		&i.LastSeenAt,
		&i.QuietHoursSchedule,
		&i.ThemePreference,
		&i.Count,
		); err != nil {
		return nil, err
Expand Down