diff --git a/install/update-5.2.0/update-sqlite3.sql b/install/update-5.2.0/update-sqlite3.sql index da6308f09..3fac362bf 100644 --- a/install/update-5.2.0/update-sqlite3.sql +++ b/install/update-5.2.0/update-sqlite3.sql @@ -9,16 +9,16 @@ CREATE TABLE `tblAttributeDefinitionGroups` ( CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` ( `attrdef` INTEGER REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE, - `attrgrp` INTEGER REFERENCES `tblAttributeGroups` (`id`) ON DELETE CASCADE, - `sequence` INTEGER, + `attrgrp` INTEGER REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE, + `sequence` double NOT NULL default '0', `show` INTEGER, UNIQUE(`attrdef`, `attrgrp`) ); CREATE TABLE `tblFolderAttributeDefinitionGroup` ( `folder` INTEGER REFERENCES `tblFolders` (`id`) ON DELETE CASCADE, - `attrgrp` INTEGER REFERENCES `tblAttributeGroups` (`id`) ON DELETE CASCADE, - `sequence` INTEGER, + `attrgrp` INTEGER REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE, + `sequence` double NOT NULL default '0', UNIQUE(`folder`, `attrgrp`) ); diff --git a/install/update-5.2.0/update.sql b/install/update-5.2.0/update.sql new file mode 100644 index 000000000..b84239f59 --- /dev/null +++ b/install/update-5.2.0/update.sql @@ -0,0 +1,33 @@ +START TRANSACTION; + +CREATE TABLE `tblAttributeDefinitionGroups` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(100) default NULL, + `comment` text, + PRIMARY KEY (`id`), + UNIQUE(`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` ( + `attrdef` int(11), + `attrgrp` int(11), + `sequence` double NOT NULL default '0', + `show` int(11), + UNIQUE(`attrdef`, `attrgrp`), + CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrdef` FOREIGN KEY (`attrdef`) REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE, + CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `tblFolderAttributeDefinitionGroup` ( + `folder` int(11), + `attrgrp` int(11), + `sequence` double NOT NULL default '0', + UNIQUE(`folder`, `attrgrp`), + CONSTRAINT `tblFolderAttributeDefinitionGroup_folder` FOREIGN KEY (`folder`) REFERENCES `tblFolders` (`id`) ON DELETE CASCADE, + CONSTRAINT `tblFolderAttributeDefinitionGroup_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +UPDATE tblVersion set major=5, minor=2, subminor=0; + +COMMIT; +