[Gmod-schema-cmts] schema/chado/modules/expression rad.views,1.28,1.29

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

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

Modified Files:
	rad.views 
Log Message:
inherited field needs to be explicitly constrained as primary key

Index: rad.views
===================================================================
RCS file: /cvsroot/gmod/schema/chado/modules/expression/rad.views,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** rad.views	6 Jul 2005 06:17:21 -0000	1.28
--- rad.views	22 Oct 2005 23:29:00 -0000	1.29
***************
*** 57,60 ****
--- 57,61 ----
    pixels int NOT NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixcel ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixcel ADD CONSTRAINT affymetrixcel_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobe (element_id);
  ALTER TABLE affymetrixcel ADD CONSTRAINT affymetrixcel_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 66,71 ****
  
  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);
--- 67,75 ----
  
  CREATE TABLE affymetrixsnp (
!   call smallint NULL,
!   call_p float NULL,
!   _signal _float4 NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixsnp ADD PRIMARY KEY (elementresult_id);
  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);
***************
*** 74,77 ****
--- 78,144 ----
  CREATE INDEX affymetrixsnp_idx4 ON affymetrixsnp (element_id);
  CREATE INDEX affymetrixsnp_idx5 ON affymetrixsnp (quantification_id);
+ CREATE INDEX affymetrixsnp_idx6 ON affymetrixsnp (call_p);
+ 
+ CREATE TABLE affymetrixpsi (
+   q1pas INT NULL,
+   q1pbs INT NULL,
+   q1mas INT NULL,
+   q1mbs INT NULL,
+   q1paa INT NULL,
+   q1pba INT NULL,
+   q1maa INT NULL,
+   q1mba INT NULL,
+ 
+   q2pas INT NULL,
+   q2pbs INT NULL,
+   q2mas INT NULL,
+   q2mbs INT NULL,
+   q2paa INT NULL,
+   q2pba INT NULL,
+   q2maa INT NULL,
+   q2mba INT NULL,
+ 
+   q3pas INT NULL,
+   q3pbs INT NULL,
+   q3mas INT NULL,
+   q3mbs INT NULL,
+   q3paa INT NULL,
+   q3pba INT NULL,
+   q3maa INT NULL,
+   q3mba INT NULL,
+ 
+   q4pas INT NULL,
+   q4pbs INT NULL,
+   q4mas INT NULL,
+   q4mbs INT NULL,
+   q4paa INT NULL,
+   q4pba INT NULL,
+   q4maa INT NULL,
+   q4mba INT NULL,
+ 
+   q5pas INT NULL,
+   q5pbs INT NULL,
+   q5mas INT NULL,
+   q5mbs INT NULL,
+   q5paa INT NULL,
+   q5pba INT NULL,
+   q5maa INT NULL,
+   q5mba INT NULL,
+ 
+   q6pas INT NULL,
+   q6pbs INT NULL,
+   q6mas INT NULL,
+   q6mbs INT NULL,
+   q6paa INT NULL,
+   q6pba INT NULL,
+   q6maa INT NULL,
+   q6mba INT NULL
+ ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixpsi ADD PRIMARY KEY (elementresult_id);
+ ALTER TABLE affymetrixpsi ADD CONSTRAINT affymetrixpsi_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
+ ALTER TABLE affymetrixpsi ADD CONSTRAINT affymetrixpsi_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
+ CREATE INDEX affymetrixpsi_idx4 ON affymetrixpsi (element_id);
+ CREATE INDEX affymetrixpsi_idx5 ON affymetrixpsi (quantification_id);
+ 
  
  CREATE TABLE affymetrixmas5 (
***************
*** 82,85 ****
--- 149,153 ----
    z float NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixmas5 ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixmas5 ADD CONSTRAINT affymetrixmas5_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixmas5 ADD CONSTRAINT affymetrixmas5_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 94,97 ****
--- 162,166 ----
    z float NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixdchip ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixdchip ADD CONSTRAINT affymetrixdchip_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixdchip ADD CONSTRAINT affymetrixdchip_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 104,107 ****
--- 173,177 ----
    z float NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixvsn ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixvsn ADD CONSTRAINT affymetrixvsn_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixvsn ADD CONSTRAINT affymetrixvsn_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 113,116 ****
--- 183,187 ----
  CREATE TABLE affymetrixsea (
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixsea ADD PRIMARY KEY (elementresult_id);
  --ALTER TABLE affymetrixsea ADD CONSTRAINT affymetrixsea_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixsea ADD CONSTRAINT affymetrixsea_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 121,124 ****
--- 192,196 ----
  CREATE TABLE affymetrixplier (
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixplier ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixplier ADD CONSTRAINT affymetrixplier_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixplier ADD CONSTRAINT affymetrixplier_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 130,133 ****
--- 202,206 ----
    call_p float NOT NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixdabg ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixdabg ADD CONSTRAINT affymetrixdabg_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixdabg ADD CONSTRAINT affymetrixdabg_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 139,142 ****
--- 212,216 ----
    z float NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixrma ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixrma ADD CONSTRAINT affymetrixrma_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixrma ADD CONSTRAINT affymetrixrma_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 149,152 ****
--- 223,227 ----
    z float NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixgcrma ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixgcrma ADD CONSTRAINT affymetrixgcrma_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixgcrma ADD CONSTRAINT affymetrixgcrma_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);
***************
*** 164,167 ****
--- 239,243 ----
    n int NOT NULL
  ) INHERITS ( elementresult );
+ ALTER TABLE affymetrixprobesetstat ADD PRIMARY KEY (elementresult_id);
  ALTER TABLE affymetrixprobesetstat ADD CONSTRAINT affymetrixprobesetstat_c1 FOREIGN KEY (element_id)        REFERENCES affymetrixprobeset (element_id);
  ALTER TABLE affymetrixprobesetstat ADD CONSTRAINT affymetrixprobesetstat_c2 FOREIGN KEY (quantification_id) REFERENCES quantification  (quantification_id);