CREATE TABLE `queue_addresses` (   
 `queue_addresses_id` int(11) NOT NULL auto_increment,   
 `queue_id` int(11) NOT NULL default '0',   
 `queue_address` varchar(128) NOT NULL default '',   
 `queue_domain` varchar(128) NOT NULL default '',   
 PRIMARY KEY  (`queue_addresses_id`),   
 KEY `queue_id` (`queue_id`)   
) TYPE=MyISAM;

INSERT INTO `queue_addresses` (`queue_id`, `queue_address`, `queue_domain`) SELECT `queue`.`queue_id`, `queue`.`queue_address`, `queue`.`queue_domain` FROM `queue`;

ALTER TABLE `queue` DROP `queue_address`;  

ALTER TABLE `queue` DROP `queue_domain`;


CREATE TABLE `product_key_info` (  
`key_name` VARCHAR( 255 ) DEFAULT '' NOT NULL ,  
`key_email` VARCHAR( 255 ) DEFAULT '' NOT NULL ,  
`key_issue` CHAR( 8 ) NOT NULL ,  
`key_domains` TINYTEXT  NOT NULL ,  
`key_maxqueues` INT( 11 ) DEFAULT '0' NOT NULL ,  
`key_tagline` VARCHAR( 255 ) DEFAULT '' NOT NULL ,  
`key_lastupdate` TIMESTAMP NOT NULL   
);

ALTER TABLE `key` RENAME `product_key`;  
ALTER TABLE `product_key` CHANGE `key` `key_file` TEXT NOT NULL;  
ALTER TABLE `product_key` ADD `key_date` TIMESTAMP NOT NULL;

ALTER TABLE `ticket` ADD `queue_addresses_id` INT NOT NULL AFTER `ticket_queue_id`;

CREATE TABLE `ticket_fields` (
`field_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
`field_name` CHAR(64) NOT NULL, 
`field_type` ENUM('S','T','D') NOT NULL, 
`field_options` TEXT NOT NULL
);

CREATE TABLE `ticket_values` (
`value_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
`field_id` BIGINT NOT NULL, 
`ticket_id` BIGINT NOT NULL, 
`value_text` TEXT NOT NULL
); 

ALTER TABLE `address_fields` CHANGE `field_name` `field_name` CHAR(64) NOT NULL;