From c2522876ff6f3d8707bd82882b88dc4f480c3e72 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Tue, 25 Mar 2014 18:23:56 +0100 Subject: [PATCH] Some SQL fixes for MariaDB compatibility. @see commit 9a8de140c82d0db44ac6b6a6a1f31485df9072ab --- install/sql/incremental/upd_0026.sql | 2 +- install/sql/incremental/upd_0042.sql | 2 +- install/sql/incremental/upd_0067.sql | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/sql/incremental/upd_0026.sql b/install/sql/incremental/upd_0026.sql index b5787a925e..a859ee2713 100644 --- a/install/sql/incremental/upd_0026.sql +++ b/install/sql/incremental/upd_0026.sql @@ -1 +1 @@ -ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; \ No newline at end of file +ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; \ No newline at end of file diff --git a/install/sql/incremental/upd_0042.sql b/install/sql/incremental/upd_0042.sql index 8d1b7b4c26..1c195b53a3 100644 --- a/install/sql/incremental/upd_0042.sql +++ b/install/sql/incremental/upd_0042.sql @@ -1,4 +1,4 @@ -- increase column size -ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT ''; +ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL; diff --git a/install/sql/incremental/upd_0067.sql b/install/sql/incremental/upd_0067.sql index 10eb88fe2a..3604460f65 100644 --- a/install/sql/incremental/upd_0067.sql +++ b/install/sql/incremental/upd_0067.sql @@ -1,7 +1,7 @@ ALTER TABLE `client` - ADD `web_servers` blob NOT NULL DEFAULT '' AFTER `default_webserver`, - ADD `mail_servers` blob NOT NULL DEFAULT '' AFTER `default_mailserver`, - ADD `db_servers` blob NOT NULL DEFAULT '' AFTER `default_dbserver`, - ADD `dns_servers` blob NOT NULL DEFAULT '' AFTER `default_dnsserver`; + ADD `web_servers` blob NOT NULL AFTER `default_webserver`, + ADD `mail_servers` blob NOT NULL AFTER `default_mailserver`, + ADD `db_servers` blob NOT NULL AFTER `default_dbserver`, + ADD `dns_servers` blob NOT NULL AFTER `default_dnsserver`; UPDATE `client` SET `web_servers` = `default_webserver`, `mail_servers` = `default_mailserver`, `db_servers` = `default_dbserver`, `dns_servers` = `default_dnsserver` WHERE 1; -- GitLab