[Nmrshiftdb-devel] CVS: nmrshiftdb/src/sql nmrshiftdb-schema.sql, 1.81, 1.82 populate-mysql.sql, 1.61, 1.62

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

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/sql
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3468/src/sql

Modified Files:
	nmrshiftdb-schema.sql populate-mysql.sql 
Log Message:
this has the changes from the discussion with the lab system users


Index: nmrshiftdb-schema.sql
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/sql/nmrshiftdb-schema.sql,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** nmrshiftdb-schema.sql	23 Oct 2006 11:58:09 -0000	1.81
--- nmrshiftdb-schema.sql	30 Oct 2006 15:45:32 -0000	1.82
***************
*** 834,837 ****
--- 834,838 ----
      SAMPLE_ID INTEGER NOT NULL,
      USERS_ID VARCHAR (20) NOT NULL,
+     USERS_ID_COMMENT VARCHAR (40) NOT NULL,
      USER_ID INTEGER NOT NULL,
      SOLVENT INTEGER NOT NULL,
***************
*** 844,847 ****
--- 845,850 ----
      FINISHED VARCHAR (8) NOT NULL,
      PROCESS VARCHAR (8) NOT NULL,
+     ATTACHMENT LONGBLOB NOT NULL,
+     ATTACHMENT_NAME VARCHAR (20) NOT NULL,
      PRIMARY KEY(SAMPLE_ID),
      FOREIGN KEY (USER_ID) REFERENCES TURBINE_USER (USER_ID),

Index: populate-mysql.sql
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/sql/populate-mysql.sql,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** populate-mysql.sql	24 Oct 2006 10:48:44 -0000	1.61
--- populate-mysql.sql	30 Oct 2006 15:45:33 -0000	1.62
***************
*** 139,143 ****
  alter table BOND change IS_AROMATIC IS_AROMATIC enum("false","true") not null;
  alter table LITERATURE change ET_AL ET_AL enum("false","true") not null;
! alter table SAMPLE change FINISHED FINISHED enum("false","true") not null;
  alter table GUESTBOOK change VALID VALID enum("false","true") not null default "false";
  alter table CONDITION_TYPE change CML_ENTRY_TYPE CML_ENTRY_TYPE enum("","metadata","substance","condition") not null default "";
--- 139,143 ----
  alter table BOND change IS_AROMATIC IS_AROMATIC enum("false","true") not null;
  alter table LITERATURE change ET_AL ET_AL enum("false","true") not null;
! alter table SAMPLE change FINISHED FINISHED enum("false","true","pending") not null;
  alter table GUESTBOOK change VALID VALID enum("false","true") not null default "false";
  alter table CONDITION_TYPE change CML_ENTRY_TYPE CML_ENTRY_TYPE enum("","metadata","substance","condition") not null default "";