Skip to content

Commit 2a51ea9

Browse files
committed
dbop_mysql: reindex column associations.username
References: DESK-3893, DESK-3984
1 parent 1d1c1ff commit 2a51ea9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/dbop_mysql.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ static constexpr char tbl_assoc_top[] =
432432
"CREATE TABLE `associations` ("
433433
" `list_id` int(10) NOT NULL,"
434434
" `username` varchar(320) CHARACTER SET ascii NOT NULL,"
435-
" PRIMARY KEY (`list_id`,`username`)"
435+
" PRIMARY KEY (`list_id`,`username`),"
436+
" KEY `username` (`username`)"
436437
") DEFAULT CHARSET=utf8mb4";
437438

438439
static constexpr char tbl_classes_top[] =
@@ -778,6 +779,7 @@ static constexpr tbl_upgradefn tbl_upgrade_list[] = {
778779
{129, tbl_altnames_129},
779780
{130, "INSERT INTO altnames (SELECT id AS user_id, altname, 0 AS magic FROM users WHERE altname IS NOT NULL)"},
780781
{131, "UPDATE users SET altname=NULL"},
782+
{132, "ALTER TABLE `associations` ADD INDEX `username` (`username`)"},
781783
{0, nullptr},
782784
};
783785

@@ -789,7 +791,7 @@ int dbop_mysql_recentversion()
789791
int dbop_mysql_upgrade(MYSQL *conn)
790792
{
791793
auto current = dbop_mysql_schemaversion(conn);
792-
mlog(LV_NOTICE, "dbop: Current database schema: gx-%d", current);
794+
mlog(LV_NOTICE, "dbop: Current userdb schema: GX-%d", current);
793795
if (current < 0)
794796
return EXIT_FAILURE;
795797

0 commit comments

Comments
 (0)