Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ippToPsps/config/ippToPspsDbSchema.sql

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippToPsps/config/ippToPspsDbSchema.sql (modified) (9 diffs)

branches/eam_branches/ps2-tc3-20130727/ippToPsps/config/ippToPspsDbSchema.sql

@@ -45 +45 @@
   `stage_id` bigint(20) default NULL,
   `total_detections` bigint(20) default NULL,
+  `skychunk` varchar(400) default NULL,
+  `datastore_file` varchar(400) default NULL,
   `comment` varchar(400) default NULL,
   `purged` tinyint(4) NOT NULL default '0',
@@ -51 +53 @@
 SET character_set_client = @saved_cs_client;
 
---
--- Table structure for table `box`
---
-
-DROP TABLE IF EXISTS `box`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `box` (
-  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `skychunk` varchar(30) default NULL,
-  `ra_center` float default NULL,
-  `dec_center` float default NULL,
-  `box_side` float default NULL,
-  `ingested` varchar(64) default 'none',
-  PRIMARY KEY  (`id`),
-  KEY `fk_skychunk` (`skychunk`),
-  CONSTRAINT `fk_skychunk` FOREIGN KEY (`skychunk`) REFERENCES `skychunk` (`name`) ON DELETE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
 
 --
@@ -125 +107 @@
   `queue_ST` tinyint(1) default '0',
   `queue_OB` tinyint(1) default '0',
+  `queue_DF` tinyint(1) default '0',
+  `queue_DO` tinyint(1) default '0',
+  `queue_FW` tinyint(1) default '0',
+  `queue_FO` tinyint(1) default '0',
   `active` tinyint(1) default '1',
   `parallel` tinyint(1) default '0',
@@ -136 +122 @@
 
 --
+-- Table structure for table `box` needs to be after skychunk or get err:150
+--
+
+DROP TABLE IF EXISTS `box`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `box` (
+  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
+  `id` bigint(20) unsigned NOT NULL auto_increment,
+  `skychunk` varchar(30) default NULL,
+  `ra_center` float default NULL,
+  `dec_center` float default NULL,
+  `box_side` float default NULL,
+  `ingested` varchar(64) default 'none',
+  PRIMARY KEY  (`id`),
+  KEY `fk_skychunk` (`skychunk`),
+  CONSTRAINT `fk_skychunk` FOREIGN KEY (`skychunk`) REFERENCES `skychunk` (`name`) ON DELETE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `detection`
 --
@@ -152 +159 @@
 
 --
+-- Table structure for table `forcedwarp`
+--
+
+DROP TABLE IF EXISTS `forcedwarp`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `forcedwarp` (
+  `batch_id` bigint(20) unsigned NOT NULL,
+  `exp_id` bigint(20) default NULL,
+  `filter` varchar(1) default NULL,
+  KEY `batch_id` (`batch_id`),
+  CONSTRAINT `forcedwarpd_ibfk_1` FOREIGN KEY (`batch_id`) REFERENCES `batch` (`batch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `object`
 --
@@ -163 +186 @@
   KEY `batch_id` (`batch_id`),
   CONSTRAINT `object_fk_1` FOREIGN KEY (`batch_id`) REFERENCES `batch` (`batch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+--
+-- Table structure for table `diffobject`
+--
+
+DROP TABLE IF EXISTS `diffobject`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `diffobject` (
+  `batch_id` bigint(20) unsigned NOT NULL,
+  `region` varchar(50) default NULL,
+  KEY `batch_id` (`batch_id`),
+  CONSTRAINT `diffobject_fk_1` FOREIGN KEY (`batch_id`) REFERENCES `batch` (`batch_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -178 +215 @@
   `stage_id` bigint(20) default NULL,
   UNIQUE KEY `a_key` (`box_id`,`stage_id`,`batch_type`),
-  UNIQUE KEY `stage_id_key` (`stage_id`),
+  UNIQUE KEY `stage_id_key` (`stage_id`,`batch_type`),
   CONSTRAINT `box_key` FOREIGN KEY (`box_id`) REFERENCES `box` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -196 +233 @@
   KEY `batch_id` (`batch_id`),
   CONSTRAINT `stack_ibfk_1` FOREIGN KEY (`batch_id`) REFERENCES `batch` (`batch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `diff`
+--
+
+DROP TABLE IF EXISTS `diff`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `diff` (
+  `batch_id` bigint(20) unsigned NOT NULL,
+  `filter` varchar(1) default NULL,
+  `diff_type` varchar(20) default NULL,
+  KEY `batch_id` (`batch_id`),
+  CONSTRAINT `diff_ibfk_1` FOREIGN KEY (`batch_id`) REFERENCES `batch` (`batch_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -225 +278 @@
 
 -- Dump completed on 2012-04-10  6:00:59
+
+
+DROP TABLE IF EXISTS `dvodb`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvodb` (
+  `dvo_db` varchar(30) default NULL,
+  `batch_type` varchar(10) default NULL,
+  `stage_id` bigint(20) unsigned default NULL,
+  `ra_center` float default NULL,
+  `dec_center` float default NULL,
+  `uniq_key` varchar(30) default NULL,
+  UNIQUE KEY `uniq_key` (`uniq_key`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+