From 87ee1a965d0fcd871ca8851931b09d09cadcf9cf Mon Sep 17 00:00:00 2001
From: Arne Stabenau <stabenau@sanger.ac.uk>
Date: Fri, 15 Oct 2004 14:31:02 +0000
Subject: [PATCH] removed probeset column from affy_feature table

---
 .../Bio/EnsEMBL/DBSQL/AffyFeatureAdaptor.pm   |  13 ++++++-------
 modules/t/test_genome.zip                     | Bin 969526 -> 969512 bytes
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/Bio/EnsEMBL/DBSQL/AffyFeatureAdaptor.pm b/modules/Bio/EnsEMBL/DBSQL/AffyFeatureAdaptor.pm
index f5067d4565..1ca916844d 100644
--- a/modules/Bio/EnsEMBL/DBSQL/AffyFeatureAdaptor.pm
+++ b/modules/Bio/EnsEMBL/DBSQL/AffyFeatureAdaptor.pm
@@ -99,8 +99,8 @@ sub store{
   my $sth = $self->prepare
     ("INSERT INTO affy_feature (seq_region_id, seq_region_start, " .
      "                          seq_region_end, seq_region_strand, " .
-     "                          affy_probe_id, analysis_id, mismatches, probeset ) " .
-     "VALUES (?,?,?,?,?,?,?,?)" );
+     "                          affy_probe_id, analysis_id, mismatches ) " .
+     "VALUES (?,?,?,?,?,?,?)" );
 
   my $db = $self->db();
   my $analysis_adaptor = $db->get_AnalysisAdaptor();
@@ -132,8 +132,7 @@ sub store{
     ($af, $seq_region_id) = $self->_pre_store($af);
 
     $sth->execute($seq_region_id, $af->start, $af->end, $af->strand,
-                  $af->probe->dbID, $af->analysis->dbID, $af->mismatchcount,
-		  $af->probeset );
+                  $af->probe->dbID, $af->analysis->dbID, $af->mismatchcount );
 
     $original->dbID($sth->{'mysql_insertid'});
     $original->adaptor($self);
@@ -183,7 +182,7 @@ sub _columns {
   my $self = shift;
 
   return qw( af.affy_feature_id af.seq_region_id af.seq_region_start
-             af.seq_region_end af.seq_region_strand af.probeset 
+             af.seq_region_end af.seq_region_strand 
              af.mismatches af.affy_probe_id af.analysis_id
              aa.name )
 
@@ -222,11 +221,11 @@ sub _objs_from_sth {
 
 
   my($affy_feature_id,$seq_region_id, $seq_region_start, $seq_region_end,
-     $seq_region_strand, $probeset, $mismatches, $analysis_id,
+     $seq_region_strand, $mismatches, $analysis_id,
      $affy_probe_id, $array_name);
 
   $sth->bind_columns(\$affy_feature_id,\$seq_region_id, \$seq_region_start,
-                     \$seq_region_end, \$seq_region_strand, \$probeset, 
+                     \$seq_region_end, \$seq_region_strand, 
 		     \$mismatches, \$affy_probe_id, \$analysis_id,
                      \$array_name );
  
diff --git a/modules/t/test_genome.zip b/modules/t/test_genome.zip
index 79aa4402f60197280e53af2b99c2d43eb59ccdba..45a0b8411f9e1e8c95ffc3f307445b2cd338bd0e 100644
GIT binary patch
delta 732
zcmdls&3eT&Yn}jaW)?065Kyn4$fG84@@~E(2!Cb#%7`N8WsF14s(Rv73$|xKJs<8i
zUT(e2*m{|%^)hqoWtP^<tgV;XS}(J=Ugl`M%-MRGtMxK>>t&wS%e-4J^X={Dv#Rzt
zbm{nz>&nQ$@SSOT;3PiN`r^Wz&<Gxe4`A~k?wC6<Fu%z_;Q0LG%XgS73Nm-=7vE&Q
z?UBZIPP6(0r?$*3mago6*L{CaDf!LRJ3Y(nW$gd`ufN9MZrd<#Kih<`qhfh%>#}cb
zoA)6^OUf}$P3Qg#-4`EEbgZ3mNYFsjz-?iYlWXs-f7dfkSf1jqpR!>3qoq5f_~snk
znyj6qlxk%9?XFACRAr4xp-xj>PIz&CnHs%GXZ2&A$jR|$MUNAoRZrxfST6sgpoV7|
zqk89z<p)@2uFF37M78N;v;f2E6+JsWRKzq^tQTy3zwyY{ckdZ2#6p}tZawg2wvS<Q
zsNaR+Dp{ZX?w8K5)??N<SMn_`x^^Wm^P@$1D;}n<c(5vAN=|_6>gYh{FVT~?ZHk$@
zeMRtO&S}@XR`1VPzPa$lS+Ngq^cl{aOONPXWNBGg!~V?k&U>lq1GoChf1k?DkrZ?3
zURf`G?eR|Wds6d3(K%gUDxcW);7NQ+Oib$4)61vunTWxnJiwcgNt79u7^WYb!slp=
zO%4=m;1mNTlo)uRECGkNj-AsdPUTY-3XR}kfTW3hN07nd%oFcQY;T#$_s1AL+WSuO
zd9gv_d-}bTd^$|plcpQ);ZvDzaEi~3sT<1qaDtC@dcYJuw&}}H@mVtcoeWU}6Xu>S
OcA8I$EqV$c&@BKRZ!C)d

delta 699
zcmZ26&3fB3Yn}jaW)?065Lj0*kw;BJ{B*t}2!Cb#%7`N8Wz2&tH~sHqKB<X|wFE$d
zp-390$4%vvX#Cpxm9h0JQ|nje)~_tBUs+qfvbBC?Z~e;A`jxZwD_84R?$)n7tzUV!
ze&w6p&v(AS-_WW{g)NwofkB3O`n(BzHuWGgVdl=A=$PMRAkuLDarmCu6FL|lr|Ma6
z=uJs`F=tb=dd(r{*$#!dhM(TM_gcBePBYEDw68Ay_phwm25XkdGpeNSYx~{zT54Nt
zd4=whSI%KaW~_asdF3sus9r#jd_X~0$7zp=A+xsqzq-Xzb)zEV*9mJLl<)1Uzx>i_
zTgVAvk<N|h)sDEjDNNN!4&`dvBCw!rqvf(p(WNa`cGq`&wE4LALi>ekt{RKGY?m80
zI~);8h?%)A```=PmW$~E4AWM1Nc6KlJrcS*Or_SfX<BKW`@xM1o=noURJBiY(wsK4
zY1-wijIY%#yY{@==J3ZWZU0>TS51vcdoCr0z27#)c;@1+a25ZT%u9HE*Sc<0@Z>Vn
zcqGcT`E`ubZm)MIR+r|)^vG=XGWscAW+Tb7_ax7~KaveMe;9fTS3Q3dy)9wh+S_Me
z$!~Q&cKh$i_N}QA0_TqXd%Qu)XYa%2kG$X*-0nJwPl<_XUBUFsDSRekuow>TW@Hj&
zhNX+?o2T$OvO(mgUpUDpH(g>X9}n|?$Ij^&rtm3DUoeB4l`AxYg8`BjwuepSlQBV$
z)P|FMUemvv;8U6Y?j#={ljWr85BCB&*^~H$rgNO;<C*Soicf=SCRDiZ6rT$d_Y{a4
SAcuQ8^JzYLHlQPcDHQ-v*(|64

-- 
GitLab