You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/09/25 13:44:32 UTC
[incubator-streampark] branch dev updated: [Feature] Update the username index for t_user table (#1685)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new a1c45d856 [Feature] Update the username index for t_user table (#1685)
a1c45d856 is described below
commit a1c45d856a0bf60963f13682ee7563b75eb235b2
Author: 1996fanrui <19...@gmail.com>
AuthorDate: Sun Sep 25 21:44:25 2022 +0800
[Feature] Update the username index for t_user table (#1685)
---
.../src/assembly/script/schema/mysql-schema.sql | 4 ++--
.../src/assembly/script/schema/pgsql-schema.sql | 4 ++--
.../src/assembly/script/upgrade/mysql-upgrade.sql | 6 ++++++
.../streampark-console-service/src/main/resources/db/schema-h2.sql | 4 ++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
index 6d502dd26..b42d1b5a8 100644
--- a/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
+++ b/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
@@ -350,7 +350,7 @@ create table `t_setting` (
drop table if exists `t_user`;
create table `t_user` (
`user_id` bigint not null auto_increment comment 'user id',
- `username` varchar(255) collate utf8mb4_general_ci default null comment 'user name',
+ `username` varchar(255) collate utf8mb4_general_ci not null comment 'user name',
`nick_name` varchar(50) collate utf8mb4_general_ci not null comment 'nick name',
`salt` varchar(255) collate utf8mb4_general_ci default null comment 'salt',
`password` varchar(128) collate utf8mb4_general_ci not null comment 'password',
@@ -363,7 +363,7 @@ create table `t_user` (
`avatar` varchar(100) collate utf8mb4_general_ci default null comment 'avatar',
`description` varchar(100) collate utf8mb4_general_ci default null comment 'description',
primary key (`user_id`) using btree,
- unique key `un_username` (`nick_name`) using btree
+ unique key `un_username` (`username`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
diff --git a/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
index 9f4321a3e..11f658a15 100644
--- a/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
+++ b/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
@@ -634,7 +634,7 @@ create sequence "public"."streampark_t_user_id_seq"
create table "public"."t_user" (
"user_id" int8 not null default nextval('streampark_t_user_id_seq'::regclass),
- "username" varchar(255) collate "pg_catalog"."default",
+ "username" varchar(255) collate "pg_catalog"."default" not null,
"nick_name" varchar(50) collate "pg_catalog"."default" not null,
"salt" varchar(255) collate "pg_catalog"."default",
"password" varchar(128) collate "pg_catalog"."default" not null,
@@ -663,7 +663,7 @@ comment on column "public"."t_user"."avatar" is 'avatar';
comment on column "public"."t_user"."description" is 'description';
alter table "public"."t_user" add constraint "t_user_pkey" primary key ("user_id");
create index "un_username" on "public"."t_user" using btree (
- "nick_name" collate "pg_catalog"."default" "pg_catalog"."text_ops" asc nulls last
+ "username" collate "pg_catalog"."default" "pg_catalog"."text_ops" asc nulls last
);
diff --git a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql-upgrade.sql b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql-upgrade.sql
index 9a2b8e4b9..302c95a13 100644
--- a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql-upgrade.sql
+++ b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql-upgrade.sql
@@ -196,5 +196,11 @@ update `t_menu` set `menu_name` = 'StreamPark' where `menu_id` = 100013;
insert into `t_setting` values (15, 'streampark.maven.settings', null, 'Maven Settings File Path', 'Maven Settings.xml 完整路径', 1);
+-- update the index field for t_user;
+alter table `t_user` drop index `un_username`;
+alter table `t_user`
+modify `username` varchar(255) collate utf8mb4_general_ci not null comment 'user name',
+add unique key `un_username` (`username`) using btree;
+
set foreign_key_checks = 1;
-- -------------------------------------- version: 1.2.4 END ---------------------------------------
diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
index c7ae5e2a7..0637edaf9 100644
--- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
+++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
@@ -308,7 +308,7 @@ create table if not exists `t_setting` (
-- ----------------------------
create table if not exists `t_user` (
`user_id` bigint generated by default as identity not null comment 'user id',
- `username` varchar(255) default null comment 'user name',
+ `username` varchar(255) not null comment 'user name',
`nick_name` varchar(50) not null comment 'nick name',
`salt` varchar(255) default null comment 'salt',
`password` varchar(128) not null comment 'password',
@@ -321,7 +321,7 @@ create table if not exists `t_user` (
`avatar` varchar(100) default null comment 'avatar',
`description` varchar(100) default null comment 'description',
primary key(`user_id`),
- unique (`nick_name`)
+ unique (`username`)
);
-- ----------------------------