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

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

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

Modified Files:
	nmrshiftdb-schema.sql 
Log Message:
modified om files


Index: nmrshiftdb-schema.sql
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/db/nmrshiftdb-schema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** nmrshiftdb-schema.sql	6 Mar 2002 12:37:35 -0000	1.3
--- nmrshiftdb-schema.sql	6 Mar 2002 16:41:15 -0000	1.4
***************
*** 8,12 ****
  (
      MEASUREMENT_CONDITION_ID INTEGER NOT NULL AUTO_INCREMENT,
!     TEMPERATURE FLOAT NOT NULL,
      FIELD_STRENGTH INTEGER NOT NULL,
      SOLVENT MEDIUMTEXT NOT NULL,
--- 8,12 ----
  (
      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;
***************
*** 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 AUTO_INCREMENT,
      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,
***************
*** 55,59 ****
      MOLECULE_ID INTEGER NOT NULL,
      PRIMARY KEY(SPECTRUM_ID),
!     FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID),
      FOREIGN KEY (MEASUREMENT_CONDITION_ID) REFERENCES MEASUREMENT_CONDITION (MEASUREMENT_CONDITION_ID),
      FOREIGN KEY (SPECTRUM_TYPE_ID) REFERENCES SPECTRUM_TYPE (SPECTRUM_TYPE_ID),
--- 55,59 ----
      MOLECULE_ID INTEGER NOT NULL,
      PRIMARY KEY(SPECTRUM_ID),
!     FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID),
      FOREIGN KEY (MEASUREMENT_CONDITION_ID) REFERENCES MEASUREMENT_CONDITION (MEASUREMENT_CONDITION_ID),
      FOREIGN KEY (SPECTRUM_TYPE_ID) REFERENCES SPECTRUM_TYPE (SPECTRUM_TYPE_ID),
***************
*** 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,
--- 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,
***************
*** 101,105 ****
      PRIMARY KEY(MOLECULE_ID),
      FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID)
! );
  
  # -----------------------------------------------------------------------
--- 101,105 ----
      PRIMARY KEY(MOLECULE_ID),
      FOREIGN KEY (USER_ID) REFERENCES NMRSHIFTDB_USER (USER_ID)
! );
  
  # -----------------------------------------------------------------------
***************
*** 126,133 ****
  (
      SIGNAL_ID INTEGER NOT NULL,
!     ATOM_ID INTEGER NOT NULL,
      FOREIGN KEY (SIGNAL_ID) REFERENCES SIGNAL (SIGNAL_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
! );
  
  # -----------------------------------------------------------------------
--- 126,135 ----
  (
      SIGNAL_ID INTEGER NOT NULL,
!     ATOM_ID INTEGER NOT NULL,
!     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)
! );
  
  # -----------------------------------------------------------------------
***************
*** 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)
  );
--- 157,163 ----
      BOND_ID INTEGER NOT NULL,
      ATOM_ID INTEGER NOT NULL,
!     PRIMARY KEY(BOND_ID,ATOM_ID),
!     INDEX(ATOM_ID),
!     FOREIGN KEY (BOND_ID) REFERENCES BOND (BOND_ID),
      FOREIGN KEY (ATOM_ID) REFERENCES ATOM (ATOM_ID)
  );
***************
*** 171,175 ****
      PRIMARY KEY(CHEMICAL_NAME_ID),
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
! );
  
  # -----------------------------------------------------------------------
--- 175,179 ----
      PRIMARY KEY(CHEMICAL_NAME_ID),
      FOREIGN KEY (MOLECULE_ID) REFERENCES MOLECULE (MOLECULE_ID)
! );
  
  # -----------------------------------------------------------------------