From 8edc7f1985d803e684eea22a8adb042a66b777e3 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 28 Mar 2014 05:01:19 -0400
Subject: [PATCH] Allow null value for dkim fields in mail_user table.
---
install/sql/ispconfig3.sql | 4 ++--
install/sql/incremental/upd_0065.sql | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/sql/incremental/upd_0065.sql b/install/sql/incremental/upd_0065.sql
index ccc790c..767e9b6 100644
--- a/install/sql/incremental/upd_0065.sql
+++ b/install/sql/incremental/upd_0065.sql
@@ -1,7 +1,7 @@
ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
-ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`;
-ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`;
+ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NULL AFTER `domain`;
+ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NULL AFTER `domain`;
ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`;
ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mysql','mongodb') NOT NULL DEFAULT 'web';
ALTER TABLE `web_database_user` ADD `database_password_mongo` varchar(32) DEFAULT NULL AFTER `database_password`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 9e2d6c8..009daa7 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -740,8 +740,8 @@
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
- `dkim_private` mediumtext NOT NULL,
- `dkim_public` mediumtext NOT NULL,
+ `dkim_private` mediumtext NULL,
+ `dkim_public` mediumtext NULL,
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
--
Gitblit v1.9.1