From 5d871967eadef5476da0b4f52dac1f1d0a693eb1 Mon Sep 17 00:00:00 2001 From: HMYDK Date: Mon, 17 Jun 2024 15:42:37 +0800 Subject: [PATCH] =?UTF-8?q?Add=20an=20id=20primary=20key=20column=20to=20b?= =?UTF-8?q?oth=20the=20roles=20and=20permissions=20tables.=EF=BC=88mysql-s?= =?UTF-8?q?chema.sql=EF=BC=89=20(#12206)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/src/main/resources/META-INF/mysql-schema.sql | 12 +++++++++--- distribution/conf/mysql-schema.sql | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/config/src/main/resources/META-INF/mysql-schema.sql b/config/src/main/resources/META-INF/mysql-schema.sql index fe521426b..58437fb0f 100644 --- a/config/src/main/resources/META-INF/mysql-schema.sql +++ b/config/src/main/resources/META-INF/mysql-schema.sql @@ -190,21 +190,27 @@ CREATE TABLE `tenant_info` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; CREATE TABLE `users` ( - `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `username` varchar(50) NOT NULL COMMENT 'username', `password` varchar(500) NOT NULL COMMENT 'password', - `enabled` boolean NOT NULL COMMENT 'enabled' + `enabled` boolean NOT NULL COMMENT 'enabled', + PRIMARY KEY (`id`) ); CREATE TABLE `roles` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `username` varchar(50) NOT NULL COMMENT 'username', `role` varchar(50) NOT NULL COMMENT 'role', - UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE + PRIMARY KEY (`id`), + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE ); CREATE TABLE `permissions` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `role` varchar(50) NOT NULL COMMENT 'role', `resource` varchar(128) NOT NULL COMMENT 'resource', `action` varchar(8) NOT NULL COMMENT 'action', + PRIMARY KEY (`id`), UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); diff --git a/distribution/conf/mysql-schema.sql b/distribution/conf/mysql-schema.sql index d3c06606e..1fd982534 100644 --- a/distribution/conf/mysql-schema.sql +++ b/distribution/conf/mysql-schema.sql @@ -190,21 +190,27 @@ CREATE TABLE `tenant_info` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; CREATE TABLE `users` ( - `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `username` varchar(50) NOT NULL COMMENT 'username', `password` varchar(500) NOT NULL COMMENT 'password', - `enabled` boolean NOT NULL COMMENT 'enabled' + `enabled` boolean NOT NULL COMMENT 'enabled', + PRIMARY KEY (`id`) ); CREATE TABLE `roles` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `username` varchar(50) NOT NULL COMMENT 'username', `role` varchar(50) NOT NULL COMMENT 'role', - UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE + PRIMARY KEY (`id`), + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE ); CREATE TABLE `permissions` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `role` varchar(50) NOT NULL COMMENT 'role', `resource` varchar(128) NOT NULL COMMENT 'resource', `action` varchar(8) NOT NULL COMMENT 'action', + PRIMARY KEY (`id`), UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE );