@@ -, +, @@ --- .../atomicupdate/bug_14957-marc-merge-rules.perl | 14 +------------- installer/data/mysql/kohastructure.sql | 15 +-------------- 2 files changed, 2 insertions(+), 27 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl +++ a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl @@ -1,17 +1,6 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { - unless (TableExists('marc_overlay_rules_modules')) { - $dbh->do(q{ - CREATE TABLE `marc_overlay_rules_modules` ( - `name` varchar(127) NOT NULL, - `description` varchar(255), - `specificity` int(11) NOT NULL UNIQUE, - PRIMARY KEY(`name`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - }); - } - unless (TableExists('marc_overlay_rules')) { $dbh->do(q{ CREATE TABLE IF NOT EXISTS `marc_overlay_rules` ( @@ -23,8 +12,7 @@ if( CheckVersion( $DBversion ) ) { `append` TINYINT(1) NOT NULL DEFAULT 0, `remove` TINYINT(1) NOT NULL DEFAULT 0, `delete` TINYINT(1) NOT NULL DEFAULT 0, - PRIMARY KEY(`id`), - CONSTRAINT `marc_overlay_rules_ibfk1` FOREIGN KEY (`module`) REFERENCES `marc_overlay_rules_modules` (`name`) ON DELETE CASCADE ON UPDATE CASCADE + PRIMARY KEY(`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; }); } --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -3382,18 +3382,6 @@ CREATE TABLE `marc_matchers` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `marc_overlay_rules_modules` --- - -DROP TABLE IF EXISTS `marc_overlay_rules_modules`; -CREATE TABLE `marc_overlay_rules_modules` ( - `name` varchar(127) NOT NULL, - `description` varchar(255), - `specificity` int(11) NOT NULL UNIQUE, - PRIMARY KEY(`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - -- -- Table structure for table `marc_overlay_rules` -- @@ -3408,8 +3396,7 @@ CREATE TABLE IF NOT EXISTS `marc_overlay_rules` ( `append` TINYINT(1) NOT NULL DEFAULT 0, `remove` TINYINT(1) NOT NULL DEFAULT 0, `delete` TINYINT(1) NOT NULL DEFAULT 0, - PRIMARY KEY(`id`), - CONSTRAINT `marc_overlay_rules_ibfk1` FOREIGN KEY (`module`) REFERENCES `marc_overlay_rules_modules` (`name`) ON DELETE CASCADE ON UPDATE CASCADE + PRIMARY KEY(`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- --