From a4cc6aea1674966452cca69950d1fb52f3e5f647 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Sat, 17 Sep 2016 22:07:50 -0400 Subject: [PATCH] Bug 17234: [DO NOT PUSH] Make 3.18.x install at least. This patch hobbles past installing a 3.18.x on Ubuntu 16.04 LTS. 2 tweaks to kohastructure and ignoring the security warning about the command line password makes it succeed enough for a DB structure to attempt to upgrade to master. TEST PLAN --------- 1) git checkout -b my_3.18.x origin/3.18.x 2) drop database koha_library; create database koha_library; 3) apply this hacky patch 4) web install -- libraries may need to be sudo apt-get install'd in order to get it to run. 5) hobble through 6) ignore the two errors on installed just the mandatory things. 7) git checkout -b bug_17234 origin/master 8) apply the patch to test 9) web install 10) ignore all the date barfing, because that is not what was fixed. 11) run koha qa test tools on this. --- C4/Installer.pm | 1 + installer/data/mysql/kohastructure.sql | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Installer.pm b/C4/Installer.pm index 63be867..c600b85 100644 --- a/C4/Installer.pm +++ b/C4/Installer.pm @@ -465,6 +465,7 @@ sub load_sql { warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n"; warn "$error"; } + $error =~ s/mysql: \[Warning\] Using a password on the command line interface can be insecure\.\n//g; return $error; } diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 33f926e..ae02bff 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1391,7 +1391,7 @@ CREATE TABLE `letter` ( -- table for all notice templates in Koha `title` varchar(200) NOT NULL default '', -- subject line of the notice `content` text, -- body text for the notice or slip `message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice - PRIMARY KEY (`module`,`code`, `branchcode`, `message_transport_type`), + UNIQUE KEY (`module`,`code`, `branchcode`, `message_transport_type`), CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`) REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -2499,7 +2499,7 @@ CREATE TABLE `permissions` ( `module_bit` int(11) NOT NULL DEFAULT 0, `code` varchar(64) DEFAULT NULL, `description` varchar(255) DEFAULT NULL, - PRIMARY KEY (`module_bit`, `code`), + UNIQUE KEY (`module_bit`, `code`), CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- 2.7.4