mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-12 12:41:30 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
3ac9bcafc7
|
@ -59,6 +59,10 @@ CREATE TABLE `tblDocumentFiles` (
|
||||||
|
|
||||||
INSERT INTO `tblDocumentFiles` SELECT * FROM `__tblDocumentFiles`;
|
INSERT INTO `tblDocumentFiles` SELECT * FROM `__tblDocumentFiles`;
|
||||||
|
|
||||||
|
ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` INTEGER unsigned NOT NULL DEFAULT '0';
|
||||||
|
|
||||||
|
ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` INTEGER unsigned NOT NULL DEFAULT '0';
|
||||||
|
|
||||||
ALTER TABLE `tblUsers` RENAME TO `__tblUsers`;
|
ALTER TABLE `tblUsers` RENAME TO `__tblUsers`;
|
||||||
|
|
||||||
CREATE TABLE `tblUsers` (
|
CREATE TABLE `tblUsers` (
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
START TRANSACTION;
|
START TRANSACTION;
|
||||||
|
|
||||||
ALTER TABLE `tblDocumentContent` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
|
ALTER TABLE `tblDocumentContent` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL DEFAULT '';
|
||||||
|
|
||||||
ALTER TABLE `tblDocumentFiles` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
|
ALTER TABLE `tblDocumentFiles` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL DEFAULT '';
|
||||||
|
|
||||||
ALTER TABLE `tblUserImages` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
|
ALTER TABLE `tblUserImages` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL DEFAULT '';
|
||||||
|
|
||||||
ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` tinyint(1) NOT NULL default '0' AFTER `document`;
|
ALTER TABLE `tblDocumentFiles` ADD COLUMN `public` tinyint(1) NOT NULL DEFAULT '0' AFTER `document`;
|
||||||
|
|
||||||
ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` smallint(5) unsigned NOT NULL default '0' AFTER `document`;
|
ALTER TABLE `tblDocumentFiles` ADD COLUMN `version` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `document`;
|
||||||
|
|
||||||
ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime default NULL;
|
ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime DEFAULT NULL;
|
||||||
|
|
||||||
ALTER TABLE `tblUserPasswordRequest` CHANGE `date` `date` datetime NOT NULL;
|
ALTER TABLE `tblUserPasswordRequest` CHANGE `date` `date` datetime NOT NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user