From c5b8e495b9a75ee6ced582487857a9e9d42e230f Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Fri, 20 Jun 2008 07:54:14 +0000 Subject: [PATCH] upgrade.php: fix as per https://sourceforge.net/forum/forum.php?thread_id=2067293&forum_id=676076 - possible fix for vacation table creation issue git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.2.1@391 a1433add-5e2c-0410-b055-b7f2511e0802 --- upgrade.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/upgrade.php b/upgrade.php index 6f9724a7..47c6740f 100644 --- a/upgrade.php +++ b/upgrade.php @@ -305,11 +305,11 @@ function upgrade_1_mysql() { $sql[] = " CREATE TABLE {IF_NOT_EXISTS} $vacation ( - email varchar(255) NOT NULL default '', - subject varchar(255) NOT NULL default '', + email varchar(255) NOT NULL , + subject varchar(255) NOT NULL, body text NOT NULL, cache text NOT NULL, - domain varchar(255) NOT NULL default '', + domain varchar(255) NOT NULL , created datetime NOT NULL default '0000-00-00 00:00:00', active tinyint(4) NOT NULL default '1', PRIMARY KEY (email), @@ -432,9 +432,9 @@ function upgrade_2_pgsql() { db_query_parsed(' CREATE TABLE ' . table_by_key('vacation') . ' ( email character varying(255) PRIMARY KEY, - subject character varying(255) NOT NULL DEFAULT \'\', - body text NOT NULL DEFAULT \'\', - cache text NOT NULL DEFAULT \'\', + subject character varying(255) NOT NULL, + body text NOT NULL , + cache text NOT NULL , "domain" character varying(255) NOT NULL REFERENCES "domain", created timestamp with time zone DEFAULT now(), active boolean DEFAULT true NOT NULL @@ -689,11 +689,11 @@ function upgrade_5_mysql() { $result = db_query_parsed(" CREATE TABLE {IF_NOT_EXISTS} `" . table_by_key('vacation') . "` ( - `email` varchar(255) NOT NULL default '', - `subject` varchar(255) NOT NULL default '', - `body` text NOT NULL default '', - `cache` text NOT NULL default '', - `domain` varchar(255) NOT NULL default '', + `email` varchar(255) NOT NULL , + `subject` varchar(255) NOT NULL, + `body` text NOT NULL, + `cache` text NOT NULL, + `domain` varchar(255) NOT NULL, `created` datetime NOT NULL default '0000-00-00 00:00:00', `active` tinyint(1) NOT NULL default '1', PRIMARY KEY (`email`),