Changeset 2992 for trunk/config

Timestamp:

Dec 1, 2006, 3:00:14 PM (17 years ago)

Author:

Johan Enell

Message:

Merged log:branches/2.1#2846:2990 trunk.

File:

• trunk/config/dist/mysql-migration-queries.sql (modified) (4 diffs)

trunk/config/dist/mysql-migration-queries.sql

@@ -1 +1 @@
 /*
-   $Id: mysql-migration-queries.sql 2693 2006-10-03 11:44:54Z nicklas $
+   $Id: mysql-migration-queries.sql 2973 2006-11-29 09:24:26Z nicklas $
 
   Copyright (C) Authors contributing to this file.
@@ -971 +971 @@
   `flags` 
 FROM  `RawBioAssayData`
-WHERE   `rawBioAssay` = ?
-ORDER BY `position`
-LIMIT   ?,?;
+WHERE   `rawBioAssay` = ?;
 
 
@@ -979 +977 @@
 SELECT `element`, `reporter`, `block`, `numCol`, `numRow`, `x`, `y`
 FROM  `RawBioAssayData`
-WHERE   `rawBioAssay` = ?
-ORDER BY `position`
-LIMIT   ?,?;
+WHERE   `rawBioAssay` = ?;
 
 
@@ -1037 +1033 @@
 LIMIT   ?, ?;
 
+/* getCh1SampleForRawBioAssay */
+SELECT s.`id` FROM `Sample` s
+INNER JOIN `Extract` e ON e.`sample` = s.`id`
+INNER JOIN `LabeledExtract` le ON le.`extract` = e.`id`
+INNER JOIN `HybridizedLabeled` hl ON hl.`labeled` = le.`id` AND hl.`channel` = 1
+INNER JOIN `ImageAcquisition` ia ON ia.`hybridization` =  hl.`hybridization`
+INNER JOIN `RawBioAssay` rba ON rba.`imageAcquisition` = ia.`id`
+WHERE rba.`id` = ?;
 
 /* selectRawBioAssaysWithSpotData */