From 865910e7a2df7089a375915205c01c058ee1a05b Mon Sep 17 00:00:00 2001 From: Charles Farmer Date: Mon, 17 Sep 2018 11:59:59 -0400 Subject: [PATCH] Bug 17015: (follow-up) keep kohastructure.sql clean to avoid bugs when installing a fresh koha directly over this patchset --- installer/data/mysql/kohastructure.sql | 49 +++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 84205f0..f086cbe 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -693,22 +693,6 @@ CREATE TABLE `deleteditems` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- --- Table structure for table `discrete_calendar` --- - -DROP TABLE IF EXISTS `discrete_calendar`; -CREATE TABLE `discrete_calendar` ( - `date` datetime NOT NULL, - `branchcode` varchar(10) NOT NULL, - `is_opened` tinyint(1) DEFAULT 1, - `holiday_type` varchar(1) DEFAULT '', - `note` varchar(30) DEFAULT '', - `open_hour` time NOT NULL, - `close_hour` time NOT NULL, - PRIMARY KEY (`branchcode`,`date`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- -- Table structure for table `export_format` -- @@ -1408,6 +1392,22 @@ CREATE TABLE `printers_profile` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- +-- Table structure for table `repeatable_holidays` +-- + +DROP TABLE IF EXISTS `repeatable_holidays`; +CREATE TABLE `repeatable_holidays` ( -- information for the days the library is closed + `id` int(11) NOT NULL auto_increment, -- unique identifier assigned by Koha + `branchcode` varchar(10) NOT NULL default '', -- foreign key from the branches table, defines which branch this closing is for + `weekday` smallint(6) default NULL, -- day of the week (0=Sunday, 1=Monday, etc) this closing is repeated on + `day` smallint(6) default NULL, -- day of the month this closing is on + `month` smallint(6) default NULL, -- month this closing is in + `title` varchar(50) NOT NULL default '', -- title of this closing + `description` MEDIUMTEXT NOT NULL, -- description for this closing + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- -- Table structure for table `reports_dictionary` -- @@ -1965,6 +1965,23 @@ CREATE TABLE `reviews` ( -- patron opac comments ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- +-- Table structure for table `special_holidays` +-- + +DROP TABLE IF EXISTS `special_holidays`; +CREATE TABLE `special_holidays` ( -- non repeatable holidays/library closings + `id` int(11) NOT NULL auto_increment, -- unique identifier assigned by Koha + `branchcode` varchar(10) NOT NULL default '', -- foreign key from the branches table, defines which branch this closing is for + `day` smallint(6) NOT NULL default 0, -- day of the month this closing is on + `month` smallint(6) NOT NULL default 0, -- month this closing is in + `year` smallint(6) NOT NULL default 0, -- year this closing is in + `isexception` smallint(1) NOT NULL default 1, -- is this a holiday exception to a repeatable holiday (1 for yes, 0 for no) + `title` varchar(50) NOT NULL default '', -- title for this closing + `description` MEDIUMTEXT NOT NULL, -- description of this closing + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- -- Table structure for table `statistics` -- -- 2.7.4