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

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

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

Modified Files:
	nmrshiftdb-schema.sql 
Log Message:
modified sql script


Index: nmrshiftdb-schema.sql
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/db/nmrshiftdb-schema.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** nmrshiftdb-schema.sql	28 Feb 2002 15:38:12 -0000	1.2
--- nmrshiftdb-schema.sql	6 Mar 2002 12:37:35 -0000	1.3
***************
*** 7,12 ****
  CREATE TABLE MEASUREMENT_CONDITION
  (
!     MEASUREMENT_CONDITION_ID INTEGER NOT NULL,
!     TEMPERATURE FLOAT NOT NULL,
      FIELD_STRENGTH INTEGER NOT NULL,
      SOLVENT MEDIUMTEXT NOT NULL,
--- 7,12 ----
  CREATE TABLE MEASUREMENT_CONDITION
  (
!     MEASUREMENT_CONDITION_ID INTEGER NOT NULL AUTO_INCREMENT,
!     TEMPERATURE FLOAT NOT NULL,
      FIELD_STRENGTH INTEGER NOT NULL,
      SOLVENT MEDIUMTEXT NOT NULL,
***************
*** 17,21 ****
  
  # -----------------------------------------------------------------------
! # SPECTRUM_TYPE
  # -----------------------------------------------------------------------
  drop table if exists SPECTRUM_TYPE;
--- 17,21 ----
  
  # -----------------------------------------------------------------------
! # SPECTRUM_TYPE
  # -----------------------------------------------------------------------
  drop table if exists SPECTRUM_TYPE;
***************
*** 23,27 ****
  CREATE TABLE SPECTRUM_TYPE
  (
!     SPECTRUM_TYPE_ID INTEGER NOT NULL,
      DIMENSIONALITY INTEGER NOT NULL,
      NAME MEDIUMTEXT NOT NULL,
--- 23,27 ----
  CREATE TABLE SPECTRUM_TYPE
  (
!     SPECTRUM_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT,
      DIMENSIONALITY INTEGER NOT NULL,
      NAME MEDIUMTEXT NOT NULL,
***************
*** 35,39 ****
      FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID)
  );
! 
  # -----------------------------------------------------------------------
  # SPECTRUM
--- 35,39 ----
      FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID)
  );
! 
  # -----------------------------------------------------------------------
  # SPECTRUM
***************
*** 42,49 ****
  
  CREATE TABLE SPECTRUM
! (
!     SPECTRUM_ID INTEGER NOT NULL,
      DATE DATETIME NOT NULL,
!     SPECFILE LONGBLOB NOT NULL,
      SERIALIZED_SPECTRUM MEDIUMTEXT NOT NULL,
      LITERATURE MEDIUMTEXT NOT NULL,
--- 42,49 ----
  
  CREATE TABLE SPECTRUM
! (
!     SPECTRUM_ID INTEGER NOT NULL AUTO_INCREMENT,
      DATE DATETIME NOT NULL,
!     SPECFILE LONGBLOB NOT NULL,
      SERIALIZED_SPECTRUM MEDIUMTEXT NOT NULL,
      LITERATURE MEDIUMTEXT NOT NULL,
***************
*** 64,77 ****
  # SIGNAL
  # -----------------------------------------------------------------------
! drop table if exists SIGNAL;
  
! CREATE TABLE SIGNAL
  (
!     SIGNAL_ID INTEGER NOT NULL,
      DIMENSIONALITY INTEGER NOT NULL,
      SHIFT_1 FLOAT NOT NULL,
      SHIFT_2 FLOAT NOT NULL,
      SHIFT_3 FLOAT NOT NULL,
!     SHIFT_4 FLOAT NOT NULL,
      SHIFT_5 FLOAT NOT NULL,
      SERIALIZED_SIGNAL MEDIUMTEXT NOT NULL,
--- 64,77 ----
  # SIGNAL
  # -----------------------------------------------------------------------
! drop table if exists SIGNAL;
  
! CREATE TABLE SIGNAL
  (
!     SIGNAL_ID INTEGER NOT NULL AUTO_INCREMENT,
      DIMENSIONALITY INTEGER NOT NULL,
      SHIFT_1 FLOAT NOT NULL,
      SHIFT_2 FLOAT NOT NULL,
      SHIFT_3 FLOAT NOT NULL,
!     SHIFT_4 FLOAT NOT NULL,
      SHIFT_5 FLOAT NOT NULL,
      SERIALIZED_SIGNAL MEDIUMTEXT NOT NULL,
***************
*** 89,93 ****
  CREATE TABLE MOLECULE
  (
!     MOLECULE_ID INTEGER NOT NULL,
      DATE DATETIME NOT NULL,
      STRUCTURE_FILE LONGBLOB NOT NULL,
--- 89,93 ----
  CREATE TABLE MOLECULE
  (
!     MOLECULE_ID INTEGER NOT NULL AUTO_INCREMENT,
      DATE DATETIME NOT NULL,
      STRUCTURE_FILE LONGBLOB NOT NULL,
***************
*** 104,120 ****
  
  # -----------------------------------------------------------------------
- # MOLECULE_NMRSHIFTDB_USER
- # -----------------------------------------------------------------------
- drop table if exists MOLECULE_NMRSHIFTDB_USER;
- 
- CREATE TABLE MOLECULE_NMRSHIFTDB_USER
- (
-     MOLECULE_ID INTEGER NOT NULL,
-     USER_ID INTEGER NOT NULL,
-     FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID),
-     FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID)
- );
- 
- # -----------------------------------------------------------------------
  # ATOM
  # -----------------------------------------------------------------------
--- 104,107 ----
***************
*** 123,127 ****
  CREATE TABLE ATOM
  (
!     ATOM_ID INTEGER NOT NULL,
      SYMBOL MEDIUMTEXT NOT NULL,
      SERIALIZED_ATOM MEDIUMTEXT NOT NULL,
--- 110,114 ----
  CREATE TABLE ATOM
  (
!     ATOM_ID INTEGER NOT NULL AUTO_INCREMENT,
      SYMBOL MEDIUMTEXT NOT NULL,
      SERIALIZED_ATOM MEDIUMTEXT NOT NULL,
***************
*** 142,146 ****
      FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
--- 129,133 ----
      FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
***************
*** 151,158 ****
  CREATE TABLE BOND
  (
!     BOND_ID INTEGER NOT NULL,
      DEGREE INTEGER NOT NULL,
      SERIALIZED_BOND MEDIUMTEXT NOT NULL,
!     MOLECULE_ID INTEGER NOT NULL,
      PRIMARY KEY(BOND_ID),
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
--- 138,145 ----
  CREATE TABLE BOND
  (
!     BOND_ID INTEGER NOT NULL AUTO_INCREMENT,
      DEGREE INTEGER NOT NULL,
      SERIALIZED_BOND MEDIUMTEXT NOT NULL,
!     MOLECULE_ID INTEGER NOT NULL,
      PRIMARY KEY(BOND_ID),
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
***************
*** 168,172 ****
      BOND_ID INTEGER NOT NULL,
      ATOM_ID INTEGER NOT NULL,
!     FOREIGN KEY (BOND_ID) REFERENCES BOND (BOND_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
  );
--- 155,159 ----
      BOND_ID INTEGER NOT NULL,
      ATOM_ID INTEGER NOT NULL,
!     FOREIGN KEY (BOND_ID) REFERENCES BOND (BOND_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
  );
***************
*** 179,183 ****
  CREATE TABLE CHEMICAL_NAME
  (
!     CHEMICAL_NAME_ID INTEGER NOT NULL,
      NAME MEDIUMTEXT NOT NULL,
      MOLECULE_ID INTEGER NOT NULL,
--- 166,170 ----
  CREATE TABLE CHEMICAL_NAME
  (
!     CHEMICAL_NAME_ID INTEGER NOT NULL AUTO_INCREMENT,
      NAME MEDIUMTEXT NOT NULL,
      MOLECULE_ID INTEGER NOT NULL,
***************
*** 193,197 ****
  CREATE TABLE CANONICAL_NAME
  (
!     CANONICAL_NAME_ID INTEGER NOT NULL,
      NAME MEDIUMTEXT NOT NULL,
      TYPE MEDIUMTEXT NOT NULL,
--- 180,184 ----
  CREATE TABLE CANONICAL_NAME
  (
!     CANONICAL_NAME_ID INTEGER NOT NULL AUTO_INCREMENT,
      NAME MEDIUMTEXT NOT NULL,
      TYPE MEDIUMTEXT NOT NULL,
***************
*** 211,213 ****
    
    
- 
--- 198,199 ----