From a1cea0f5932c7097bb85507bf35b0577b193a40e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 Jan 2014 07:54:26 +0100 Subject: [PATCH] fix default of TEXT column, propperly set date column TEXT columns can't have a default value in all versions of mysql. Set a properly formated date string instead of '0' when inserting the default users. --- install/create_tables-innodb.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql index 701366980..cd065b66f 100644 --- a/install/create_tables-innodb.sql +++ b/install/create_tables-innodb.sql @@ -39,7 +39,7 @@ CREATE TABLE `tblAttributeDefinitions` ( `minvalues` int(11) NOT NULL default '0', `maxvalues` int(11) NOT NULL default '0', `valueset` text default NULL, - `regex` text DEFAULT '', + `regex` text default NULL, UNIQUE(`name`), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -126,7 +126,7 @@ CREATE TABLE `tblFolders` ( `parent` int(11) default NULL, `folderList` text NOT NULL, `comment` text, - `date` int(12) default NULL, + `date` int(12) default NULL, `owner` int(11) default NULL, `inheritAccess` tinyint(1) NOT NULL default '1', `defaultAccess` tinyint(4) NOT NULL default '0', @@ -708,8 +708,8 @@ CREATE TABLE `tblVersion` ( -- Initial content for database -- -INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0); -INSERT INTO tblUsers VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0); +INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, '0000-00-00 00:00:00', 0, 0, 0); +INSERT INTO tblUsers VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, '0000-00-00 00:00:00', 0, 0, 0); INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', UNIX_TIMESTAMP(), 1, 0, 2, 0); INSERT INTO tblVersion VALUES (NOW(), 4, 3, 0); INSERT INTO tblCategory VALUES (0, '');