From 3b9541d49922a871794cafd6230439d8c3b905d2 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 25 Jul 2011 11:33:23 +0200 Subject: [PATCH] 6094 Fixing ModAuthority problems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only contains db revision to insert new table need_merge_authorities. You can apply the revision by running cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change your version while testing.) Oct 19, 2011: Rebased after functionality patch signoff. Signed-off-by: Frédéric Demians --- installer/data/mysql/kohastructure.sql | 11 +++++++++++ installer/data/mysql/updatedatabase.pl | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index c119ca1..e4388a4 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1311,6 +1311,17 @@ CREATE TABLE `matchchecks` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- +-- Table structure for table `need_merge_authorities` +-- + +DROP TABLE IF EXISTS `need_merge_authorities`; +CREATE TABLE `need_merge_authorities` ( + `id` int NOT NULL auto_increment PRIMARY KEY, + `authid` bigint NOT NULL, + `done` tinyint DEFAULT 0 +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -- Table structure for table `notifys` -- diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e3309a2..058862a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4523,6 +4523,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.05.00.XXX"; #RM: Please remove 1 from if and uncomment SetVersion too!! +if (1||C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("CREATE TABLE need_merge_authorities (id int NOT NULL auto_increment PRIMARY KEY, authid bigint NOT NULL, done tinyint DEFAULT 0) ENGINE=InnoDB DEFAULT CHARSET=utf8"); + print "Upgrade to $DBversion done (6094: Fixing ModAuthority problems, add a need_merge_authorities table)\n"; + #SetVersion($DBversion); +} =head1 FUNCTIONS -- 1.7.6.1