mirror of
https://github.com/pocket-id/pocket-id.git
synced 2026-02-04 15:39:45 +00:00
fix: migration fails if users exist with no email address
This commit is contained in:
@@ -1 +1,8 @@
|
|||||||
UPDATE app_config_variables SET key = 'ldapAdminGroupName' WHERE key = 'ldapAttributeAdminGroup';
|
UPDATE app_config_variables
|
||||||
|
SET key = 'ldapAdminGroupName'
|
||||||
|
WHERE key = 'ldapAttributeAdminGroup'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM app_config_variables
|
||||||
|
WHERE key = 'ldapAdminGroupName'
|
||||||
|
);
|
||||||
@@ -10,8 +10,8 @@ CREATE TABLE users_new
|
|||||||
id TEXT NOT NULL PRIMARY KEY,
|
id TEXT NOT NULL PRIMARY KEY,
|
||||||
created_at DATETIME,
|
created_at DATETIME,
|
||||||
username TEXT COLLATE NOCASE NOT NULL UNIQUE,
|
username TEXT COLLATE NOCASE NOT NULL UNIQUE,
|
||||||
email TEXT NOT NULL UNIQUE,
|
email TEXT UNIQUE,
|
||||||
first_name TEXT,
|
first_name TEXT NOT NULL,
|
||||||
last_name TEXT NOT NULL,
|
last_name TEXT NOT NULL,
|
||||||
display_name TEXT NOT NULL,
|
display_name TEXT NOT NULL,
|
||||||
is_admin BOOLEAN DEFAULT FALSE NOT NULL,
|
is_admin BOOLEAN DEFAULT FALSE NOT NULL,
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
PRAGMA foreign_keys= OFF;
|
PRAGMA foreign_keys= OFF;
|
||||||
BEGIN;
|
BEGIN;
|
||||||
|
|
||||||
UPDATE app_config_variables SET key = 'ldapAdminGroupName' WHERE key = 'ldapAttributeAdminGroup';
|
UPDATE app_config_variables
|
||||||
|
SET key = 'ldapAdminGroupName'
|
||||||
|
WHERE key = 'ldapAttributeAdminGroup'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM app_config_variables
|
||||||
|
WHERE key = 'ldapAdminGroupName'
|
||||||
|
);
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
PRAGMA foreign_keys= ON;
|
PRAGMA foreign_keys= ON;
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No-op
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
PRAGMA foreign_keys= OFF;
|
||||||
|
BEGIN;
|
||||||
|
|
||||||
|
CREATE TABLE users_new
|
||||||
|
(
|
||||||
|
id TEXT NOT NULL PRIMARY KEY,
|
||||||
|
created_at DATETIME,
|
||||||
|
updated_at DATETIME,
|
||||||
|
username TEXT COLLATE NOCASE NOT NULL UNIQUE,
|
||||||
|
email TEXT UNIQUE,
|
||||||
|
first_name TEXT NOT NULL,
|
||||||
|
last_name TEXT NOT NULL,
|
||||||
|
display_name TEXT NOT NULL,
|
||||||
|
is_admin BOOLEAN DEFAULT FALSE NOT NULL,
|
||||||
|
ldap_id TEXT UNIQUE,
|
||||||
|
locale TEXT,
|
||||||
|
disabled BOOLEAN DEFAULT FALSE NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO users_new (
|
||||||
|
id,
|
||||||
|
created_at,
|
||||||
|
updated_at,
|
||||||
|
username,
|
||||||
|
email,
|
||||||
|
first_name,
|
||||||
|
last_name,
|
||||||
|
display_name,
|
||||||
|
is_admin,
|
||||||
|
ldap_id,
|
||||||
|
locale,
|
||||||
|
disabled
|
||||||
|
) SELECT
|
||||||
|
id,
|
||||||
|
created_at,
|
||||||
|
updated_at,
|
||||||
|
username,
|
||||||
|
email,
|
||||||
|
first_name,
|
||||||
|
last_name,
|
||||||
|
display_name,
|
||||||
|
is_admin,
|
||||||
|
ldap_id,
|
||||||
|
locale,
|
||||||
|
disabled FROM users;
|
||||||
|
|
||||||
|
DROP TABLE users;
|
||||||
|
ALTER TABLE users_new RENAME TO users;
|
||||||
|
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
|
PRAGMA foreign_keys= ON;
|
||||||
Reference in New Issue
Block a user