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

(-)a/installer/data/mysql/atomicupdate/bug_18887.perl (+41 lines)
Line 0 Link Here
1
$DBversion = 'XXX';  # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
4
    $dbh->do(q{
5
        CREATE TABLE `circulation_rules` (
6
          `id` int(11) NOT NULL auto_increment,
7
          `branchcode` varchar(10) NULL default NULL,
8
          `categorycode` varchar(10) NULL default NULL,
9
          `itemtype` varchar(10) NULL default NULL,
10
          `rule_name` varchar(32) NOT NULL,
11
          `rule_value` varchar(32) NOT NULL,
12
          PRIMARY KEY (`id`),
13
          KEY `branchcode` (`branchcode`),
14
          KEY `categorycode` (`categorycode`),
15
          KEY `itemtype` (`itemtype`),
16
          KEY `rule_name` (`rule_name`),
17
          UNIQUE (`branchcode`,`categorycode`,`itemtype`,`rule_name`)
18
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
19
    });
20
21
    $dbh->do(q{
22
        INSERT INTO circulation_rules ( branchcode, categorycode, itemtype, rule_name, rule_value )
23
        SELECT branchcode, categorycode, NULL, 'max_holds', max_holds FROM branch_borrower_circ_rules
24
    });
25
26
    $dbh->do(q{
27
        INSERT INTO circulation_rules ( branchcode, categorycode, itemtype, rule_name, rule_value )
28
        SELECT NULL, categorycode, NULL, 'max_holds', max_holds FROM branch_borrower_circ_rules
29
    });
30
31
    $dbh->do(q{
32
        ALTER TABLE branch_borrower_circ_rules DROP COLUMN max_holds
33
    });
34
35
    $dbh->do(q{
36
        ALTER TABLE default_borrower_circ_rules DROP COLUMN max_holds
37
    });
38
39
    SetVersion( $DBversion );
40
    print "Upgrade to $DBversion done (Bug 18887 - Introduce new table 'circulation_rules', use for 'max_holds' rules)\n";
41
}
(-)a/installer/data/mysql/kohastructure.sql (-1 / +19 lines)
Lines 4208-4213 CREATE TABLE `oauth_access_tokens` ( Link Here
4208
    PRIMARY KEY (`access_token`)
4208
    PRIMARY KEY (`access_token`)
4209
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4209
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4210
4210
4211
--
4212
-- Table structure for table `circulation_rules`
4213
--
4214
4215
DROP TABLE IF EXISTS `circulation_rules`;
4216
CREATE TABLE `circulation_rules` (
4217
  `id` int(11) NOT NULL auto_increment,
4218
  `branchcode` varchar(10) NULL default NULL,
4219
  `categorycode` varchar(10) NULL default NULL,
4220
  `itemtype` varchar(10) NULL default NULL,
4221
  `rule_name` varchar(32) NOT NULL,
4222
  `rule_value` varchar(32) NOT NULL,
4223
  PRIMARY KEY (`id`),
4224
  KEY `branchcode` (`branchcode`),
4225
  KEY `categorycode` (`categorycode`),
4226
  KEY `itemtype` (`itemtype`),
4227
  UNIQUE (`branchcode`,`categorycode`,`itemtype`)
4228
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4229
4211
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
4230
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
4212
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
4231
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
4213
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
4232
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
4214
- 

Return to bug 18887