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

(-)a/installer/data/mysql/atomicupdate/bug_18887.perl (-3 / +4 lines)
Lines 11-19 if( CheckVersion( $DBversion ) ) { Link Here
11
              `rule_name` varchar(32) NOT NULL,
11
              `rule_name` varchar(32) NOT NULL,
12
              `rule_value` varchar(32) NOT NULL,
12
              `rule_value` varchar(32) NOT NULL,
13
              PRIMARY KEY (`id`),
13
              PRIMARY KEY (`id`),
14
              KEY `branchcode` (`branchcode`),
14
15
              KEY `categorycode` (`categorycode`),
15
              CONSTRAINT `circ_rules_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
16
              KEY `itemtype` (`itemtype`),
16
              CONSTRAINT `circ_rules_ibfk_2` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`) ON DELETE CASCADE ON UPDATE CASCADE,
17
              CONSTRAINT `circ_rules_ibfk_3` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
17
              KEY `rule_name` (`rule_name`),
18
              KEY `rule_name` (`rule_name`),
18
              UNIQUE (`branchcode`,`categorycode`,`itemtype`,`rule_name`)
19
              UNIQUE (`branchcode`,`categorycode`,`itemtype`,`rule_name`)
19
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
20
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
(-)a/installer/data/mysql/kohastructure.sql (-4 / +3 lines)
Lines 4219-4227 CREATE TABLE `circulation_rules` ( Link Here
4219
  `rule_name` varchar(32) NOT NULL,
4219
  `rule_name` varchar(32) NOT NULL,
4220
  `rule_value` varchar(32) NOT NULL,
4220
  `rule_value` varchar(32) NOT NULL,
4221
  PRIMARY KEY (`id`),
4221
  PRIMARY KEY (`id`),
4222
  KEY `branchcode` (`branchcode`),
4222
  CONSTRAINT `circ_rules_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
4223
  KEY `categorycode` (`categorycode`),
4223
  CONSTRAINT `circ_rules_ibfk_2` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`) ON DELETE CASCADE ON UPDATE CASCADE,
4224
  KEY `itemtype` (`itemtype`),
4224
  CONSTRAINT `circ_rules_ibfk_3` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
4225
  KEY `rule_name` (`rule_name`),
4225
  KEY `rule_name` (`rule_name`),
4226
  UNIQUE (`branchcode`,`categorycode`,`itemtype`,`rule_name`)
4226
  UNIQUE (`branchcode`,`categorycode`,`itemtype`,`rule_name`)
4227
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4227
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4228
- 

Return to bug 18887