Added database setup into install

code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php

@@ -45,7 +45,11 @@
             `query` VARCHAR( 512 ) NOT NULL 
             );
             
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`ticket_category`
+            -- -----------------------------------------------------
             DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_category` ;
+            
             CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_category` (
               `TCategoryId` INT NOT NULL AUTO_INCREMENT ,
               `Name` VARCHAR(45) NOT NULL ,
@@ -53,6 +57,23 @@
               UNIQUE INDEX `Name_UNIQUE` (`Name` ASC) )
             ENGINE = InnoDB;
             
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`ticket_user`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_user` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_user` (
+              `UId` INT(10) NOT NULL AUTO_INCREMENT ,
+              `Permission` INT(3) NOT NULL DEFAULT 1 ,
+              `Extern_Id` INT(10) NOT NULL ,
+              PRIMARY KEY (`UId`) )
+            ENGINE = InnoDB;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`ticket`
+            -- -----------------------------------------------------
             DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket` ;
             
             CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket` (
@@ -73,12 +94,156 @@
                 ON UPDATE NO ACTION,
               CONSTRAINT `fk_ticket_ams_user`
                 FOREIGN KEY (`Author` )
-                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ams_user` (`UId` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket_user` (`UId` )
                 ON DELETE NO ACTION
                 ON UPDATE NO ACTION)
             ENGINE = InnoDB;
             
             
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`assigned`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`assigned` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`assigned` (
+              `Ticket` INT NOT NULL ,
+              `User` INT NOT NULL ,
+              INDEX `fk_assigned_ticket_idx` (`Ticket` ASC) ,
+              PRIMARY KEY (`Ticket`, `User`) ,
+              INDEX `fk_assigned_ams_user_idx` (`User` ASC) ,
+              CONSTRAINT `fk_assigned_ticket`
+                FOREIGN KEY (`Ticket` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket` (`TId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+              CONSTRAINT `fk_assigned_ams_user`
+                FOREIGN KEY (`User` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket_user` (`UId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION)
+            ENGINE = InnoDB;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`tag`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`tag` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`tag` (
+              `TagId` INT NOT NULL AUTO_INCREMENT ,
+              `Value` VARCHAR(60) NOT NULL ,
+              PRIMARY KEY (`TagId`) ,
+              UNIQUE INDEX `Value_UNIQUE` (`Value` ASC) )
+            ENGINE = InnoDB;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`tagged`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`tagged` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`tagged` (
+              `Ticket` INT NOT NULL ,
+              `Tag` INT NOT NULL ,
+              PRIMARY KEY (`Ticket`, `Tag`) ,
+              INDEX `fk_tagged_tag_idx` (`Tag` ASC) ,
+              CONSTRAINT `fk_tagged_ticket`
+                FOREIGN KEY (`Ticket` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket` (`TId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+              CONSTRAINT `fk_tagged_tag`
+                FOREIGN KEY (`Tag` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`tag` (`TagId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION)
+            ENGINE = InnoDB;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`ticket_content`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_content` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_content` (
+              `TContentId` INT NOT NULL AUTO_INCREMENT ,
+              `Content` TEXT NULL ,
+              PRIMARY KEY (`TContentId`) )
+            ENGINE = InnoDB
+            DEFAULT CHARACTER SET = utf8;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`ticket_reply`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_reply` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_reply` (
+              `TReplyId` INT NOT NULL AUTO_INCREMENT ,
+              `Ticket` INT NOT NULL ,
+              `Author` INT NOT NULL ,
+              `Content` INT NOT NULL ,
+              `Timestamp` TIMESTAMP NULL ,
+              PRIMARY KEY (`TReplyId`) ,
+              INDEX `fk_ticket_reply_ticket_idx` (`Ticket` ASC) ,
+              INDEX `fk_ticket_reply_ams_user_idx` (`Author` ASC) ,
+              INDEX `fk_ticket_reply_content_idx` (`Content` ASC) ,
+              CONSTRAINT `fk_ticket_reply_ticket`
+                FOREIGN KEY (`Ticket` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket` (`TId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+              CONSTRAINT `fk_ticket_reply_ams_user`
+                FOREIGN KEY (`Author` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket_user` (`UId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+              CONSTRAINT `fk_ticket_reply_ticket_content`
+                FOREIGN KEY (`Content` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket_content` (`TContentId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION)
+            ENGINE = InnoDB;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`ticket_group`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_group` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`ticket_group` (
+              `TGroupId` INT NOT NULL AUTO_INCREMENT ,
+              `Title` VARCHAR(80) NOT NULL ,
+              PRIMARY KEY (`TGroupId`) ,
+              UNIQUE INDEX `Title_UNIQUE` (`Title` ASC) )
+            ENGINE = InnoDB;
+            
+            
+            -- -----------------------------------------------------
+            -- Table `" . $cfg['db']['lib']['name'] ."`.`in_group`
+            -- -----------------------------------------------------
+            DROP TABLE IF EXISTS `" . $cfg['db']['lib']['name'] ."`.`in_group` ;
+            
+            CREATE  TABLE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`.`in_group` (
+              `Ticket_Group` INT NOT NULL ,
+              `Ticket` INT NOT NULL ,
+              PRIMARY KEY (`Ticket_Group`, `Ticket`) ,
+              INDEX `fk_in_group_ticket_group_idx` (`Ticket_Group` ASC) ,
+              INDEX `fk_in_group_ticket_idx` (`Ticket` ASC) ,
+              CONSTRAINT `fk_in_group_ticket_group`
+                FOREIGN KEY (`Ticket_Group` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket_group` (`TGroupId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+              CONSTRAINT `fk_in_group_ticket`
+                FOREIGN KEY (`Ticket` )
+                REFERENCES `" . $cfg['db']['lib']['name'] ."`.`ticket` (`TId` )
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION)
+            ENGINE = InnoDB;
+
+
+
         ";
         $dbl->executeWithoutParams($sql);
         print "The Lib & Web database were correctly installed! <br />";

code/ryzom/tools/server/ryzom_ams/www/html/sql/ticketsql.sql

@@ -19,20 +19,14 @@ ENGINE = InnoDB;
 
 
 -- -----------------------------------------------------
--- Table `mydb`.`ams_user`
+-- Table `mydb`.`ticket_user`
 -- -----------------------------------------------------
-DROP TABLE IF EXISTS `mydb`.`ams_user` ;
+DROP TABLE IF EXISTS `mydb`.`ticket_user` ;
 
-CREATE  TABLE IF NOT EXISTS `mydb`.`ams_user` (
+CREATE  TABLE IF NOT EXISTS `mydb`.`ticket_user` (
   `UId` INT(10) NOT NULL AUTO_INCREMENT ,
-  `Login` VARCHAR(64) NOT NULL ,
-  `Password` VARCHAR(13) NULL DEFAULT NULL ,
-  `Email` VARCHAR(255) NOT NULL ,
   `Permission` INT(3) NOT NULL DEFAULT 1 ,
-  `FirstName` VARCHAR(80) NOT NULL ,
+  `Extern_Id` INT(10) NOT NULL,
-  `LastName` VARCHAR(80) NOT NULL ,
-  `Gender` TINYINT(1) NOT NULL DEFAULT 0 ,
-  `Country` CHAR(2) NOT NULL DEFAULT 'AA' ,
   PRIMARY KEY (`UId`) )
 ENGINE = InnoDB;
 
@@ -44,7 +38,7 @@ DROP TABLE IF EXISTS `mydb`.`ticket` ;
 
 CREATE  TABLE IF NOT EXISTS `mydb`.`ticket` (
   `TId` INT NOT NULL AUTO_INCREMENT ,
-  `Date` TIMESTAMP NOT NULL ,
+  `Timestamp` TIMESTAMP NOT NULL ,
   `Title` VARCHAR(120) NOT NULL ,
   `Status` INT NULL DEFAULT 0 ,
   `Queue` INT NULL DEFAULT 0 ,
@@ -60,7 +54,7 @@ CREATE  TABLE IF NOT EXISTS `mydb`.`ticket` (
     ON UPDATE NO ACTION,
   CONSTRAINT `fk_ticket_ams_user`
     FOREIGN KEY (`Author` )
-    REFERENCES `mydb`.`ams_user` (`UId` )
+    REFERENCES `mydb`.`ticket_user` (`UId` )
     ON DELETE NO ACTION
     ON UPDATE NO ACTION)
 ENGINE = InnoDB;
@@ -84,7 +78,7 @@ CREATE  TABLE IF NOT EXISTS `mydb`.`assigned` (
     ON UPDATE NO ACTION,
   CONSTRAINT `fk_assigned_ams_user`
     FOREIGN KEY (`User` )
-    REFERENCES `mydb`.`ams_user` (`UId` )
+    REFERENCES `mydb`.`ticket_user` (`UId` )
     ON DELETE NO ACTION
     ON UPDATE NO ACTION)
 ENGINE = InnoDB;
@@ -135,7 +129,8 @@ CREATE  TABLE IF NOT EXISTS `mydb`.`ticket_content` (
   `TContentId` INT NOT NULL AUTO_INCREMENT ,
   `Content` TEXT NULL ,
   PRIMARY KEY (`TContentId`) )
-ENGINE = InnoDB;
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;
 
 
 -- -----------------------------------------------------
@@ -148,6 +143,7 @@ CREATE  TABLE IF NOT EXISTS `mydb`.`ticket_reply` (
   `Ticket` INT NOT NULL ,
   `Author` INT NOT NULL ,
   `Content` INT NOT NULL ,
+  `Timestamp` TIMESTAMP NULL ,
   PRIMARY KEY (`TReplyId`) ,
   INDEX `fk_ticket_reply_ticket_idx` (`Ticket` ASC) ,
   INDEX `fk_ticket_reply_ams_user_idx` (`Author` ASC) ,
@@ -159,7 +155,7 @@ CREATE  TABLE IF NOT EXISTS `mydb`.`ticket_reply` (
     ON UPDATE NO ACTION,
   CONSTRAINT `fk_ticket_reply_ams_user`
     FOREIGN KEY (`Author` )
-    REFERENCES `mydb`.`ams_user` (`UId` )
+    REFERENCES `mydb`.`ticket_user` (`UId` )
     ON DELETE NO ACTION
     ON UPDATE NO ACTION,
   CONSTRAINT `fk_ticket_reply_ticket_content`