diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql index bce5ee7d7..41af12d78 100644 --- a/install/update-6.1.0/update-sqlite3.sql +++ b/install/update-6.1.0/update-sqlite3.sql @@ -1,72 +1,21 @@ BEGIN; -CREATE TABLE `new_tblVersion` ( - `date` TEXT NOT NULL, - `major` INTEGER, - `minor` INTEGER, - `subminor` INTEGER, - `module` varchar(255) -) ; +ALTER TABLE `tblVersion` ADD COLUMN `module` TEXT DEFAULT NULL; -INSERT INTO `new_tblVersion` SELECT * FROM `tblVersion`; +ALTER TABLE `tblDocuments` ADD COLUMN `startdate` TEXT DEFAULT NULL; -DROP TABLE `tblVersion`; +ALTER TABLE `tblDocuments` ADD COLUMN `enddate` TEXT DEFAULT NULL; -ALTER TABLE `new_tblVersion` RENAME TO `tblVersion`; +ALTER TABLE `tblDocumentContent` ADD COLUMN `lastrevisiondate` TEXT DEFAULT NULL; -CREATE TABLE `new_tblDocuments` ( - `id` INTEGER PRIMARY KEY AUTOINCREMENT, - `name` varchar(150) default NULL, - `comment` text, - `date` INTEGER default NULL, - `expires` INTEGER default NULL, - `owner` INTEGER default NULL REFERENCES `tblUsers` (`id`), - `folder` INTEGER default NULL REFERENCES `tblFolders` (`id`), - `folderList` text NOT NULL, - `inheritAccess` INTEGER NOT NULL default '1', - `defaultAccess` INTEGER NOT NULL default '0', - `locked` INTEGER NOT NULL default '-1', - `keywords` text NOT NULL, - `sequence` double NOT NULL default '0', - `startdate` TEXT default NULL, - `enddate` TEXT default NULL -) ; +ALTER TABLE `tblUsers` ADD COLUMN `webauthn` TEXT DEFAULT NULL; -INSERT INTO `new_tblDocuments` SELECT * FROM `tblDocuments`; - -DROP TABLE `tblDocuments`; - -ALTER TABLE `new_tblDocuments` RENAME TO `tblDocuments`; - -CREATE TABLE `new_tblDocumentContent` ( - `id` INTEGER PRIMARY KEY AUTOINCREMENT, - `document` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`), - `version` INTEGER unsigned NOT NULL, - `comment` text, - `date` INTEGER default NULL, - `createdBy` INTEGER default NULL, - `dir` varchar(255) NOT NULL default '', - `orgFileName` varchar(150) NOT NULL default '', - `fileType` varchar(10) NOT NULL default '', - `mimeType` varchar(100) NOT NULL default '', - `fileSize` INTEGER, - `checksum` char(32), - `revisiondate` TEXT default NULL, - `lastrevisiondate` TEXT default NULL, - UNIQUE (`document`,`version`) -) ; - -INSERT INTO `new_tblDocumentContent` SELECT * FROM `tblDocumentContent`; - -DROP TABLE `tblDocumentContent`; - -ALTER TABLE `new_tblDocumentContent` RENAME TO `tblDocumentContent`; +ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` TEXT DEFAULT NULL; CREATE TABLE `new_tblUsers` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `login` varchar(50) default NULL, `pwd` varchar(255) default NULL, - `webauthn` TEXT default NULL, `secret` varchar(50) default NULL, `fullName` varchar(100) default NULL, `email` varchar(70) default NULL, @@ -78,7 +27,6 @@ CREATE TABLE `new_tblUsers` ( `pwdExpiration` TEXT default NULL, `loginfailures` INTEGER NOT NULL default '0', `disabled` INTEGER NOT NULL default '0', - `disabledUntil` TEXT default NULL, `quota` INTEGER, `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`), UNIQUE (`login`) @@ -90,6 +38,10 @@ DROP TABLE `tblUsers`; ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`; +ALTER TABLE `tblUsers` ADD COLUMN `webauthn` TEXT DEFAULT NULL; + +ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` TEXT DEFAULT NULL; + CREATE TABLE `new_tblUserPasswordRequest` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT, `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE, @@ -116,32 +68,9 @@ DROP TABLE `tblUserPasswordHistory`; ALTER TABLE `new_tblUserPasswordHistory` RENAME TO `tblUserPasswordHistory`; -CREATE TABLE `new_tblCategory` ( - `id` INTEGER PRIMARY KEY AUTOINCREMENT, - `name` text NOT NULL, - `color` char(8) DEFAULT NULL, -) ; +ALTER TABLE `tblCategory` ADD COLUMN `color` char(8) DEFAULT NULL; -INSERT INTO `new_tblCategory` SELECT * FROM `tblCategory`; - -DROP TABLE `tblCategory`; - -ALTER TABLE `new_tblCategory` RENAME TO `tblCategory`; - -CREATE TABLE `new_tblNotify` ( - `target` INTEGER NOT NULL default '0', - `targetType` INTEGER NOT NULL default '0', - `userID` INTEGER NOT NULL default '-1', - `groupID` INTEGER NOT NULL default '-1', - `inherit` INTEGER NOT NULL default '0', - UNIQUE (`target`,`targetType`,`userID`,`groupID`) -) ; - -INSERT INTO `new_tblNotify` SELECT * FROM `tblNotify`; - -DROP TABLE `tblNotify`; - -ALTER TABLE `new_tblNotify` RENAME TO `tblNotify`; +ALTER TABLE `tblNotify` ADD COLUMN `inherit` INTEGER NOT NULL DEFAULT '0'; CREATE TABLE `tblAttributeDefinitionGroups` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT,