[Gmod-schema-cmts] schema/chado/modules/expression rad.sql,1.31,1.32 rad.views,1.26,1.27

[Allen D. <all...@us...>]

Update of /cvsroot/gmod/schema/chado/modules/expression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23936

Modified Files:
	rad.sql rad.views 
Log Message:
factor signal to base class

Index: rad.views
===================================================================
RCS file: /cvsroot/gmod/schema/chado/modules/expression/rad.views,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rad.views	14 Jun 2005 17:57:45 -0000	1.26
--- rad.views	14 Jun 2005 18:23:21 -0000	1.27
***************
*** 45,58 ****
  
  CREATE TABLE affymetrixsnp (
!   call smallint NOT NULL
  ) INHERITS ( elementresult );
  ALTER TABLE affymetrixsnp ADD CONSTRAINT affymetrixsnp_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixsnp ADD CONSTRAINT affymetrixsnp_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
  CREATE INDEX affymetrixsnp_idx1 ON affymetrixsnp (call);
  CREATE INDEX affymetrixsnp_idx4 ON affymetrixsnp (element_id);
  CREATE INDEX affymetrixsnp_idx5 ON affymetrixsnp (quantification_id);
  
  CREATE TABLE affymetrixmas5 (
-   signal float NOT NULL,
    call char(1) NOT NULL,
    call_p float NOT NULL,
--- 45,58 ----
  
  CREATE TABLE affymetrixsnp (
!   call smallint NULL
  ) INHERITS ( elementresult );
  ALTER TABLE affymetrixsnp ADD CONSTRAINT affymetrixsnp_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixsnp ADD CONSTRAINT affymetrixsnp_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
  CREATE INDEX affymetrixsnp_idx1 ON affymetrixsnp (call);
+ CREATE INDEX affymetrixsnp_idx2 ON affymetrixsnp (signal);
  CREATE INDEX affymetrixsnp_idx4 ON affymetrixsnp (element_id);
  CREATE INDEX affymetrixsnp_idx5 ON affymetrixsnp (quantification_id);
  
  CREATE TABLE affymetrixmas5 (
    call char(1) NOT NULL,
    call_p float NOT NULL,
***************
*** 71,75 ****
  
  CREATE TABLE affymetrixdchip (
-   signal float NOT NULL,
    z float NULL
  ) INHERITS ( elementresult );
--- 71,74 ----
***************
*** 82,86 ****
  
  CREATE TABLE affymetrixvsn (
-   signal float NOT NULL,
    z float NULL
  ) INHERITS ( elementresult );
--- 81,84 ----
***************
*** 93,97 ****
  
  CREATE TABLE affymetrixsea (
-   signal float NOT NULL
  ) INHERITS ( elementresult );
  ALTER TABLE affymetrixsea ADD CONSTRAINT affymetrixsea_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
--- 91,94 ----
***************
*** 102,106 ****
  
  CREATE TABLE affymetrixplier (
-   signal float NOT NULL
  ) INHERITS ( elementresult );
  ALTER TABLE affymetrixplier ADD CONSTRAINT affymetrixplier_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
--- 99,102 ----
***************
*** 120,124 ****
  
  CREATE TABLE affymetrixrma (
-   signal float NOT NULL,
    z float NULL
  ) INHERITS ( elementresult );
--- 116,119 ----
***************
*** 131,135 ****
  
  CREATE TABLE affymetrixgcrma (
-   signal float NOT NULL,
    z float NULL
  ) INHERITS ( elementresult );
--- 126,129 ----

Index: rad.sql
===================================================================
RCS file: /cvsroot/gmod/schema/chado/modules/expression/rad.sql,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** rad.sql	11 Jun 2005 00:44:51 -0000	1.31
--- rad.sql	14 Jun 2005 18:23:21 -0000	1.32
***************
*** 459,466 ****
--- 459,468 ----
      quantification_id int not null,
      foreign key (quantification_id) references quantification (quantification_id) on delete cascade INITIALLY DEFERRED,
+     signal float not null,
      constraint elementresult_c1 unique (element_id,quantification_id)
  );
  create index elementresult_idx1 on elementresult (element_id);
  create index elementresult_idx2 on elementresult (quantification_id);
+ create index elementresult_idx3 on elementresult (signal);
  
  COMMENT ON TABLE elementresult IS 'an element on an array produces a measurement when hybridized to a biomaterial (traceable through quantification_id).  this is the base data from which tables that actually contain data inherit';