separate Amplification and AmplificationResult.java #4541

[cdmlib.git] / cdmlib-ext / src / test / resources / dbscripts / 001-cdm.h2.sql

diff --git a/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql b/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
index d8edc264483681364f88db3a970c13c91d81de6c..68b614169bf209d030faf253b682fd3e53c46381 100644 (file)
--- a/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -309,19 +309,14 @@ CREATE TABLE AMPLIFICATION (
      GELCONCENTRATION DOUBLE,
      GELRUNNINGTIME DOUBLE,
      LADDERUSED VARCHAR(255),
-     SUCCESSTEXT VARCHAR(255),
-     SUCCESSFUL BOOLEAN,
      CREATEDBY_ID INTEGER,
      UPDATEDBY_ID INTEGER,
      ACTOR_ID INTEGER,
-     CLONING_ID INTEGER,
-     DNASAMPLE_ID INTEGER,
      FORWARDPRIMER_ID INTEGER,
      DNAMARKER_ID INTEGER,
      PURIFICATION_ID INTEGER,
      INSTITUTION_ID INTEGER,
         REVERSEPRIMER_ID INTEGER,
-     GELPHOTO_ID INTEGER,
      PRIMARY KEY (ID)
 );
 
@@ -340,19 +335,14 @@ CREATE TABLE AMPLIFICATION_AUD (
     GELCONCENTRATION DOUBLE,
     GELRUNNINGTIME DOUBLE,
     LADDERUSED VARCHAR(255),
-    SUCCESSTEXT VARCHAR(255),
-    SUCCESSFUL BOOLEAN,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ACTOR_ID INTEGER,
-    CLONING_ID INTEGER,
-    DNASAMPLE_ID INTEGER,
     FORWARDPRIMER_ID INTEGER,
     DNAMARKER_ID INTEGER,
     PURIFICATION_ID INTEGER,
     INSTITUTION_ID INTEGER,
        REVERSEPRIMER_ID INTEGER,
-    GELPHOTO_ID INTEGER,
     PRIMARY KEY (ID)
 );
 
@@ -382,16 +372,76 @@ CREATE TABLE AMPLIFICATION_MARKER_AUD (
     MARKERS_ID INTEGER NOT NULL,
 );
 
-CREATE TABLE AMPLIFICATION_SINGLEREAD (
-       AMPLIFICATION_ID INTEGER NOT NULL,
+CREATE TABLE AMPLIFICATIONRESULT (
+     ID INTEGER NOT NULL,
+     CREATED TIMESTAMP,
+     UUID VARCHAR(36),
+     UPDATED TIMESTAMP,
+     SUCCESSTEXT VARCHAR(255),
+     SUCCESSFUL BOOLEAN,
+     CREATEDBY_ID INTEGER,
+     UPDATEDBY_ID INTEGER,
+     CLONING_ID INTEGER,
+     DNASAMPLE_ID INTEGER,
+        AMPLIFICATION_ID INTEGER,
+        GELPHOTO_ID INTEGER,
+     PRIMARY KEY (ID)
+);
+
+CREATE TABLE AMPLIFICATIONRESULT_AUD (
+     ID INTEGER NOT NULL,
+        REV INTEGER NOT NULL,
+     REVTYPE TINYINT,
+     CREATED TIMESTAMP,
+     UUID VARCHAR(36),
+     UPDATED TIMESTAMP,
+     SUCCESSTEXT VARCHAR(255),
+     SUCCESSFUL BOOLEAN,
+     CREATEDBY_ID INTEGER,
+     UPDATEDBY_ID INTEGER,
+     CLONING_ID INTEGER,
+     DNASAMPLE_ID INTEGER,
+     AMPLIFICATION_ID INTEGER,
+        GELPHOTO_ID INTEGER,
+     PRIMARY KEY (ID)
+);
+
+CREATE TABLE AMPLIFICATIONRESULT_ANNOTATION (
+    AMPLIFICATIONRESULT_ID INTEGER NOT NULL,
+    ANNOTATIONS_ID INTEGER NOT NULL,
+    PRIMARY KEY (AMPLIFICATIONRESULT_ID, ANNOTATIONS_ID)
+);
+
+CREATE TABLE AMPLIFICATIONRESULT_ANNOTATION_AUD (
+    REV INTEGER NOT NULL,
+    REVTYPE TINYINT,
+    AMPLIFICATIONRESULT_ID INTEGER NOT NULL,
+    ANNOTATIONS_ID INTEGER NOT NULL
+);
+
+CREATE TABLE AMPLIFICATIONRESULT_MARKER (
+    AMPLIFICATIONRESULT_ID INTEGER NOT NULL,
+    MARKERS_ID INTEGER NOT NULL,
+    PRIMARY KEY (AMPLIFICATIONRESULT_ID, MARKERS_ID)
+);
+
+CREATE TABLE AMPLIFICATIONRESULT_MARKER_AUD (
+    REV INTEGER NOT NULL,
+    REVTYPE TINYINT,
+    AMPLIFICATIONRESULT_ID INTEGER NOT NULL,
+    MARKERS_ID INTEGER NOT NULL,
+);
+
+CREATE TABLE AMPLIFICATIONRESULT_SINGLEREAD (
+       AMPLIFICATIONRESULT_ID INTEGER NOT NULL,
     SINGLEREADS_ID INTEGER NOT NULL,
-    PRIMARY KEY (AMPLIFICATION_ID, SINGLEREADS_ID)
+    PRIMARY KEY (AMPLIFICATIONRESULT_ID, SINGLEREADS_ID)
 );
 
-CREATE TABLE AMPLIFICATION_SINGLEREAD_AUD (
+CREATE TABLE AMPLIFICATIONRESULT_SINGLEREAD_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
-       AMPLIFICATION_ID INTEGER NOT NULL,
+       AMPLIFICATIONRESULT_ID INTEGER NOT NULL,
     SINGLEREADS_ID INTEGER NOT NULL,
 );
 
@@ -3627,14 +3677,14 @@ CREATE TABLE SINGLEREADALIGNMENT (
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-       EDITEDSEQUENCE_LENGTH INTEGER,
-       EDITEDSEQUENCE_STRING CLOB,
+       EDITEDSEQUENCE CLOB,
        SHIFTS CLOB,
-    CREATEDBY_ID INTEGER,
+    REVERSECOMPLEMENT BIT,
+       CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
-    CONSENSUSSEQUENCE_ID INTEGER NOT NULL,
+    CONSENSUSALIGNMENT_ID INTEGER NOT NULL,
     SINGLEREAD_ID INTEGER NOT NULL,
-    PRIMARY KEY (CONSENSUSSEQUENCE_ID, SINGLEREAD_ID)
+    PRIMARY KEY (CONSENSUSALIGNMENT_ID, SINGLEREAD_ID)
 );
 
 CREATE TABLE SINGLEREADALIGNMENT_AUD (
@@ -3644,12 +3694,12 @@ CREATE TABLE SINGLEREADALIGNMENT_AUD (
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-       EDITEDSEQUENCE_LENGTH INTEGER,
-       EDITEDSEQUENCE_STRING CLOB,
+       EDITEDSEQUENCE CLOB,
        SHIFTS CLOB,
-    CREATEDBY_ID INTEGER,
+    REVERSECOMPLEMENT BIT,
+       CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
-    CONSENSUSSEQUENCE_ID INTEGER NOT NULL,
+    CONSENSUSALIGNMENT_ID INTEGER NOT NULL,
     SINGLEREAD_ID INTEGER NOT NULL
 );
 
@@ -3668,7 +3718,7 @@ CREATE TABLE SINGLEREAD (
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ACTOR_ID INTEGER,
-    AMPLIFICATION_ID INTEGER,
+    AMPLIFICATIONRESULT_ID INTEGER,
     MATERIALORMETHOD_ID INTEGER,
     PHEROGRAM_ID INTEGER,
     PRIMER_ID INTEGER,
@@ -3691,7 +3741,7 @@ CREATE TABLE SINGLEREAD_AUD (
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ACTOR_ID INTEGER,
-    AMPLIFICATION_ID INTEGER,
+    AMPLIFICATIONRESULT_ID INTEGER,
     MATERIALORMETHOD_ID INTEGER,
     PHEROGRAM_ID INTEGER,
     PRIMER_ID INTEGER