Changeset 6730

Timestamp:

Jul 29, 2010, 1:33:08 PM (14 years ago)

Author:

grum

Message:

"user_tags_defs" table definition was not correct

File:

• extensions/AMetaData/amd_install.class.inc.php (modified) (2 diffs)

extensions/AMetaData/amd_install.class.inc.php

@@ -99 +99 @@
 );",
 "CREATE TABLE `".$this->tables['user_tags_def']."` (
-  `defId` int(10) unsigned NOT NULL auto_increment,
+  `numId` int(10) unsigned NOT NULL COMMENT 'Id of the tag',
+  `defId` int(10) unsigned NOT NULL default '0' COMMENT 'also used for ordering',
   `parentId` int(10) unsigned NOT NULL default '0' COMMENT 'Id of the parent',
-  `numId` int(10) unsigned NOT NULL COMMENT 'Id of the tag',
-  `order` int(10) unsigned NOT NULL COMMENT 'Order, relative to the parent',
+  `order` int(10) unsigned NOT NULL,
   `type` char(1) NOT NULL default 'T' COMMENT 'T = static text ; M = metadata value ; C = condition',
   `value` varchar(200) NOT NULL,
   `conditionType` char(2) NOT NULL default 'E',
   `conditionValue` varchar(200) NOT NULL,
-  PRIMARY KEY  (`defId`),
-  KEY `byTagNumId` (`numId`,`parentId`,`order`),
-  KEY `byTagParentId` (`parentId`,`order`)
+  PRIMARY KEY  (`numId`,`defId`),
+  KEY `byTagParentId` USING BTREE (`numId`,`parentId`,`order`),
+  KEY `byTagOrder` (`numId`,`order`)
 );",
       );
@@ -204 +204 @@
 );",
 "CREATE TABLE `".$this->tables['user_tags_def']."` (
-  `defId` int(10) unsigned NOT NULL auto_increment,
+  `numId` int(10) unsigned NOT NULL COMMENT 'Id of the tag',
+  `defId` int(10) unsigned NOT NULL default '0' COMMENT 'also used for ordering',
   `parentId` int(10) unsigned NOT NULL default '0' COMMENT 'Id of the parent',
-  `numId` int(10) unsigned NOT NULL COMMENT 'Id of the tag',
-  `order` int(10) unsigned NOT NULL COMMENT 'Order, relative to the parent',
+  `order` int(10) unsigned NOT NULL,
   `type` char(1) NOT NULL default 'T' COMMENT 'T = static text ; M = metadata value ; C = condition',
   `value` varchar(200) NOT NULL,
   `conditionType` char(2) NOT NULL default 'E',
   `conditionValue` varchar(200) NOT NULL,
-  PRIMARY KEY  (`defId`),
-  KEY `byTagNumId` (`numId`,`parentId`,`order`),
-  KEY `byTagParentId` (`parentId`,`order`)
+  PRIMARY KEY  (`numId`,`defId`),
+  KEY `byTagParentId` USING BTREE (`numId`,`parentId`,`order`),
+  KEY `byTagOrder` (`numId`,`order`)
 );"
       );