[Nmrshiftdb-devel] CVS: nmrshiftdb/src/conf/jetspeed/WEB-INF/db nmrshiftdb-schema.sql,1.21,1.22

[Stefan K. <sk...@us...>]

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/db
In directory usw-pr-cvs1:/tmp/cvs-serv20803

Modified Files:
	nmrshiftdb-schema.sql 
Log Message:
added 2 new entities


Index: nmrshiftdb-schema.sql
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/db/nmrshiftdb-schema.sql,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** nmrshiftdb-schema.sql	27 May 2002 13:57:10 -0000	1.21
--- nmrshiftdb-schema.sql	30 May 2002 15:09:40 -0000	1.22
***************
*** 41,45 ****
      CONDITION_NAME MEDIUMTEXT NOT NULL,
      CONDITION_TYPE MEDIUMTEXT NOT NULL,
!     DATA_TYPE MEDIUMTEXT NOT NULL,
      PRIMARY KEY(CONDITION_TYPE_ID)
  );
--- 41,45 ----
      CONDITION_NAME MEDIUMTEXT NOT NULL,
      CONDITION_TYPE MEDIUMTEXT NOT NULL,
!     DATA_TYPE MEDIUMTEXT NOT NULL,
      PRIMARY KEY(CONDITION_TYPE_ID)
  );
***************
*** 68,72 ****
  (
      SPECTRUM_TYPE_ID INTEGER NOT NULL,
!     AXIS INTEGER NOT NULL,
      ELEMENT_SYMBOL MEDIUMTEXT NOT NULL,
      ATOMIC_MASS INTEGER NOT NULL,
--- 68,72 ----
  (
      SPECTRUM_TYPE_ID INTEGER NOT NULL,
!     AXIS INTEGER NOT NULL,
      ELEMENT_SYMBOL MEDIUMTEXT NOT NULL,
      ATOMIC_MASS INTEGER NOT NULL,
***************
*** 98,102 ****
      FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID),
      FOREIGN KEY (SPECTRUM_TYPE_ID) REFERENCES SPECTRUM_TYPE (SPECTRUM_TYPE_ID),
!     FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID),
      INDEX REVIEW_FLAG_INDEX (REVIEW_FLAG(1))
     
--- 98,102 ----
      FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID),
      FOREIGN KEY (SPECTRUM_TYPE_ID) REFERENCES SPECTRUM_TYPE (SPECTRUM_TYPE_ID),
!     FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID),
      INDEX REVIEW_FLAG_INDEX (REVIEW_FLAG(1))
     
***************
*** 113,117 ****
      DIMENSIONALITY INTEGER NOT NULL,
      SERIALIZED_SIGNAL MEDIUMTEXT NOT NULL,
!     INTENSITY FLOAT NOT NULL,
      SPECTRUM_ID INTEGER NOT NULL,
      PRIMARY KEY(SIGNAL_ID),
--- 113,117 ----
      DIMENSIONALITY INTEGER NOT NULL,
      SERIALIZED_SIGNAL MEDIUMTEXT NOT NULL,
!     INTENSITY FLOAT NOT NULL,
      SPECTRUM_ID INTEGER NOT NULL,
      PRIMARY KEY(SIGNAL_ID),
***************
*** 129,133 ****
      AXIS INTEGER NOT NULL,
      VALUE FLOAT NOT NULL,
!     PRIMARY KEY(SIGNAL_ID,AXIS),
      INDEX(AXIS),
      FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID)
--- 129,133 ----
      AXIS INTEGER NOT NULL,
      VALUE FLOAT NOT NULL,
!     PRIMARY KEY(SIGNAL_ID,AXIS),
      INDEX(AXIS),
      FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID)
***************
*** 149,168 ****
      NMRSHIFTDB_NUMBER MEDIUMTEXT NOT NULL,
      MOLECULAR_WEIGHT FLOAT NOT NULL,
!     FINGERPRINT_1 BIGINT NOT NULL,
!     FINGERPRINT_2 BIGINT NOT NULL,
!     FINGERPRINT_3 BIGINT NOT NULL,
!     FINGERPRINT_4 BIGINT NOT NULL,
!     FINGERPRINT_5 BIGINT NOT NULL,
!     FINGERPRINT_6 BIGINT NOT NULL,
!     FINGERPRINT_7 BIGINT NOT NULL,
!     FINGERPRINT_8 BIGINT NOT NULL,
!     FINGERPRINT_9 BIGINT NOT NULL,
!     FINGERPRINT_10 BIGINT NOT NULL,
!     FINGERPRINT_11 BIGINT NOT NULL,
!     FINGERPRINT_12 BIGINT NOT NULL,
!     FINGERPRINT_13 BIGINT NOT NULL,
!     FINGERPRINT_14 BIGINT NOT NULL,
!     FINGERPRINT_15 BIGINT NOT NULL,
!     FINGERPRINT_16 BIGINT NOT NULL,
      SMILES_STRING MEDIUMBLOB NOT NULL,
      ELEMENT_COUNT INTEGER NOT NULL,
--- 149,153 ----
      NMRSHIFTDB_NUMBER MEDIUMTEXT NOT NULL,
      MOLECULAR_WEIGHT FLOAT NOT NULL,
!     FINGERPRINT MEDIUMTEXT NOT NULL,
      SMILES_STRING MEDIUMBLOB NOT NULL,
      ELEMENT_COUNT INTEGER NOT NULL,
***************
*** 171,179 ****
      USER_ID INTEGER NOT NULL,
      PRIMARY KEY(MOLECULE_ID),
!     FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID),
      INDEX MOLECULAR_FORMULA_INDEX (MOLECULAR_FORMULA(4)),
      INDEX SMILES_STRING_INDEX (SMILES_STRING(10))
! 
! );
  
  # -----------------------------------------------------------------------
--- 156,164 ----
      USER_ID INTEGER NOT NULL,
      PRIMARY KEY(MOLECULE_ID),
!     FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID),
      INDEX MOLECULAR_FORMULA_INDEX (MOLECULAR_FORMULA(4)),
      INDEX SMILES_STRING_INDEX (SMILES_STRING(10))
!    
! );
  
  # -----------------------------------------------------------------------
***************
*** 187,196 ****
      SYMBOL VARCHAR (2) NOT NULL,
      SERIALIZED_ATOM MEDIUMTEXT NOT NULL,
!     MOLECULE_ID INTEGER NOT NULL,
      PRIMARY KEY(ATOM_ID,MOLECULE_ID),
      INDEX(MOLECULE_ID),
!     FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID),
!     INDEX SYMBOL_INDEX (SYMBOL(2))
!    
  );
  
--- 172,179 ----
      SYMBOL VARCHAR (2) NOT NULL,
      SERIALIZED_ATOM MEDIUMTEXT NOT NULL,
!     MOLECULE_ID INTEGER NOT NULL,
      PRIMARY KEY(ATOM_ID,MOLECULE_ID),
      INDEX(MOLECULE_ID),
!     FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
  );
  
***************
*** 206,212 ****
      PRIMARY KEY(SIGNAL_ID,ATOM_ID),
      INDEX(ATOM_ID),
!     FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
--- 189,195 ----
      PRIMARY KEY(SIGNAL_ID,ATOM_ID),
      INDEX(ATOM_ID),
!     FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
***************
*** 215,219 ****
  drop table if exists BOND;
  
! CREATE TABLE BOND
  (
      BOND_ID INTEGER NOT NULL AUTO_INCREMENT,
--- 198,202 ----
  drop table if exists BOND;
  
! CREATE TABLE BOND
  (
      BOND_ID INTEGER NOT NULL AUTO_INCREMENT,
***************
*** 223,227 ****
      PRIMARY KEY(BOND_ID),
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
! );
  
  # -----------------------------------------------------------------------
--- 206,210 ----
      PRIMARY KEY(BOND_ID),
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
! );
  
  # -----------------------------------------------------------------------
***************
*** 238,242 ****
      FOREIGN KEY (BOND_ID) REFERENCES BOND (BOND_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
--- 221,225 ----
      FOREIGN KEY (BOND_ID) REFERENCES BOND (BOND_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
***************
*** 247,251 ****
  CREATE TABLE CHEMICAL_NAME
  (
!     MOLECULE_ID INTEGER NOT NULL,
      NAME VARCHAR (120) NOT NULL,
      PRIMARY KEY(MOLECULE_ID,NAME),
--- 230,234 ----
  CREATE TABLE CHEMICAL_NAME
  (
!     MOLECULE_ID INTEGER NOT NULL,
      NAME VARCHAR (120) NOT NULL,
      PRIMARY KEY(MOLECULE_ID,NAME),
***************
*** 258,262 ****
  # -----------------------------------------------------------------------
  drop table if exists USER_SPECTRUM;
! 
  CREATE TABLE USER_SPECTRUM
  (
--- 241,245 ----
  # -----------------------------------------------------------------------
  drop table if exists USER_SPECTRUM;
! 
  CREATE TABLE USER_SPECTRUM
  (
***************
*** 278,282 ****
  CREATE TABLE ATOM_COUNT
  (
!     MOLECULE_ID INTEGER NOT NULL,
      SYMBOL VARCHAR (2) NOT NULL,
      COUNT INTEGER NOT NULL,
--- 261,265 ----
  CREATE TABLE ATOM_COUNT
  (
!     MOLECULE_ID INTEGER NOT NULL,
      SYMBOL VARCHAR (2) NOT NULL,
      COUNT INTEGER NOT NULL,
***************
*** 285,288 ****
--- 268,301 ----
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
  );
+ 
+ # -----------------------------------------------------------------------
+ # MOLECULE_HYPERLINK
+ # -----------------------------------------------------------------------
+ drop table if exists MOLECULE_HYPERLINK;
+ 
+ CREATE TABLE MOLECULE_HYPERLINK
+ (
+     MOLECULE_ID INTEGER NOT NULL,
+     HYPERLINK VARCHAR (255) NOT NULL,
+     DESCRIPTION MEDIUMTEXT NOT NULL,
+     PRIMARY KEY(MOLECULE_ID,HYPERLINK),
+     INDEX(HYPERLINK),
+     FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
+ );
+ 
+ # -----------------------------------------------------------------------
+ # SPECTRUM_HYPERLINK
+ # -----------------------------------------------------------------------
+ drop table if exists SPECTRUM_HYPERLINK;
+ 
+ CREATE TABLE SPECTRUM_HYPERLINK
+ (
+     SPECTRUM_ID INTEGER NOT NULL,
+     HYPERLINK VARCHAR (255) NOT NULL,
+     DESCRIPTION MEDIUMTEXT NOT NULL,
+     PRIMARY KEY(SPECTRUM_ID,HYPERLINK),
+     INDEX(HYPERLINK),
+     FOREIGN KEY (SPECTRUM_ID) REFERENCES SPECTRUM (SPECTRUM_ID)
+ );
    
    
***************
*** 292,295 ****
--- 305,310 ----
    
    
+   
+