Update db dump

1 files changed, 64 insertions, 72 deletions

diff --git a/extras/database.sql b/extras/database.sql
index fe5f957..aec8e17 100644
--- a/extras/database.sql
+++ b/extras/database.sql
@@ -1,117 +1,109 @@
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-
-SET time_zone = "+00:00";
-
-
-
+-- MySQL dump 10.13  Distrib 5.5.40, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: master-test
+-- ------------------------------------------------------
+-- Server version	5.5.40-0ubuntu0.12.04.1
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `image`
+--
+
+DROP TABLE IF EXISTS `image`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `image` (
-
   `uuid` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
-
   `revision` int(10) unsigned NOT NULL,
-
   `title` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
-
   `path` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-
   `createtime` int(10) unsigned NOT NULL,
-
   `updatetime` int(10) unsigned NOT NULL,
-
   `ownerid` int(10) unsigned NOT NULL,
-
-  `operatingsystem` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-
-  `isvalid` tinyint(1) unsigned NOT NULL,
-
+  `operatingsystem` int(10) unsigned NOT NULL,
+  `isvalid` tinyint(1) NOT NULL,
   `isdeleted` tinyint(1) unsigned NOT NULL,
-
   `description` text COLLATE utf8_unicode_ci NOT NULL,
-
   `filesize` bigint(20) unsigned NOT NULL,
-
   `missingblocks` text COLLATE utf8_unicode_ci NOT NULL,
-
   PRIMARY KEY (`uuid`,`revision`),
-
-  KEY `ownerid` (`ownerid`)
-
+  KEY `ownerid` (`ownerid`),
+  CONSTRAINT `image_ibfk_1` FOREIGN KEY (`ownerid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `satellite`
+--
 
-
+DROP TABLE IF EXISTS `satellite`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `satellite` (
-
   `organizationid` varchar(32) NOT NULL,
-
   `address` varchar(64) NOT NULL,
-
   `name` varchar(255) NOT NULL,
-
   `authmethod` varchar(255) NOT NULL,
-
   `publickey` text,
-
   PRIMARY KEY (`organizationid`)
-
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `satellite_suffix`
+--
 
-
+DROP TABLE IF EXISTS `satellite_suffix`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `satellite_suffix` (
-
   `organizationid` varchar(32) NOT NULL,
-
   `suffix` varchar(32) NOT NULL,
-
   PRIMARY KEY (`suffix`),
-
-  KEY `organizationid` (`organizationid`)
-
+  KEY `organizationid` (`organizationid`),
+  CONSTRAINT `satellite_suffix_ibfk_1` FOREIGN KEY (`organizationid`) REFERENCES `satellite` (`organizationid`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `user`
+--
 
-
+DROP TABLE IF EXISTS `user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `user` (
-
   `userid` int(10) unsigned NOT NULL AUTO_INCREMENT,
-
   `login` varchar(48) DEFAULT NULL,
-
   `password` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
-
   `organizationid` varchar(32) NOT NULL,
-
   `firstname` varchar(32) NOT NULL,
-
   `lastname` varchar(32) NOT NULL,
-
   `email` varchar(48) NOT NULL,
-
   PRIMARY KEY (`userid`),
+  UNIQUE KEY `username` (`organizationid`,`login`),
+  CONSTRAINT `user_ibfk_1` FOREIGN KEY (`organizationid`) REFERENCES `satellite` (`organizationid`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
-  UNIQUE KEY `username` (`organizationid`,`login`)
-
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
-
-
-
-
-
-ALTER TABLE `image`
-
-  ADD CONSTRAINT `image_ibfk_1` FOREIGN KEY (`ownerid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE;
-
-
-
-ALTER TABLE `satellite_suffix`
-
-  ADD CONSTRAINT `satellite_suffix_ibfk_1` FOREIGN KEY (`organizationid`) REFERENCES `satellite` (`organizationid`) ON UPDATE CASCADE;
-
-
-
-ALTER TABLE `user`
-
-  ADD CONSTRAINT `user_ibfk_1` FOREIGN KEY (`organizationid`) REFERENCES `satellite` (`organizationid`) ON UPDATE CASCADE;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+-- Dump completed on 2014-10-20 15:11:09