From a5b1a01be31cdb3aa888b2447c6d749bf991a786 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 4 Oct 2012 09:46:13 +0000 Subject: [PATCH] Changed encoding of incremental sql files to "UTF8 ohne BOM" as some older mysql versions cant load them otherwise with errors like: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ALTER TABLE `web_domain` ADD `pm` ENUM( 'static', 'dynamic', 'ondemand' ) NOT' at line 1 Loading SQL patch file: /tmp/trunk/install/sql/incremental/upd_0032.sql --- install/sql/incremental/upd_0032.sql | 2 +- install/sql/incremental/upd_0033.sql | 2 +- install/sql/incremental/upd_0034.sql | 2 +- install/sql/incremental/upd_0035.sql | 2 +- install/sql/incremental/upd_0036.sql | 2 +- install/sql/incremental/upd_0037.sql | 2 +- install/sql/incremental/upd_0038.sql | 2 +- install/sql/incremental/upd_0039.sql | 2 +- install/sql/incremental/upd_0040.sql | 2 +- install/sql/incremental/upd_0041.sql | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/install/sql/incremental/upd_0032.sql b/install/sql/incremental/upd_0032.sql index 02e217817..d4a080dfd 100644 --- a/install/sql/incremental/upd_0032.sql +++ b/install/sql/incremental/upd_0032.sql @@ -1,2 +1,2 @@ -ALTER TABLE `web_domain` ADD `pm` ENUM( 'static', 'dynamic', 'ondemand' ) NOT NULL DEFAULT 'dynamic' AFTER `php_fpm_use_socket`; +ALTER TABLE `web_domain` ADD `pm` ENUM( 'static', 'dynamic', 'ondemand' ) NOT NULL DEFAULT 'dynamic' AFTER `php_fpm_use_socket`; ALTER TABLE `web_domain` ADD `pm_process_idle_timeout` INT NOT NULL DEFAULT '10' AFTER `pm_max_spare_servers` , ADD `pm_max_requests` INT NOT NULL DEFAULT '0' AFTER `pm_process_idle_timeout`; \ No newline at end of file diff --git a/install/sql/incremental/upd_0033.sql b/install/sql/incremental/upd_0033.sql index d5ea97356..d4b3c0d6a 100644 --- a/install/sql/incremental/upd_0033.sql +++ b/install/sql/incremental/upd_0033.sql @@ -1,4 +1,4 @@ -CREATE TABLE IF NOT EXISTS `client_circle` ( +CREATE TABLE IF NOT EXISTS `client_circle` ( `circle_id` int(11) NOT NULL AUTO_INCREMENT, `sys_userid` int(11) NOT NULL DEFAULT '0', `sys_groupid` int(11) NOT NULL DEFAULT '0', diff --git a/install/sql/incremental/upd_0034.sql b/install/sql/incremental/upd_0034.sql index 58b53c70b..8ae098c01 100644 --- a/install/sql/incremental/upd_0034.sql +++ b/install/sql/incremental/upd_0034.sql @@ -1,4 +1,4 @@ --- -------------------------------------------------------- +-- -------------------------------------------------------- -- -- Table structure for table `aps_instances` diff --git a/install/sql/incremental/upd_0035.sql b/install/sql/incremental/upd_0035.sql index aeaf82103..b2f85163b 100644 --- a/install/sql/incremental/upd_0035.sql +++ b/install/sql/incremental/upd_0035.sql @@ -1,4 +1,4 @@ --- -------------------------------------------------------- +-- -------------------------------------------------------- -- -- Table structure for table `sys_theme` diff --git a/install/sql/incremental/upd_0036.sql b/install/sql/incremental/upd_0036.sql index 8ac2daf6e..0e5a3018b 100644 --- a/install/sql/incremental/upd_0036.sql +++ b/install/sql/incremental/upd_0036.sql @@ -1,4 +1,4 @@ --- -------------------------------------------------------- +-- -------------------------------------------------------- ALTER TABLE `web_domain` ADD `perl` enum('n','y') NOT NULL default 'n' AFTER `python`; diff --git a/install/sql/incremental/upd_0037.sql b/install/sql/incremental/upd_0037.sql index dcf89cc6d..cd904e0be 100644 --- a/install/sql/incremental/upd_0037.sql +++ b/install/sql/incremental/upd_0037.sql @@ -1,4 +1,4 @@ --- -------------------------------------------------------- +-- -------------------------------------------------------- ALTER TABLE `client` ADD `limit_cgi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `web_php_options`, ADD `limit_ssi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_cgi`, diff --git a/install/sql/incremental/upd_0038.sql b/install/sql/incremental/upd_0038.sql index f0d723c79..eecc645aa 100644 --- a/install/sql/incremental/upd_0038.sql +++ b/install/sql/incremental/upd_0038.sql @@ -1,4 +1,4 @@ --- -------------------------------------------------------- +-- -------------------------------------------------------- ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ; diff --git a/install/sql/incremental/upd_0039.sql b/install/sql/incremental/upd_0039.sql index dd1b55129..af8a5afc5 100644 --- a/install/sql/incremental/upd_0039.sql +++ b/install/sql/incremental/upd_0039.sql @@ -1,4 +1,4 @@ --- -------------------------------------------------------- +-- -------------------------------------------------------- -- -- Tabellenstruktur für Tabelle `web_database_user` diff --git a/install/sql/incremental/upd_0040.sql b/install/sql/incremental/upd_0040.sql index 423772e86..b39e8f11f 100644 --- a/install/sql/incremental/upd_0040.sql +++ b/install/sql/incremental/upd_0040.sql @@ -1,4 +1,4 @@ - + -- Removal of the domain module UPDATE sys_user SET startmodule = 'dashboard' WHERE startmodule = 'domain'; UPDATE sys_user SET modules = replace(modules, ',domain', '') WHERE modules like '%domain%'; diff --git a/install/sql/incremental/upd_0041.sql b/install/sql/incremental/upd_0041.sql index ba8ee6436..47f5fdfa0 100644 --- a/install/sql/incremental/upd_0041.sql +++ b/install/sql/incremental/upd_0041.sql @@ -1,4 +1,4 @@ - + -- Add bank account owner ALTER TABLE `client` ADD `bank_account_owner` varchar(255) DEFAULT NULL AFTER `notes`; -- GitLab