@@ -, +, @@ --- installer/data/mysql/kohastructure.sql | 31 +++++++++++++++++++++++++ installer/data/mysql/updatedatabase.pl | 40 +++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -3231,6 +3231,37 @@ CREATE TABLE IF NOT EXISTS plugin_data ( PRIMARY KEY (plugin_class,plugin_key) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- +-- Table structure for table addition_fields +-- This table add the ability to add new fields for a record +-- + +CREATE TABLE `additional_fields` ( + `id` int(11) NOT NULL AUTO_INCREMENT, -- primary key identifier + `tablename` varchar(255) NOT NULL DEFAULT '', -- tablename of the new field + `name` varchar(255) NOT NULL DEFAULT '', -- name of the field + `authorised_value_category` varchar(16) NOT NULL DEFAULT '', -- is an authorised value category + `marcfield` varchar(16) NOT NULL DEFAULT '', -- contains the marc field to copied into the record + `searchable` tinyint(1) NOT NULL DEFAULT '0', -- is the field searchable? + PRIMARY KEY (`id`), + UNIQUE KEY `fields_uniq` (`tablename`,`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 | + +-- +-- Table structure for table addition_field_values +-- This table store values for additional fields +-- + +CREATE TABLE `additional_field_values` ( + `id` int(11) NOT NULL AUTO_INCREMENT, -- primary key identifier + `field_id` int(11) NOT NULL, -- foreign key references addition_fields(id) + `record_id` int(11) NOT NULL, -- record_id + `value` varchar(255) NOT NULL DEFAULT '', -- value for this field + PRIMARY KEY (`id`), + UNIQUE KEY `field_record` (`field_id`,`record_id`), + CONSTRAINT `afv_fk` FOREIGN KEY (`field_id`) REFERENCES `additional_fields` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 | + /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -7130,7 +7130,6 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } - $DBversion = "3.13.00.020"; if ( CheckVersion($DBversion) ) { $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('WhenLostForgiveFine','0',NULL,'If ON, Forgives the fines on an item when it is lost.','YesNo')"); @@ -7139,6 +7138,45 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } + + + + + + + + + + +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + CREATE TABLE `additional_fields` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `tablename` varchar(255) NOT NULL DEFAULT '', + `name` varchar(255) NOT NULL DEFAULT '', + `authorised_value_category` varchar(16) NOT NULL DEFAULT '', + `marcfield` varchar(16) NOT NULL DEFAULT '', + `searchable` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `fields_uniq` (`tablename`,`name`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + |); + $dbh->do(q| + CREATE TABLE `additional_field_values` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `field_id` int(11) NOT NULL, + `record_id` int(11) NOT NULL, + `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + UNIQUE KEY `field_record` (`field_id`,`record_id`), + CONSTRAINT `afv_fk` FOREIGN KEY (`field_id`) REFERENCES `additional_fields` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + |); + print "Upgrade to $DBversion done (Bug 10855: Add tables additional_fields and additional_field_values)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) --