[Koha-patches] [PATCH] fix for error found during web-installer of database - ERROR 1062 (23000) at line 277: Duplicate entry

[brendan]

---
 installer/data/mysql/en/mandatory/sysprefs.sql |    1 -
 installer/data/mysql/kohastructure.sql         |    8 ++++----
 installer/data/mysql/updatedatabase.pl         |    2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index e1c7529..61a580a 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -274,7 +274,6 @@ INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('S
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '1', 'Enable or disable opac search history', 'YesNo','');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('RoutingListAddReserves','1','If ON the patrons on routing lists are automatically added to holds on the issue.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ( 'OpacAddMastheadLibraryPulldown', '0', '', 'Adds a pulldown menu to select the library to search on the opac masthead.', 'YesNo' );
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('RoutingListAddReserves','1','If ON the patrons on routing lists are automatically added to holds on the issue.','','YesNo');
 INSERT INTO systempreferences VALUES ('ImageLimit',5,'','Limit images stored in the database by the Patron Card image manager to this number.','Integer');
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 3045f13..a74b456 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1032,7 +1032,7 @@ CREATE TABLE `creator_batches` (
   `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `branch_code` varchar(10) NOT NULL DEFAULT 'NB',
   `creator` char(15) NOT NULL DEFAULT 'Labels',
-  PRIMARY KEY (`label_id`) USING BTREE,
+  PRIMARY KEY (`label_id`),
   KEY `branch_fk_constraint` (`branch_code`),
   KEY `item_fk_constraint` (`item_number`),
   KEY `borrower_fk_constraint` (`borrower_number`),
@@ -1052,7 +1052,7 @@ CREATE TABLE `creator_images` (
   `image_id` int(4) NOT NULL AUTO_INCREMENT,
   `imagefile` mediumblob,
   `image_name` char(20) NOT NULL DEFAULT 'DEFAULT',
-  PRIMARY KEY (`image_id`) USING BTREE,
+  PRIMARY KEY (`image_id`),
   UNIQUE KEY `image_name_index` (`image_name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -1078,7 +1078,7 @@ CREATE TABLE `creator_layouts` (
   `format_string` varchar(210) NOT NULL DEFAULT 'barcode',
   `layout_xml` text NOT NULL,
   `creator` char(15) NOT NULL DEFAULT 'Labels',
-  PRIMARY KEY (`layout_id`) USING BTREE
+  PRIMARY KEY (`layout_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1442,7 +1442,7 @@ CREATE TABLE `printers_profile` (
   `units` char(20) NOT NULL default 'POINT',
   `creator` char(15) NOT NULL DEFAULT 'Labels',
   PRIMARY KEY  (`profile_id`),
-  UNIQUE KEY `printername` (`printer_name`,`template_id`,`paper_bin`,`creator`) USING BTREE
+  UNIQUE KEY `printername` (`printer_name`,`template_id`,`paper_bin`,`creator`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 7bd1536..9f4c149 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -1,5 +1,3 @@
--	$dbh->do("ALTER TABLE issuingrules ADD COLUMN `finedays` int(11) default NULL AFTER `fine` ");
--	print "Upgrade done (Adding finedays in issuingrules table)\n";
 #!/usr/bin/perl
 
 
-- 
1.5.6.5