senior/roundcube-ident_switch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SQL schema issues across all database engines

Browse Source 
- Increase password column from varchar(64) to varchar(255) to
  prevent silent truncation of encrypted passwords
- Add missing UNIQUE constraint on iid in MySQL
- Add missing IX_ident_switch_iid index in PostgreSQL
- Remove deprecated int display width in MySQL (int(10) -> int)
- Fix trailing comma syntax error in SQLite 2018121800 migration
- Normalize indentation across all initial SQL files
- Add migration 2026021000 for all engines to fix existing installs
This commit is contained in:
Laurent Dinclaux
2026-02-10 10:35:20 +11:00
parent 958af7769f
commit 3c4d856d60
7 changed files with 113 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SQL/mysql.initial.sql
View File

@@ -1,19 +1,20 @@
CREATE TABLE IF NOT EXISTS `ident_switch` CREATE TABLE IF NOT EXISTS `ident_switch`
( (
`id` `id`
int(10) UNSIGNED int UNSIGNED
NOT NULL NOT NULL
AUTO_INCREMENT, AUTO_INCREMENT,
`user_id` `user_id`
int(10) UNSIGNED int UNSIGNED
NOT NULL, NOT NULL,
`iid` `iid`
int(10) UNSIGNED int UNSIGNED
NOT NULL, NOT NULL
UNIQUE,
`username` `username`
varchar(64), varchar(64),
`password` `password`
varchar(64), varchar(255),
`imap_host` `imap_host`
varchar(64), varchar(64),
`imap_port` `imap_port`
@@ -33,9 +34,9 @@ CREATE TABLE IF NOT EXISTS `ident_switch`
int int
CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535), CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535),
`smtp_auth` `smtp_auth`
smallint smallint
NOT NULL NOT NULL
DEFAULT 1, DEFAULT 1,
`drafts_mbox` `drafts_mbox`
varchar(64), varchar(64),
`sent_mbox` `sent_mbox`
@@ -51,4 +52,3 @@ CREATE TABLE IF NOT EXISTS `ident_switch`
INDEX `IX_ident_switch_user_id`(`user_id`), INDEX `IX_ident_switch_user_id`(`user_id`),
INDEX `IX_ident_switch_iid`(`iid`) INDEX `IX_ident_switch_iid`(`iid`)
); );

5
SQL/mysql/2026021000.sql Normal file
View File

@@ -0,0 +1,5 @@
ALTER TABLE `ident_switch`
MODIFY `password` varchar(255);
ALTER TABLE `ident_switch`
ADD UNIQUE (`iid`);

36
SQL/postgres.initial.sql
View File

@@ -15,14 +15,14 @@ CREATE TABLE ident_switch
username username
varchar(64), varchar(64),
password password
varchar(64), varchar(255),
imap_host imap_host
varchar(64), varchar(64),
imap_port imap_port
integer integer
CHECK(imap_port > 0 AND imap_port <= 65535), CHECK(imap_port > 0 AND imap_port <= 65535),
imap_delimiter imap_delimiter
char(1), char(1),
label label
varchar(32), varchar(32),
flags flags
@@ -30,26 +30,24 @@ CREATE TABLE ident_switch
NOT NULL NOT NULL
DEFAULT(0), DEFAULT(0),
smtp_host smtp_host
varchar(64), varchar(64),
smtp_port smtp_port
integer integer
CHECK(smtp_port > 0 AND smtp_port <= 65535), CHECK(smtp_port > 0 AND smtp_port <= 65535),
smtp_auth smtp_auth
smallint smallint
NOT NULL NOT NULL
DEFAULT(1), DEFAULT(1),
drafts_mbox drafts_mbox
varchar(64), varchar(64),
sent_mbox sent_mbox
varchar(64), varchar(64),
junk_mbox junk_mbox
varchar(64), varchar(64),
trash_mbox trash_mbox
varchar(64), varchar(64),
UNIQUE (user_id, label) UNIQUE (user_id, label)
); );
CREATE INDEX CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
IX_ident_switch_user_id CREATE INDEX IX_ident_switch_iid ON ident_switch(iid);
ON
ident_switch(user_id);

4
SQL/postgres/2026021000.sql Normal file
View File

@@ -0,0 +1,4 @@
ALTER TABLE ident_switch
ALTER COLUMN password TYPE varchar(255);
CREATE INDEX IF NOT EXISTS IX_ident_switch_iid ON ident_switch(iid);

4
SQL/sqlite.initial.sql
View File

@@ -15,7 +15,7 @@ CREATE TABLE ident_switch
username username
varchar(64), varchar(64),
password password
varchar(64), varchar(255),
imap_host imap_host
varchar(64), varchar(64),
imap_port imap_port
@@ -49,4 +49,4 @@ CREATE TABLE ident_switch
UNIQUE (user_id, label) UNIQUE (user_id, label)
); );
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id); CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
CREATE INDEX IX_ident_switch_iid on ident_switch(iid); CREATE INDEX IX_ident_switch_iid ON ident_switch(iid);

2
SQL/sqlite/2018121800.sql
View File

@@ -65,7 +65,7 @@ SELECT
port, port,
label, label,
flags, flags,
host, host
FROM FROM
ident_switch_old; ident_switch_old;

75
SQL/sqlite/2026021000.sql Normal file
View File

@@ -0,0 +1,75 @@
PRAGMA foreign_keys=off;
BEGIN TRANSACTION;
ALTER TABLE ident_switch RENAME TO ident_switch_old;
CREATE TABLE ident_switch
(
id
integer
PRIMARY KEY,
user_id
integer
NOT NULL
REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
iid
integer
NOT NULL
REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
UNIQUE,
username
varchar(64),
password
varchar(255),
imap_host
varchar(64),
imap_port
integer
CHECK(imap_port > 0 AND imap_port <= 65535),
imap_delimiter
char(1),
label
varchar(32),
flags
integer
NOT NULL
DEFAULT(0),
smtp_host
varchar(64),
smtp_port
integer
CHECK(smtp_port > 0 AND smtp_port <= 65535),
smtp_auth
smallint
NOT NULL
DEFAULT 1,
drafts_mbox
varchar(64),
sent_mbox
varchar(64),
junk_mbox
varchar(64),
trash_mbox
varchar(64),
UNIQUE (user_id, label)
);
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
CREATE INDEX IX_ident_switch_iid ON ident_switch(iid);
INSERT OR ROLLBACK INTO
ident_switch (
id, user_id, iid, username, password, imap_host, imap_port,
imap_delimiter, label, flags, smtp_host, smtp_port, smtp_auth,
drafts_mbox, sent_mbox, junk_mbox, trash_mbox
)
SELECT
id, user_id, iid, username, password, imap_host, imap_port,
imap_delimiter, label, flags, smtp_host, smtp_port, smtp_auth,
drafts_mbox, sent_mbox, junk_mbox, trash_mbox
FROM
ident_switch_old;
DROP TABLE ident_switch_old;
COMMIT;
PRAGMA foreign_keys=on;