reintegrate cdm-3.3 branch into trunk

[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 96ccbb9040dab64ed1e0f11f207395f0abe76c5f..f51049a0168afbf8d09347f6028f0a1f5b75323b 100644 (file)
--- a/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -588,13 +588,15 @@ CREATE CACHED TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO_AUD(
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.CLASSIFICATION_TAXONNODE(
     CLASSIFICATION_ID INTEGER NOT NULL,
-    ROOTNODES_ID INTEGER NOT NULL
+    ROOTNODES_ID INTEGER NOT NULL,
+    SORTINDEX INT NOT NULL
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_TAXONNODE;
 CREATE CACHED TABLE PUBLIC.CLASSIFICATION_TAXONNODE_AUD(
     REV INTEGER NOT NULL,
     CLASSIFICATION_ID INTEGER NOT NULL,
     ROOTNODES_ID INTEGER NOT NULL,
+    SORTINDEX INT NOT NULL,
     REVTYPE TINYINT
 );
 
@@ -2139,7 +2141,7 @@ CREATE TABLE MATERIALORMETHODEVENT (
     TEMPERATURE DOUBLE,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
-    MATERIALMETHODTERM_ID INTEGER,
+    DEFINEDMATERIALORMETHOD_ID INTEGER,
     ACTOR_ID INTEGER,
     FORWARDPRIMER_ID INTEGER,
     REVERSEPRIMER_ID INTEGER,
@@ -2162,7 +2164,7 @@ CREATE TABLE MATERIALORMETHODEVENT_AUD (
     TEMPERATURE DOUBLE,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
-    MATERIALMETHODTERM_ID INTEGER,
+    DEFINEDMATERIALORMETHOD_ID INTEGER,
     ACTOR_ID INTEGER,
     FORWARDPRIMER_ID INTEGER,
     REVERSEPRIMER_ID INTEGER,