move additional fields functionality to look at m_code/m_code_value

This commit is contained in:
John Woodlock
2012-09-01 13:57:15 +10:00
parent 9939987a65
commit a13d725ec4
5 changed files with 50 additions and 39 deletions
@@ -49,8 +49,6 @@ DROP TABLE IF EXISTS `r_enum_value`;
-- additional data and report tables
DROP TABLE IF EXISTS `stretchydata_dataset_fields`;
DROP TABLE IF EXISTS `stretchydata_dataset`;
DROP TABLE IF EXISTS `stretchydata_allowed_value`;
DROP TABLE IF EXISTS `stretchydata_allowed_list`;
DROP TABLE IF EXISTS `stretchydata_datasettype`;
DROP TABLE IF EXISTS `stretchy_parameter`;
DROP TABLE IF EXISTS `stretchy_report_parameter`;
@@ -620,22 +618,6 @@ CREATE TABLE `stretchy_parameter` (
UNIQUE KEY `name_UNIQUE` (`parameter_name`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
CREATE TABLE `stretchydata_allowed_list` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(45) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
CREATE TABLE `stretchydata_allowed_value` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(45) NOT NULL,
`allowed_list_id` int(11) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `stretchydata_allowed_value_fk1` (`allowed_list_id`,`name`),
CONSTRAINT `stretchydata_allowed_value_fk1` FOREIGN KEY (`allowed_list_id`) REFERENCES `stretchydata_allowed_list` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
CREATE TABLE `stretchydata_dataset` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(45) NOT NULL,
@@ -652,13 +634,13 @@ CREATE TABLE `stretchydata_dataset_fields` (
`data_length` int(11) DEFAULT NULL,
`display_type` varchar(45) DEFAULT NULL,
`dataset_id` int(11) NOT NULL,
`allowed_list_id` int(11) DEFAULT NULL,
`code_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `stretchydata_dataset_fields_fk1` (`dataset_id`,`name`),
KEY `stretchydata_dataset_fields_fk2` (`allowed_list_id`),
CONSTRAINT `stretchydata_dataset_fields_fk1` FOREIGN KEY (`dataset_id`) REFERENCES `stretchydata_dataset` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `stretchydata_dataset_fields_fk2` FOREIGN KEY (`allowed_list_id`) REFERENCES `stretchydata_allowed_list` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
KEY `stretchydata_dataset_fields_fk2` (`code_id`),
CONSTRAINT `stretchydata_dataset_fields_fk2` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `stretchydata_dataset_fields_fk1` FOREIGN KEY (`dataset_id`) REFERENCES `stretchydata_dataset` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `stretchy_report` (
`report_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -0,0 +1,35 @@
insert into m_code (code_name)
select name from stretchydata_allowed_list;
insert into m_code_value (code_id, code_value, order_position)
select c.id, sv.name, sv.id
from stretchydata_allowed_value sv
join stretchydata_allowed_list sl on sv.allowed_list_id = sl.id
join m_code c on c.code_name = sl.name;
SET foreign_key_checks = 0;
ALTER TABLE `stretchydata_dataset_fields` DROP FOREIGN KEY `stretchydata_dataset_fields_fk2` ;
ALTER TABLE `stretchydata_dataset_fields`
CHANGE COLUMN `allowed_list_id` `code_id` INT(11) NULL DEFAULT NULL ,
ADD CONSTRAINT `stretchydata_dataset_fields_fk2`
FOREIGN KEY (`code_id` )
REFERENCES `m_code` (`id` )
ON DELETE NO ACTION
ON UPDATE NO ACTION;
SET foreign_key_checks = 1;
update stretchydata_dataset_fields f
join stretchydata_allowed_list l on l.id = f.code_id
join m_code c on c.code_name = l.name
set code_id = c.id
where f.code_id is not null;
DROP TABLE `stretchydata_allowed_value`;
DROP TABLE `stretchydata_allowed_list`;