diff --git a/4dev/database/database_create_data.sql b/4dev/database/database_create_data.sql index d0553cb8..a19959f6 100644 --- a/4dev/database/database_create_data.sql +++ b/4dev/database/database_create_data.sql @@ -595,7 +595,7 @@ CREATE TABLE edit_user ( password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested password_reset_uid VARCHAR, -- the uid to access the password reset page -- _GET login id for direct login - login_user_id VARCHAR, -- the login uid, at least 32 chars + login_user_id VARCHAR UNIQUE, -- the login uid, at least 32 chars login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid @@ -606,7 +606,7 @@ CREATE TABLE edit_user ( ) INHERITS (edit_generic) WITHOUT OIDS; -- create unique index -CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; +-- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; COMMENT ON COLUMN edit_user.username IS 'Login username, must set'; COMMENT ON COLUMN edit_user.password IS 'Login password, must set'; diff --git a/4dev/database/table/edit_user.sql b/4dev/database/table/edit_user.sql index 030f059f..9cdd7c8c 100644 --- a/4dev/database/table/edit_user.sql +++ b/4dev/database/table/edit_user.sql @@ -55,7 +55,7 @@ CREATE TABLE edit_user ( password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested password_reset_uid VARCHAR, -- the uid to access the password reset page -- _GET login id for direct login - login_user_id VARCHAR, -- the login uid, at least 32 chars + login_user_id VARCHAR UNIQUE, -- the login uid, at least 32 chars login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid @@ -66,7 +66,7 @@ CREATE TABLE edit_user ( ) INHERITS (edit_generic) WITHOUT OIDS; -- create unique index -CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; +-- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; COMMENT ON COLUMN edit_user.username IS 'Login username, must set'; COMMENT ON COLUMN edit_user.password IS 'Login password, must set'; diff --git a/4dev/database/update/20220617-edit_user_login_user_id_add.sql b/4dev/database/update/20220617-edit_user_login_user_id_add.sql index d3377ecb..6117ce5a 100644 --- a/4dev/database/update/20220617-edit_user_login_user_id_add.sql +++ b/4dev/database/update/20220617-edit_user_login_user_id_add.sql @@ -1,8 +1,9 @@ -- 2022/6/17 update edit_user with login uid -- the login uid, at least 32 chars -ALTER TABLE edit_user ADD login_user_id VARCHAR; -CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; +ALTER TABLE edit_user ADD login_user_id VARCHAR UNIQUE; +-- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; +-- ALTER TABLE edit_user ADD CONSTRAINT edit_user_login_user_id_key UNIQUE (login_user_id); -- when above uid was set ALTER TABLE edit_user ADD login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE; -- if set, from/until when the above uid is valid diff --git a/4dev/tests/database/CoreLibsACLLogin_database_create_data.sql b/4dev/tests/database/CoreLibsACLLogin_database_create_data.sql index d0553cb8..a19959f6 100644 --- a/4dev/tests/database/CoreLibsACLLogin_database_create_data.sql +++ b/4dev/tests/database/CoreLibsACLLogin_database_create_data.sql @@ -595,7 +595,7 @@ CREATE TABLE edit_user ( password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested password_reset_uid VARCHAR, -- the uid to access the password reset page -- _GET login id for direct login - login_user_id VARCHAR, -- the login uid, at least 32 chars + login_user_id VARCHAR UNIQUE, -- the login uid, at least 32 chars login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid @@ -606,7 +606,7 @@ CREATE TABLE edit_user ( ) INHERITS (edit_generic) WITHOUT OIDS; -- create unique index -CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; +-- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; COMMENT ON COLUMN edit_user.username IS 'Login username, must set'; COMMENT ON COLUMN edit_user.password IS 'Login password, must set';