[Rt-commit] [rtir] 01/01: Update mysql dump to use a 4.2 schema

Kevin Falcone falcone at bestpractical.com
Tue Apr 22 17:27:58 EDT 2014


This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch 3.2/test-fixes
in repository rtir.

commit 6fe7f012f096a49ecd9476cf4d7f81ba9ba4976d
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Apr 22 17:22:51 2014 -0400

    Update mysql dump to use a 4.2 schema
    
    This is equivalent to having come up to 4.2.3 but not yet run make
    upgrade-database in the RTIR directory to go from 2.4 or 2.6 up to 3.2.
    Mainly this is to test the 2.9.0/content upgrade, and it caught a
    LifecycleObj bug in there.
    
    Created by importing the dump and running an RT make upgrade-database
    from 4.0.1 through 4.2.3
---
 etc/upgrade/2.9.0/content                          |   2 +-
 .../snapshot/mysql/rtir-2.6.after-rt-upgrade.sql   | 484 +++++++++++----------
 t/upgrade/2.6.0-to-2.9.0.t                         |   6 +-
 3 files changed, 261 insertions(+), 231 deletions(-)

diff --git a/etc/upgrade/2.9.0/content b/etc/upgrade/2.9.0/content
index 3f51584..f2c5e49 100644
--- a/etc/upgrade/2.9.0/content
+++ b/etc/upgrade/2.9.0/content
@@ -136,7 +136,7 @@ our @Final = (
             my $new_cycle = lc $name;
             $new_cycle =~ s/ /_/;
 
-            if ( $queue->Lifecycle->Name eq $new_cycle ) {
+            if ( $queue->LifecycleObj->Name eq $new_cycle ) {
                 $RT::Logger->debug("Queue $name already uses '$new_cycle' lifecycle");
                 next;
             }
diff --git a/t/data/snapshot/mysql/rtir-2.6.after-rt-upgrade.sql b/t/data/snapshot/mysql/rtir-2.6.after-rt-upgrade.sql
index 1c31c95..8c54979 100644
--- a/t/data/snapshot/mysql/rtir-2.6.after-rt-upgrade.sql
+++ b/t/data/snapshot/mysql/rtir-2.6.after-rt-upgrade.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.1.56, for apple-darwin10.7.0 (x86_64)
+-- MySQL dump 10.13  Distrib 5.5.27, for osx10.8 (i386)
 --
--- Host: localhost    Database: rt4test
+-- Host: localhost    Database: rtirupgrade
 -- ------------------------------------------------------
--- Server version	5.1.56-log
+-- Server version	5.5.27-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -35,7 +35,7 @@ CREATE TABLE `ACL` (
   `LastUpdated` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `ACL1` (`RightName`,`ObjectType`,`ObjectId`,`PrincipalType`,`PrincipalId`)
-) ENGINE=InnoDB AUTO_INCREMENT=105 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=106 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -44,7 +44,7 @@ CREATE TABLE `ACL` (
 
 LOCK TABLES `ACL` WRITE;
 /*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
-INSERT INTO `ACL` VALUES (1,'Group',2,'SuperUser','RT::System',1,0,NULL,0,NULL),(2,'Group',7,'OwnTicket','RT::System',1,0,NULL,0,NULL),(3,'Group',13,'SuperUser','RT::System',1,0,NULL,0,NULL),(4,'Group',4,'ShowApprovalsTab','RT::System',1,0,NULL,0,NULL),(5,'Owner',28,'ModifyTicket','RT::Queue',3,0,NULL,0,NULL),(6,'Group',22,'ShowTemplate','RT::Queue',3,0,NULL,0,NULL),(7,'Group',22,'CreateTicket','RT::Queue',3,0,NULL,0,NULL),(8,'Group',22,'OwnTicket','RT::Queue',3,0,NULL,0,NULL),(9,'Group' [...]
+INSERT INTO `ACL` VALUES (1,'Group',2,'SuperUser','RT::System',1,0,NULL,0,NULL),(2,'Group',7,'OwnTicket','RT::System',1,0,NULL,0,NULL),(3,'Group',13,'SuperUser','RT::System',1,0,NULL,0,NULL),(4,'Group',4,'ShowApprovalsTab','RT::System',1,0,NULL,0,NULL),(5,'Owner',28,'ModifyTicket','RT::Queue',3,0,NULL,0,NULL),(6,'Group',22,'ShowTemplate','RT::Queue',3,0,NULL,0,NULL),(7,'Group',22,'CreateTicket','RT::Queue',3,0,NULL,0,NULL),(8,'Group',22,'OwnTicket','RT::Queue',3,0,NULL,0,NULL),(9,'Group' [...]
 /*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -81,6 +81,77 @@ LOCK TABLES `Articles` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `Attachments`
+--
+
+DROP TABLE IF EXISTS `Attachments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `Attachments` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `TransactionId` int(11) NOT NULL,
+  `Parent` int(11) NOT NULL DEFAULT '0',
+  `MessageId` varchar(160) CHARACTER SET ascii DEFAULT NULL,
+  `Subject` varchar(255) DEFAULT NULL,
+  `Filename` varchar(255) DEFAULT NULL,
+  `ContentType` varchar(80) CHARACTER SET ascii DEFAULT NULL,
+  `ContentEncoding` varchar(80) CHARACTER SET ascii DEFAULT NULL,
+  `Content` longblob,
+  `Headers` longtext,
+  `Creator` int(11) NOT NULL DEFAULT '0',
+  `Created` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `Attachments2` (`TransactionId`),
+  KEY `Attachments3` (`Parent`,`TransactionId`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `Attachments`
+--
+
+LOCK TABLES `Attachments` WRITE;
+/*!40000 ALTER TABLE `Attachments` DISABLE KEYS */;
+INSERT INTO `Attachments` VALUES (1,48,0,'','foo 0.879632438606684',NULL,'text/plain','none','bla','Subject: foo 0.879632438606684\nMIME-Version: 1.0\nX-Mailer: MIME-tools 5.428 (Entity 5.428)\nX-RT-Original-Encoding: utf-8\nX-RT-Encrypt: 0\nX-RT-Sign: 0\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Disposition: inline\nContent-Transfer-Encoding: binary\nContent-Length: 3\n',41,'2011-08-03 19:34:32'),(2,61,0,'','first incident',NULL,'text/plain','none','bla\n\n','Subject: first i [...]
+/*!40000 ALTER TABLE `Attachments` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `Attributes`
+--
+
+DROP TABLE IF EXISTS `Attributes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `Attributes` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) DEFAULT NULL,
+  `Description` varchar(255) DEFAULT NULL,
+  `Content` longblob,
+  `ContentType` varchar(16) CHARACTER SET ascii DEFAULT NULL,
+  `ObjectType` varchar(64) CHARACTER SET ascii DEFAULT NULL,
+  `ObjectId` int(11) DEFAULT NULL,
+  `Creator` int(11) NOT NULL DEFAULT '0',
+  `Created` datetime DEFAULT NULL,
+  `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
+  `LastUpdated` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `Attributes1` (`Name`),
+  KEY `Attributes2` (`ObjectType`,`ObjectId`)
+) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `Attributes`
+--
+
+LOCK TABLES `Attributes` WRITE;
+/*!40000 ALTER TABLE `Attributes` DISABLE KEYS */;
+INSERT INTO `Attributes` VALUES (1,'Search - My Tickets','[_1] highest priority tickets I own','BQcDAAAABAoEREVTQwAAAAVPcmRlcgpDIE93bmVyID0gJ19fQ3VycmVudFVzZXJfXycgQU5EICgg\nU3RhdHVzID0gJ25ldycgT1IgU3RhdHVzID0gJ29wZW4nKQAAAAVRdWVyeQoIUHJpb3JpdHkAAAAH\nT3JkZXJCeQrAJzxhIGhyZWY9Il9fV2ViUGF0aF9fL1RpY2tldC9EaXNwbGF5Lmh0bWw/aWQ9X19p\nZF9fIj5fX2lkX188L2E+L1RJVExFOiMnLCc8YSBocmVmPSJfX1dlYlBhdGhfXy9UaWNrZXQvRGlz\ncGxheS5odG1sP2lkPV9faWRfXyI+X19TdWJqZWN0X188L2E+L1RJVExFOlN1YmplY3QnLFByaW9y\naXR5LC [...]
+/*!40000 ALTER TABLE `Attributes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `Classes`
 --
 
@@ -157,7 +228,6 @@ CREATE TABLE `CustomFields` (
   `Type` varchar(200) CHARACTER SET ascii DEFAULT NULL,
   `MaxValues` int(11) DEFAULT NULL,
   `Pattern` text,
-  `Repeated` smallint(6) NOT NULL DEFAULT '0',
   `Description` varchar(255) DEFAULT NULL,
   `SortOrder` int(11) NOT NULL DEFAULT '0',
   `LookupType` varchar(255) CHARACTER SET ascii NOT NULL,
@@ -179,7 +249,7 @@ CREATE TABLE `CustomFields` (
 
 LOCK TABLES `CustomFields` WRITE;
 /*!40000 ALTER TABLE `CustomFields` DISABLE KEYS */;
-INSERT INTO `CustomFields` VALUES (1,'State','Select',1,'',0,'State for Incidents RTIR queue',0,'RT::Queue-RT::Ticket',1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL,NULL),(2,'Constituency','Select',1,'',0,'Constituency for RTIR queues',0,'RT::Queue-RT::Ticket',1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL,NULL),(3,'State','Select',1,'',0,'State for Incident Reports RTIR queue',0,'RT::Queue-RT::Ticket',1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL [...]
+INSERT INTO `CustomFields` VALUES (1,'State','Select',1,'','State for Incidents RTIR queue',0,'RT::Queue-RT::Ticket',1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL,NULL),(2,'Constituency','Select',1,'','Constituency for RTIR queues',0,'RT::Queue-RT::Ticket',1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL,NULL),(3,'State','Select',1,'','State for Incident Reports RTIR queue',0,'RT::Queue-RT::Ticket',1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL,NULL) [...]
 /*!40000 ALTER TABLE `CustomFields` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -330,37 +400,38 @@ INSERT INTO `GroupMembers` VALUES (1,2,1,0,NULL,0,NULL),(2,7,6,0,NULL,0,NULL),(3
 UNLOCK TABLES;
 
 --
--- Table structure for table `Groups`
+-- Table structure for table `Links`
 --
 
-DROP TABLE IF EXISTS `Groups`;
+DROP TABLE IF EXISTS `Links`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Groups` (
+CREATE TABLE `Links` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `Name` varchar(200) DEFAULT NULL,
-  `Description` varchar(255) DEFAULT NULL,
-  `Domain` varchar(64) CHARACTER SET ascii DEFAULT NULL,
-  `Type` varchar(64) CHARACTER SET ascii DEFAULT NULL,
-  `Instance` int(11) DEFAULT NULL,
-  `Creator` int(11) NOT NULL DEFAULT '0',
-  `Created` datetime DEFAULT NULL,
+  `Base` varchar(240) DEFAULT NULL,
+  `Target` varchar(240) DEFAULT NULL,
+  `Type` varchar(20) NOT NULL,
+  `LocalTarget` int(11) NOT NULL DEFAULT '0',
+  `LocalBase` int(11) NOT NULL DEFAULT '0',
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `LastUpdated` datetime DEFAULT NULL,
+  `Creator` int(11) NOT NULL DEFAULT '0',
+  `Created` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `Groups1` (`Domain`,`Instance`,`Type`,`id`),
-  KEY `Groups2` (`Type`,`Instance`)
-) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8;
+  KEY `Links2` (`Base`,`Type`),
+  KEY `Links3` (`Target`,`Type`),
+  KEY `Links4` (`Type`,`LocalBase`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=ascii;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `Groups`
+-- Dumping data for table `Links`
 --
 
-LOCK TABLES `Groups` WRITE;
-/*!40000 ALTER TABLE `Groups` DISABLE KEYS */;
-INSERT INTO `Groups` VALUES (2,'User 1','ACL equiv. for user 1','ACLEquivalence','UserEquiv',1,0,NULL,0,NULL),(3,'','Pseudogroup for internal use','SystemInternal','Everyone',0,0,NULL,0,NULL),(4,'','Pseudogroup for internal use','SystemInternal','Privileged',0,0,NULL,0,NULL),(5,'','Pseudogroup for internal use','SystemInternal','Unprivileged',0,0,NULL,0,NULL),(7,'User 6','ACL equiv. for user 6','ACLEquivalence','UserEquiv',6,0,NULL,0,NULL),(8,'','SystemRolegroup for internal use','RT::Sy [...]
-/*!40000 ALTER TABLE `Groups` ENABLE KEYS */;
+LOCK TABLES `Links` WRITE;
+/*!40000 ALTER TABLE `Links` DISABLE KEYS */;
+INSERT INTO `Links` VALUES (1,'fsck.com-rt://example.com/ticket/1','fsck.com-rt://example.com/ticket/2','MemberOf',2,1,41,'2011-08-03 19:34:37',41,'2011-08-03 19:34:37'),(2,'fsck.com-rt://example.com/ticket/1','fsck.com-rt://example.com/ticket/3','MemberOf',3,1,41,'2011-08-03 19:34:46',41,'2011-08-03 19:34:46');
+/*!40000 ALTER TABLE `Links` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
@@ -393,6 +464,44 @@ LOCK TABLES `ObjectClasses` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `ObjectCustomFieldValues`
+--
+
+DROP TABLE IF EXISTS `ObjectCustomFieldValues`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ObjectCustomFieldValues` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `CustomField` int(11) NOT NULL,
+  `ObjectType` varchar(255) CHARACTER SET ascii NOT NULL,
+  `ObjectId` int(11) NOT NULL,
+  `SortOrder` int(11) NOT NULL DEFAULT '0',
+  `Content` varchar(255) DEFAULT NULL,
+  `LargeContent` longblob,
+  `ContentType` varchar(80) CHARACTER SET ascii DEFAULT NULL,
+  `ContentEncoding` varchar(80) CHARACTER SET ascii DEFAULT NULL,
+  `Creator` int(11) NOT NULL DEFAULT '0',
+  `Created` datetime DEFAULT NULL,
+  `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
+  `LastUpdated` datetime DEFAULT NULL,
+  `Disabled` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `ObjectCustomFieldValues1` (`Content`),
+  KEY `ObjectCustomFieldValues2` (`CustomField`,`ObjectType`,`ObjectId`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ObjectCustomFieldValues`
+--
+
+LOCK TABLES `ObjectCustomFieldValues` WRITE;
+/*!40000 ALTER TABLE `ObjectCustomFieldValues` DISABLE KEYS */;
+INSERT INTO `ObjectCustomFieldValues` VALUES (1,8,'RT::Ticket',1,0,'Full service: out of hours',NULL,NULL,'',41,'2011-08-03 19:34:32',41,'2011-08-03 19:34:32',0),(2,2,'RT::Ticket',1,0,'EDUNET',NULL,NULL,'',41,'2011-08-03 19:34:32',41,'2011-08-03 19:34:32',0),(3,3,'RT::Ticket',1,0,'new',NULL,NULL,'',1,'2011-08-03 19:34:34',1,'2011-08-03 19:34:38',1),(4,2,'RT::Ticket',2,0,'EDUNET',NULL,NULL,'',41,'2011-08-03 19:34:37',41,'2011-08-03 19:34:37',0),(5,9,'RT::Ticket',2,0,'IncidentCoord',NULL,N [...]
+/*!40000 ALTER TABLE `ObjectCustomFieldValues` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `ObjectCustomFields`
 --
 
@@ -448,6 +557,33 @@ LOCK TABLES `ObjectTopics` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `Principals`
+--
+
+DROP TABLE IF EXISTS `Principals`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `Principals` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `PrincipalType` varchar(16) NOT NULL,
+  `ObjectId` int(11) DEFAULT NULL,
+  `Disabled` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `Principals2` (`ObjectId`)
+) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=ascii;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `Principals`
+--
+
+LOCK TABLES `Principals` WRITE;
+/*!40000 ALTER TABLE `Principals` DISABLE KEYS */;
+INSERT INTO `Principals` VALUES (1,'User',1,0),(2,'Group',2,0),(3,'Group',3,0),(4,'Group',4,0),(5,'Group',5,0),(6,'User',6,0),(7,'Group',7,0),(8,'Group',8,0),(9,'Group',9,0),(10,'Group',10,0),(11,'Group',11,0),(12,'User',12,0),(13,'Group',13,0),(14,'Group',14,0),(15,'Group',15,0),(16,'Group',16,0),(17,'Group',17,0),(18,'Group',18,0),(19,'Group',19,0),(20,'Group',20,0),(21,'Group',21,0),(22,'Group',22,0),(23,'Group',23,0),(24,'Group',24,0),(25,'Group',25,0),(26,'Group',26,0),(27,'Group',2 [...]
+/*!40000 ALTER TABLE `Principals` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `Queues`
 --
 
@@ -458,8 +594,8 @@ CREATE TABLE `Queues` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(200) NOT NULL,
   `Description` varchar(255) DEFAULT NULL,
-  `CorrespondAddress` varchar(120) CHARACTER SET ascii DEFAULT NULL,
-  `CommentAddress` varchar(120) CHARACTER SET ascii DEFAULT NULL,
+  `CorrespondAddress` varchar(120) DEFAULT NULL,
+  `CommentAddress` varchar(120) DEFAULT NULL,
   `InitialPriority` int(11) NOT NULL DEFAULT '0',
   `FinalPriority` int(11) NOT NULL DEFAULT '0',
   `DefaultDueIn` int(11) NOT NULL DEFAULT '0',
@@ -482,7 +618,7 @@ CREATE TABLE `Queues` (
 
 LOCK TABLES `Queues` WRITE;
 /*!40000 ALTER TABLE `Queues` DISABLE KEYS */;
-INSERT INTO `Queues` VALUES (1,'General','The default queue','','',0,0,0,1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19',0,NULL,NULL),(2,'___Approvals','A system-internal queue for the approvals system','','',0,0,0,1,'2011-08-03 19:34:19',1,'2011-08-03 21:04:13',2,NULL,'approvals'),(3,'Incidents','','','',50,0,0,1,'2011-08-03 19:34:21',1,'2011-08-03 19:34:22',0,NULL,NULL),(4,'Incident Reports','','','',0,0,0,1,'2011-08-03 19:34:22',1,'2011-08-03 19:34:22',0,NULL,NULL),(5,'Investigations' [...]
+INSERT INTO `Queues` VALUES (1,'General','The default queue','','',0,0,0,1,'2011-08-03 19:34:19',1,'2014-04-22 21:16:37',0,NULL,'default'),(2,'___Approvals','A system-internal queue for the approvals system','','',0,0,0,1,'2011-08-03 19:34:19',1,'2011-08-03 21:04:13',2,NULL,'approvals'),(3,'Incidents','','','',50,0,0,1,'2011-08-03 19:34:21',1,'2014-04-22 21:16:37',0,NULL,'default'),(4,'Incident Reports','','','',0,0,0,1,'2011-08-03 19:34:22',1,'2014-04-22 21:16:37',0,NULL,'default'),(5,' [...]
 /*!40000 ALTER TABLE `Queues` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -504,7 +640,7 @@ CREATE TABLE `ScripActions` (
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `LastUpdated` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -513,7 +649,7 @@ CREATE TABLE `ScripActions` (
 
 LOCK TABLES `ScripActions` WRITE;
 /*!40000 ALTER TABLE `ScripActions` DISABLE KEYS */;
-INSERT INTO `ScripActions` VALUES (1,'Autoreply To Requestors','Always sends a message to the requestors independent of message sender','Autoreply','Requestor',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(2,'Notify Requestors','Sends a message to the requestors','Notify','Requestor',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(3,'Notify Owner as Comment','Sends mail to the owner','NotifyAsComment','Owner',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(4,'Notify Owner','Sends [...]
+INSERT INTO `ScripActions` VALUES (1,'Autoreply To Requestors','Always sends a message to the requestors independent of message sender','Autoreply','Requestor',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(2,'Notify Requestors','Sends a message to the requestors','Notify','Requestor',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(3,'Notify Owner as Comment','Sends mail to the owner','NotifyAsComment','Owner',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(4,'Notify Owner','Sends [...]
 /*!40000 ALTER TABLE `ScripActions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -536,7 +672,7 @@ CREATE TABLE `ScripConditions` (
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `LastUpdated` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -545,7 +681,7 @@ CREATE TABLE `ScripConditions` (
 
 LOCK TABLES `ScripConditions` WRITE;
 /*!40000 ALTER TABLE `ScripConditions` DISABLE KEYS */;
-INSERT INTO `ScripConditions` VALUES (1,'On Create','When a ticket is created','AnyTransaction',NULL,'Create',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(2,'On Transaction','When anything happens','AnyTransaction',NULL,'Any',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(3,'On Correspond','Whenever correspondence comes in','AnyTransaction',NULL,'Correspond',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(4,'On Comment','Whenever comments come in','AnyTransaction',NULL,'Comment [...]
+INSERT INTO `ScripConditions` VALUES (1,'On Create','When a ticket is created','AnyTransaction',NULL,'Create',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(2,'On Transaction','When anything happens','AnyTransaction',NULL,'Any',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(3,'On Correspond','Whenever correspondence comes in','AnyTransaction',NULL,'Correspond',1,'2011-08-03 19:34:19',1,'2011-08-03 19:34:19'),(4,'On Comment','Whenever comments come in','AnyTransaction',NULL,'Comment [...]
 /*!40000 ALTER TABLE `ScripConditions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -561,20 +697,17 @@ CREATE TABLE `Scrips` (
   `Description` varchar(255) DEFAULT NULL,
   `ScripCondition` int(11) NOT NULL DEFAULT '0',
   `ScripAction` int(11) NOT NULL DEFAULT '0',
-  `ConditionRules` text,
-  `ActionRules` text,
   `CustomIsApplicableCode` text,
   `CustomPrepareCode` text,
   `CustomCommitCode` text,
-  `Stage` varchar(32) CHARACTER SET ascii DEFAULT NULL,
-  `Queue` int(11) NOT NULL DEFAULT '0',
-  `Template` int(11) NOT NULL DEFAULT '0',
+  `Template` varchar(200) NOT NULL,
   `Creator` int(11) NOT NULL DEFAULT '0',
   `Created` datetime DEFAULT NULL,
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `LastUpdated` datetime DEFAULT NULL,
+  `Disabled` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=78 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -583,7 +716,7 @@ CREATE TABLE `Scrips` (
 
 LOCK TABLES `Scrips` WRITE;
 /*!40000 ALTER TABLE `Scrips` DISABLE KEYS */;
-INSERT INTO `Scrips` VALUES (1,'On Correspond Open Tickets',3,17,NULL,NULL,NULL,NULL,NULL,'TransactionCreate',0,1,1,'2011-08-03 19:34:20',1,'2011-08-03 19:34:20'),(2,'On Owner Change Notify Owner',7,4,NULL,NULL,NULL,NULL,NULL,'TransactionCreate',0,3,1,'2011-08-03 19:34:20',1,'2011-08-03 19:34:20'),(3,'On Create Autoreply To Requestors',1,1,NULL,NULL,NULL,NULL,NULL,'TransactionCreate',0,2,1,'2011-08-03 19:34:20',1,'2011-08-03 19:34:20'),(4,'On Create Notify AdminCcs',1,8,NULL,NULL,NULL,NU [...]
+INSERT INTO `Scrips` VALUES (1,'On Correspond Open Tickets',3,17,NULL,NULL,NULL,'Blank',1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:59',0),(2,'On Owner Change Notify Owner',7,4,NULL,NULL,NULL,'Transaction',1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:59',0),(3,'On Create Autoreply To Requestors',1,1,NULL,NULL,NULL,'Autoreply',1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:59',0),(4,'On Create Notify AdminCcs',1,8,NULL,NULL,NULL,'Transaction',1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:59',0) [...]
 /*!40000 ALTER TABLE `Scrips` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -600,15 +733,13 @@ CREATE TABLE `Templates` (
   `Name` varchar(200) NOT NULL,
   `Description` varchar(255) DEFAULT NULL,
   `Type` varchar(16) CHARACTER SET ascii DEFAULT NULL,
-  `Language` varchar(16) CHARACTER SET ascii DEFAULT NULL,
-  `TranslationOf` int(11) NOT NULL DEFAULT '0',
   `Content` text,
   `LastUpdated` datetime DEFAULT NULL,
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `Creator` int(11) NOT NULL DEFAULT '0',
   `Created` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -617,7 +748,7 @@ CREATE TABLE `Templates` (
 
 LOCK TABLES `Templates` WRITE;
 /*!40000 ALTER TABLE `Templates` DISABLE KEYS */;
-INSERT INTO `Templates` VALUES (1,0,'Blank','A blank template','Perl',NULL,0,'','2011-08-03 21:03:41',1,1,'2011-08-03 19:34:19'),(2,0,'Autoreply','Default Autoresponse template','Perl',NULL,0,'Subject: AutoReply: {$Ticket->Subject}\n\n\nGreetings,\n\nThis message has been automatically generated in response to the\ncreation of a trouble ticket regarding:\n	\"{$Ticket->Subject()}\", \na summary of which appears below.\n\nThere is no need to reply to this message right now.  Your ticket ha [...]
+INSERT INTO `Templates` VALUES (1,0,'Blank','A blank template','Perl','','2011-08-03 21:03:41',1,1,'2011-08-03 19:34:19'),(2,0,'Autoreply','Default Autoresponse template','Perl','Subject: AutoReply: {$Ticket->Subject}\n\n\nGreetings,\n\nThis message has been automatically generated in response to the\ncreation of a trouble ticket regarding:\n	\"{$Ticket->Subject()}\", \na summary of which appears below.\n\nThere is no need to reply to this message right now.  Your ticket has been\nassign [...]
 /*!40000 ALTER TABLE `Templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -654,6 +785,7 @@ CREATE TABLE `Tickets` (
   `Creator` int(11) NOT NULL DEFAULT '0',
   `Created` datetime DEFAULT NULL,
   `Disabled` smallint(6) NOT NULL DEFAULT '0',
+  `IsMerged` smallint(6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `Tickets1` (`Queue`,`Status`),
   KEY `Tickets2` (`Owner`),
@@ -667,7 +799,7 @@ CREATE TABLE `Tickets` (
 
 LOCK TABLES `Tickets` WRITE;
 /*!40000 ALTER TABLE `Tickets` DISABLE KEYS */;
-INSERT INTO `Tickets` VALUES (1,1,4,'ticket',0,0,41,'foo 0.879632438606684',0,0,0,0,0,'open',0,NULL,'2011-08-04 05:00:00','2011-08-03 19:34:38','2011-08-04 07:00:00','1970-01-01 00:00:00',41,'2011-08-03 19:34:47',41,'2011-08-03 19:34:32',0),(2,2,3,'ticket',0,0,41,'first incident',50,0,50,0,0,'open',0,NULL,'2011-08-03 19:34:39','2011-08-03 19:34:37','2011-08-04 07:00:00','1970-01-01 00:00:00',1,'2011-08-03 19:34:46',41,'2011-08-03 19:34:37',0),(3,3,3,'ticket',0,0,41,'foo Incident',50,0,50 [...]
+INSERT INTO `Tickets` VALUES (1,1,4,'ticket',0,0,41,'foo 0.879632438606684',0,0,0,0,0,'open',0,NULL,'2011-08-04 05:00:00','2011-08-03 19:34:38','2011-08-04 07:00:00','1970-01-01 00:00:00',41,'2011-08-03 19:34:47',41,'2011-08-03 19:34:32',0,NULL),(2,2,3,'ticket',0,0,41,'first incident',50,0,50,0,0,'open',0,NULL,'2011-08-03 19:34:39','2011-08-03 19:34:37','2011-08-04 07:00:00','1970-01-01 00:00:00',1,'2011-08-03 19:34:46',41,'2011-08-03 19:34:37',0,NULL),(3,3,3,'ticket',0,0,41,'foo Inciden [...]
 /*!40000 ALTER TABLE `Tickets` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -699,6 +831,43 @@ LOCK TABLES `Topics` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `Transactions`
+--
+
+DROP TABLE IF EXISTS `Transactions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `Transactions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ObjectType` varchar(64) CHARACTER SET ascii NOT NULL,
+  `ObjectId` int(11) NOT NULL DEFAULT '0',
+  `TimeTaken` int(11) NOT NULL DEFAULT '0',
+  `Type` varchar(20) CHARACTER SET ascii DEFAULT NULL,
+  `Field` varchar(40) CHARACTER SET ascii DEFAULT NULL,
+  `OldValue` varchar(255) DEFAULT NULL,
+  `NewValue` varchar(255) DEFAULT NULL,
+  `ReferenceType` varchar(255) CHARACTER SET ascii DEFAULT NULL,
+  `OldReference` int(11) DEFAULT NULL,
+  `NewReference` int(11) DEFAULT NULL,
+  `Data` varchar(255) DEFAULT NULL,
+  `Creator` int(11) NOT NULL DEFAULT '0',
+  `Created` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `Transactions1` (`ObjectType`,`ObjectId`)
+) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `Transactions`
+--
+
+LOCK TABLES `Transactions` WRITE;
+/*!40000 ALTER TABLE `Transactions` DISABLE KEYS */;
+INSERT INTO `Transactions` VALUES (1,'RT::Group',3,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(2,'RT::Group',4,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(3,'RT::Group',5,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(4,'RT::User',6,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(5,'RT::Group',8,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(6,'RT::Group',9,0, [...]
+/*!40000 ALTER TABLE `Transactions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `Users`
 --
 
@@ -741,6 +910,7 @@ CREATE TABLE `Users` (
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `LastUpdated` datetime DEFAULT NULL,
   `AuthToken` varchar(16) CHARACTER SET ascii DEFAULT NULL,
+  `SMIMECertificate` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Users1` (`Name`),
   KEY `Users4` (`EmailAddress`)
@@ -753,89 +923,18 @@ CREATE TABLE `Users` (
 
 LOCK TABLES `Users` WRITE;
 /*!40000 ALTER TABLE `Users` DISABLE KEYS */;
-INSERT INTO `Users` VALUES (1,'RT_System','*NO-PASSWORD*','Do not delete or modify this user. It is integral to RT\'s internal database structures',NULL,NULL,NULL,NULL,'The RT System itself',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:16',1,'2011-08-03 19:34:16',NULL),(6,'Nobody','*NO-PASSWORD*','Do not delete or modify this user. It is integral to RT\'s internal data structures',NULL,'',NULL,NULL,'Nobody in [...]
+INSERT INTO `Users` VALUES (1,'RT_System','*NO-PASSWORD*','Do not delete or modify this user. It is integral to RT\'s internal database structures',NULL,NULL,NULL,NULL,'The RT System itself',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:16',1,'2011-08-03 19:34:16',NULL,NULL),(6,'Nobody','*NO-PASSWORD*','Do not delete or modify this user. It is integral to RT\'s internal data structures',NULL,'',NULL,NULL,'Nobo [...]
 /*!40000 ALTER TABLE `Users` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `Attachments`
+-- Table structure for table `cachedgroupmembers`
 --
 
-DROP TABLE IF EXISTS `Attachments`;
+DROP TABLE IF EXISTS `cachedgroupmembers`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Attachments` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `TransactionId` int(11) NOT NULL,
-  `Parent` int(11) NOT NULL DEFAULT '0',
-  `MessageId` varchar(160) CHARACTER SET ascii DEFAULT NULL,
-  `Subject` varchar(255) DEFAULT NULL,
-  `Filename` varchar(255) DEFAULT NULL,
-  `ContentType` varchar(80) CHARACTER SET ascii DEFAULT NULL,
-  `ContentEncoding` varchar(80) CHARACTER SET ascii DEFAULT NULL,
-  `Content` longblob,
-  `Headers` longtext,
-  `Creator` int(11) NOT NULL DEFAULT '0',
-  `Created` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `Attachments2` (`TransactionId`),
-  KEY `Attachments3` (`Parent`,`TransactionId`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Attachments`
---
-
-LOCK TABLES `Attachments` WRITE;
-/*!40000 ALTER TABLE `Attachments` DISABLE KEYS */;
-INSERT INTO `Attachments` VALUES (1,48,0,'','foo 0.879632438606684',NULL,'text/plain','none','bla','Subject: foo 0.879632438606684\nMIME-Version: 1.0\nX-Mailer: MIME-tools 5.428 (Entity 5.428)\nX-RT-Original-Encoding: utf-8\nX-RT-Encrypt: 0\nX-RT-Sign: 0\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Disposition: inline\nContent-Transfer-Encoding: binary\nContent-Length: 3\n',41,'2011-08-03 19:34:32'),(2,61,0,'','first incident',NULL,'text/plain','none','bla\n\n','Subject: first i [...]
-/*!40000 ALTER TABLE `Attachments` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Attributes`
---
-
-DROP TABLE IF EXISTS `Attributes`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Attributes` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `Name` varchar(255) DEFAULT NULL,
-  `Description` varchar(255) DEFAULT NULL,
-  `Content` blob,
-  `ContentType` varchar(16) CHARACTER SET ascii DEFAULT NULL,
-  `ObjectType` varchar(64) CHARACTER SET ascii DEFAULT NULL,
-  `ObjectId` int(11) DEFAULT NULL,
-  `Creator` int(11) NOT NULL DEFAULT '0',
-  `Created` datetime DEFAULT NULL,
-  `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
-  `LastUpdated` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `Attributes1` (`Name`),
-  KEY `Attributes2` (`ObjectType`,`ObjectId`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Attributes`
---
-
-LOCK TABLES `Attributes` WRITE;
-/*!40000 ALTER TABLE `Attributes` DISABLE KEYS */;
-INSERT INTO `Attributes` VALUES (1,'Search - My Tickets','[_1] highest priority tickets I own','BQcDAAAABAoEREVTQwAAAAVPcmRlcgpDIE93bmVyID0gJ19fQ3VycmVudFVzZXJfXycgQU5EICgg\nU3RhdHVzID0gJ25ldycgT1IgU3RhdHVzID0gJ29wZW4nKQAAAAVRdWVyeQoIUHJpb3JpdHkAAAAH\nT3JkZXJCeQrAJzxhIGhyZWY9Il9fV2ViUGF0aF9fL1RpY2tldC9EaXNwbGF5Lmh0bWw/aWQ9X19p\nZF9fIj5fX2lkX188L2E+L1RJVExFOiMnLCc8YSBocmVmPSJfX1dlYlBhdGhfXy9UaWNrZXQvRGlz\ncGxheS5odG1sP2lkPV9faWRfXyI+X19TdWJqZWN0X188L2E+L1RJVExFOlN1YmplY3QnLFByaW9y\naXR5LC [...]
-/*!40000 ALTER TABLE `Attributes` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `CachedGroupMembers`
---
-
-DROP TABLE IF EXISTS `CachedGroupMembers`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CachedGroupMembers` (
+CREATE TABLE `cachedgroupmembers` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `GroupId` int(11) DEFAULT NULL,
   `MemberId` int(11) DEFAULT NULL,
@@ -844,118 +943,86 @@ CREATE TABLE `CachedGroupMembers` (
   `Disabled` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `DisGrouMem` (`GroupId`,`MemberId`,`Disabled`),
-  KEY `CachedGroupMembers3` (`MemberId`,`ImmediateParentId`)
+  KEY `CachedGroupMembers3` (`MemberId`,`ImmediateParentId`),
+  KEY `cachedgroupmembers1` (`MemberId`,`GroupId`,`Disabled`)
 ) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `CachedGroupMembers`
+-- Dumping data for table `cachedgroupmembers`
 --
 
-LOCK TABLES `CachedGroupMembers` WRITE;
-/*!40000 ALTER TABLE `CachedGroupMembers` DISABLE KEYS */;
-INSERT INTO `CachedGroupMembers` VALUES (1,2,2,1,2,0),(2,2,1,2,2,0),(3,3,3,3,3,0),(4,4,4,4,4,0),(5,5,5,5,5,0),(6,7,7,6,7,0),(7,7,6,7,7,0),(8,3,6,8,3,0),(9,5,6,9,5,0),(10,8,8,10,8,0),(11,9,9,11,9,0),(12,10,10,12,10,0),(13,11,11,13,11,0),(14,13,13,14,13,0),(15,13,12,15,13,0),(16,3,12,16,3,0),(17,4,12,17,4,0),(18,14,14,18,14,0),(19,15,15,19,15,0),(20,16,16,20,16,0),(21,17,17,21,17,0),(22,18,18,22,18,0),(23,19,19,23,19,0),(24,20,20,24,20,0),(25,21,21,25,21,0),(26,22,22,26,22,0),(27,23,23,27, [...]
-/*!40000 ALTER TABLE `CachedGroupMembers` ENABLE KEYS */;
+LOCK TABLES `cachedgroupmembers` WRITE;
+/*!40000 ALTER TABLE `cachedgroupmembers` DISABLE KEYS */;
+INSERT INTO `cachedgroupmembers` VALUES (1,2,2,1,2,0),(2,2,1,2,2,0),(3,3,3,3,3,0),(4,4,4,4,4,0),(5,5,5,5,5,0),(6,7,7,6,7,0),(7,7,6,7,7,0),(8,3,6,8,3,0),(9,5,6,9,5,0),(10,8,8,10,8,0),(11,9,9,11,9,0),(12,10,10,12,10,0),(13,11,11,13,11,0),(14,13,13,14,13,0),(15,13,12,15,13,0),(16,3,12,16,3,0),(17,4,12,17,4,0),(18,14,14,18,14,0),(19,15,15,19,15,0),(20,16,16,20,16,0),(21,17,17,21,17,0),(22,18,18,22,18,0),(23,19,19,23,19,0),(24,20,20,24,20,0),(25,21,21,25,21,0),(26,22,22,26,22,0),(27,23,23,27, [...]
+/*!40000 ALTER TABLE `cachedgroupmembers` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `Links`
+-- Table structure for table `groups`
 --
 
-DROP TABLE IF EXISTS `Links`;
+DROP TABLE IF EXISTS `groups`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Links` (
+CREATE TABLE `groups` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `Base` varchar(240) DEFAULT NULL,
-  `Target` varchar(240) DEFAULT NULL,
-  `Type` varchar(20) NOT NULL,
-  `LocalTarget` int(11) NOT NULL DEFAULT '0',
-  `LocalBase` int(11) NOT NULL DEFAULT '0',
-  `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
-  `LastUpdated` datetime DEFAULT NULL,
+  `Name` varchar(200) DEFAULT NULL,
+  `Description` varchar(255) DEFAULT NULL,
+  `Domain` varchar(64) CHARACTER SET ascii DEFAULT NULL,
+  `Type` varchar(64) CHARACTER SET ascii DEFAULT NULL,
+  `Instance` int(11) DEFAULT NULL,
   `Creator` int(11) NOT NULL DEFAULT '0',
   `Created` datetime DEFAULT NULL,
+  `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
+  `LastUpdated` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `Links2` (`Base`,`Type`),
-  KEY `Links3` (`Target`,`Type`),
-  KEY `Links4` (`Type`,`LocalBase`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=ascii;
+  KEY `groups1` (`Domain`,`Type`,`Instance`),
+  KEY `groups2` (`Domain`,`Name`,`Instance`),
+  KEY `groups3` (`Instance`)
+) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `Links`
+-- Dumping data for table `groups`
 --
 
-LOCK TABLES `Links` WRITE;
-/*!40000 ALTER TABLE `Links` DISABLE KEYS */;
-INSERT INTO `Links` VALUES (1,'fsck.com-rt://example.com/ticket/1','fsck.com-rt://example.com/ticket/2','MemberOf',2,1,41,'2011-08-03 19:34:37',41,'2011-08-03 19:34:37'),(2,'fsck.com-rt://example.com/ticket/1','fsck.com-rt://example.com/ticket/3','MemberOf',3,1,41,'2011-08-03 19:34:46',41,'2011-08-03 19:34:46');
-/*!40000 ALTER TABLE `Links` ENABLE KEYS */;
+LOCK TABLES `groups` WRITE;
+/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
+INSERT INTO `groups` VALUES (2,'UserEquiv','ACL equiv. for user 1','ACLEquivalence','UserEquiv',1,0,NULL,0,NULL),(3,'Everyone','Pseudogroup for internal use','SystemInternal','Everyone',0,0,NULL,0,NULL),(4,'Privileged','Pseudogroup for internal use','SystemInternal','Privileged',0,0,NULL,0,NULL),(5,'Unprivileged','Pseudogroup for internal use','SystemInternal','Unprivileged',0,0,NULL,0,NULL),(7,'UserEquiv','ACL equiv. for user 6','ACLEquivalence','UserEquiv',6,0,NULL,0,NULL),(8,'Owner',' [...]
+/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `ObjectCustomFieldValues`
+-- Table structure for table `objectscrips`
 --
 
-DROP TABLE IF EXISTS `ObjectCustomFieldValues`;
+DROP TABLE IF EXISTS `objectscrips`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ObjectCustomFieldValues` (
+CREATE TABLE `objectscrips` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `CustomField` int(11) NOT NULL,
-  `ObjectType` varchar(255) CHARACTER SET ascii NOT NULL,
+  `Scrip` int(11) NOT NULL,
+  `Stage` varchar(32) CHARACTER SET ascii NOT NULL DEFAULT 'TransactionCreate',
   `ObjectId` int(11) NOT NULL,
   `SortOrder` int(11) NOT NULL DEFAULT '0',
-  `Content` varchar(255) DEFAULT NULL,
-  `LargeContent` longblob,
-  `ContentType` varchar(80) CHARACTER SET ascii DEFAULT NULL,
-  `ContentEncoding` varchar(80) CHARACTER SET ascii DEFAULT NULL,
   `Creator` int(11) NOT NULL DEFAULT '0',
   `Created` datetime DEFAULT NULL,
   `LastUpdatedBy` int(11) NOT NULL DEFAULT '0',
   `LastUpdated` datetime DEFAULT NULL,
-  `Disabled` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  KEY `ObjectCustomFieldValues1` (`Content`),
-  KEY `ObjectCustomFieldValues2` (`CustomField`,`ObjectType`,`ObjectId`)
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
+  UNIQUE KEY `ObjectScrips1` (`ObjectId`,`Scrip`)
+) ENGINE=InnoDB AUTO_INCREMENT=131 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `ObjectCustomFieldValues`
+-- Dumping data for table `objectscrips`
 --
 
-LOCK TABLES `ObjectCustomFieldValues` WRITE;
-/*!40000 ALTER TABLE `ObjectCustomFieldValues` DISABLE KEYS */;
-INSERT INTO `ObjectCustomFieldValues` VALUES (1,8,'RT::Ticket',1,0,'Full service: out of hours',NULL,NULL,'',41,'2011-08-03 19:34:32',41,'2011-08-03 19:34:32',0),(2,2,'RT::Ticket',1,0,'EDUNET',NULL,NULL,'',41,'2011-08-03 19:34:32',41,'2011-08-03 19:34:32',0),(3,3,'RT::Ticket',1,0,'new',NULL,NULL,'',1,'2011-08-03 19:34:34',1,'2011-08-03 19:34:38',1),(4,2,'RT::Ticket',2,0,'EDUNET',NULL,NULL,'',41,'2011-08-03 19:34:37',41,'2011-08-03 19:34:37',0),(5,9,'RT::Ticket',2,0,'IncidentCoord',NULL,N [...]
-/*!40000 ALTER TABLE `ObjectCustomFieldValues` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Principals`
---
-
-DROP TABLE IF EXISTS `Principals`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Principals` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `PrincipalType` varchar(16) NOT NULL,
-  `ObjectId` int(11) DEFAULT NULL,
-  `Disabled` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`),
-  KEY `Principals2` (`ObjectId`)
-) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=ascii;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Principals`
---
-
-LOCK TABLES `Principals` WRITE;
-/*!40000 ALTER TABLE `Principals` DISABLE KEYS */;
-INSERT INTO `Principals` VALUES (1,'User',1,0),(2,'Group',2,0),(3,'Group',3,0),(4,'Group',4,0),(5,'Group',5,0),(6,'User',6,0),(7,'Group',7,0),(8,'Group',8,0),(9,'Group',9,0),(10,'Group',10,0),(11,'Group',11,0),(12,'User',12,0),(13,'Group',13,0),(14,'Group',14,0),(15,'Group',15,0),(16,'Group',16,0),(17,'Group',17,0),(18,'Group',18,0),(19,'Group',19,0),(20,'Group',20,0),(21,'Group',21,0),(22,'Group',22,0),(23,'Group',23,0),(24,'Group',24,0),(25,'Group',25,0),(26,'Group',26,0),(27,'Group',2 [...]
-/*!40000 ALTER TABLE `Principals` ENABLE KEYS */;
+LOCK TABLES `objectscrips` WRITE;
+/*!40000 ALTER TABLE `objectscrips` DISABLE KEYS */;
+INSERT INTO `objectscrips` VALUES (1,1,'TransactionCreate',0,6,1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:52'),(2,2,'TransactionCreate',0,9,1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:52'),(3,3,'TransactionCreate',0,7,1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:52'),(4,4,'TransactionCreate',0,8,1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:52'),(5,5,'TransactionCreate',0,3,1,'2011-08-03 19:34:20',1,'2014-04-22 21:16:52'),(6,6,'TransactionCreate',0,5,1,'2011-08-03 19:34:20',1,'2014-04-22 2 [...]
+/*!40000 ALTER TABLE `objectscrips` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
@@ -981,43 +1048,6 @@ LOCK TABLES `sessions` WRITE;
 /*!40000 ALTER TABLE `sessions` DISABLE KEYS */;
 /*!40000 ALTER TABLE `sessions` ENABLE KEYS */;
 UNLOCK TABLES;
-
---
--- Table structure for table `Transactions`
---
-
-DROP TABLE IF EXISTS `Transactions`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Transactions` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ObjectType` varchar(64) CHARACTER SET ascii NOT NULL,
-  `ObjectId` int(11) NOT NULL DEFAULT '0',
-  `TimeTaken` int(11) NOT NULL DEFAULT '0',
-  `Type` varchar(20) CHARACTER SET ascii DEFAULT NULL,
-  `Field` varchar(40) CHARACTER SET ascii DEFAULT NULL,
-  `OldValue` varchar(255) DEFAULT NULL,
-  `NewValue` varchar(255) DEFAULT NULL,
-  `ReferenceType` varchar(255) CHARACTER SET ascii DEFAULT NULL,
-  `OldReference` int(11) DEFAULT NULL,
-  `NewReference` int(11) DEFAULT NULL,
-  `Data` varchar(255) DEFAULT NULL,
-  `Creator` int(11) NOT NULL DEFAULT '0',
-  `Created` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `Transactions1` (`ObjectType`,`ObjectId`)
-) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Transactions`
---
-
-LOCK TABLES `Transactions` WRITE;
-/*!40000 ALTER TABLE `Transactions` DISABLE KEYS */;
-INSERT INTO `Transactions` VALUES (1,'RT::Group',3,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(2,'RT::Group',4,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(3,'RT::Group',5,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(4,'RT::User',6,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(5,'RT::Group',8,0,'Create',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2011-08-03 19:34:17'),(6,'RT::Group',9,0, [...]
-/*!40000 ALTER TABLE `Transactions` ENABLE KEYS */;
-UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1028,4 +1058,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2011-08-04  1:04:27
+-- Dump completed on 2014-04-22 17:19:00
diff --git a/t/upgrade/2.6.0-to-2.9.0.t b/t/upgrade/2.6.0-to-2.9.0.t
index 015d6eb..f417b57 100644
--- a/t/upgrade/2.6.0-to-2.9.0.t
+++ b/t/upgrade/2.6.0-to-2.9.0.t
@@ -18,7 +18,7 @@ use RT::IR::Test tests => 17;
 my @state_cf_ids;
 {
     my $cfs = RT::CustomFields->new( RT->SystemUser );
-    $cfs->Limit( FIELD => 'Name', VALUE => 'State' );
+    $cfs->Limit( FIELD => 'Name', VALUE => 'State', CASESENSITIVE => 0 );
     $cfs->Limit( FIELD => 'Disabled', VALUE => 1 );
     push @state_cf_ids, map $_->id, @{ $cfs->ItemsArrayRef };
     is( scalar @state_cf_ids, 4, 'four disabled state fields' );
@@ -30,7 +30,7 @@ my @state_cf_ids;
 
     my $queue = $ticket->QueueObj;
     is( $queue->Name, 'Incident Reports', 'an IR' );
-    is( $queue->Lifecycle->Name, 'incident_reports', 'incidents cycle' );
+    is( $queue->LifecycleObj->Name, 'incident_reports', 'incidents cycle' );
 
     is( $ticket->Subject, 'IR for reject' );
     is( $ticket->Status, 'rejected' );
@@ -45,7 +45,7 @@ my @state_cf_ids;
 
     my $queue = $ticket->QueueObj;
     is( $queue->Name, 'Incidents', 'an incident' );
-    is( $queue->Lifecycle->Name, 'incidents', 'incidents cycle' );
+    is( $queue->LifecycleObj->Name, 'incidents', 'incidents cycle' );
 
     is( $ticket->Subject, 'Inc for abandon' );
     is( $ticket->Status, 'abandoned' );

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the rt-commit mailing list