IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

User: Add uid colum to user table (#81615)

Browse Source
This commit is contained in:
Ryan McKinley
2024-02-01 18:14:10 -08:00
committed by GitHub
parent 9d17f6e6aa
commit 9c9e5e68c8
16 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
View File

@@ -46,6 +46,7 @@ var (
users = []user.User{
{
ID: 1,
UID: "u1",
Email: "viewer1@example.org",
Name: "viewer1",
Login: "viewer1",
@@ -55,6 +56,7 @@ var (
},
{
ID: 2,
UID: "u2",
Email: "viewer2@example.org",
Name: "viewer2",
Login: "viewer2",
@@ -64,6 +66,7 @@ var (
},
{
ID: 3,
UID: "u3",
Email: "editor1@example.org",
Name: "editor1",
Login: "editor1",
@@ -73,6 +76,7 @@ var (
},
{
ID: 4,
UID: "u4",
Email: "admin1@example.org",
Name: "admin1",
Login: "admin1",
@@ -82,6 +86,7 @@ var (
},
{
ID: 5,
UID: "u5",
Email: "editor2@example.org",
Name: "editor2",
Login: "editor2",

13
pkg/services/sqlstore/migrations/user_mig.go
View File

@@ -140,6 +140,19 @@ func addUserMigrations(mg *Migrator) {
SQLite(migSQLITEisServiceAccountNullable).
Postgres("ALTER TABLE `user` ALTER COLUMN is_service_account DROP NOT NULL;").
Mysql("ALTER TABLE user MODIFY is_service_account BOOLEAN DEFAULT 0;"))
mg.AddMigration("Add uid column to user", NewAddColumnMigration(userV2, &Column{
Name: "uid", Type: DB_NVarchar, Length: 40, Nullable: true,
}))
mg.AddMigration("Update uid column values for users", NewRawSQLMigration("").
SQLite("UPDATE user SET uid=printf('u%09d',id) WHERE uid IS NULL;").
Postgres("UPDATE `user` SET uid='u' || lpad('' || id::text,9,'0') WHERE uid IS NULL;").
Mysql("UPDATE user SET uid=concat('u',lpad(id,9,'0')) WHERE uid IS NULL;"))
mg.AddMigration("Add unique index user_uid", NewAddIndexMigration(userV2, &Index{
Cols: []string{"uid"}, Type: UniqueIndex,
}))
}
const migSQLITEisServiceAccountNullable = `ALTER TABLE user ADD COLUMN tmp_service_account BOOLEAN DEFAULT 0;