View | Details | Raw Unified | Return to bug 14957
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl (-13 / +1 lines)
Lines 1-17 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
3
4
    unless (TableExists('marc_overlay_rules_modules')) {
5
        $dbh->do(q{
6
            CREATE TABLE `marc_overlay_rules_modules` (
7
              `name` varchar(127) NOT NULL,
8
              `description` varchar(255),
9
              `specificity` int(11) NOT NULL UNIQUE,
10
              PRIMARY KEY(`name`)
11
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
12
        });
13
    }
14
15
    unless (TableExists('marc_overlay_rules')) {
4
    unless (TableExists('marc_overlay_rules')) {
16
        $dbh->do(q{
5
        $dbh->do(q{
17
            CREATE TABLE IF NOT EXISTS `marc_overlay_rules` (
6
            CREATE TABLE IF NOT EXISTS `marc_overlay_rules` (
Lines 23-30 if( CheckVersion( $DBversion ) ) { Link Here
23
              `append` TINYINT(1) NOT NULL DEFAULT 0,
12
              `append` TINYINT(1) NOT NULL DEFAULT 0,
24
              `remove` TINYINT(1) NOT NULL DEFAULT 0,
13
              `remove` TINYINT(1) NOT NULL DEFAULT 0,
25
              `delete` TINYINT(1) NOT NULL DEFAULT 0,
14
              `delete` TINYINT(1) NOT NULL DEFAULT 0,
26
              PRIMARY KEY(`id`),
15
              PRIMARY KEY(`id`)
27
              CONSTRAINT `marc_overlay_rules_ibfk1` FOREIGN KEY (`module`) REFERENCES `marc_overlay_rules_modules` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
28
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
16
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
29
        });
17
        });
30
    }
18
    }
(-)a/installer/data/mysql/kohastructure.sql (-15 / +1 lines)
Lines 3382-3399 CREATE TABLE `marc_matchers` ( Link Here
3382
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
3382
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
3383
/*!40101 SET character_set_client = @saved_cs_client */;
3383
/*!40101 SET character_set_client = @saved_cs_client */;
3384
3384
3385
--
3386
-- Table structure for table `marc_overlay_rules_modules`
3387
--
3388
3389
DROP TABLE IF EXISTS `marc_overlay_rules_modules`;
3390
CREATE TABLE `marc_overlay_rules_modules` (
3391
  `name` varchar(127) NOT NULL,
3392
  `description` varchar(255),
3393
  `specificity` int(11) NOT NULL UNIQUE,
3394
  PRIMARY KEY(`name`)
3395
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
3396
3397
--
3385
--
3398
-- Table structure for table `marc_overlay_rules`
3386
-- Table structure for table `marc_overlay_rules`
3399
--
3387
--
Lines 3408-3415 CREATE TABLE IF NOT EXISTS `marc_overlay_rules` ( Link Here
3408
  `append` TINYINT(1) NOT NULL DEFAULT 0,
3396
  `append` TINYINT(1) NOT NULL DEFAULT 0,
3409
  `remove` TINYINT(1) NOT NULL DEFAULT 0,
3397
  `remove` TINYINT(1) NOT NULL DEFAULT 0,
3410
  `delete` TINYINT(1) NOT NULL DEFAULT 0,
3398
  `delete` TINYINT(1) NOT NULL DEFAULT 0,
3411
  PRIMARY KEY(`id`),
3399
  PRIMARY KEY(`id`)
3412
  CONSTRAINT `marc_overlay_rules_ibfk1` FOREIGN KEY (`module`) REFERENCES `marc_overlay_rules_modules` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
3413
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
3400
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
3414
3401
3415
--
3402
--
3416
- 

Return to bug 14957