rearrange

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@4346 ee4ac58c-ac51-4696-9907-e4b3aa274f04

artemis_sqlmap/Alias.xml

@@ -6,10 +6,38 @@
  
 
 <sqlMap namespace="Alias"> 
-
-    <select id="getAlias" resultClass="uk.ac.sanger.artemis.chado.Alias"
-            parameterClass="uk.ac.sanger.artemis.chado.Alias">
-      SELECT s.name, f.feature_id, cvterm.name AS cvterm_name 
+  
+    <typeAlias alias="ChadoSynonym"
+        type="uk.ac.sanger.artemis.chado.ChadoSynonym"/>
+        
+    <resultMap id="select-alias" 
+               class="ChadoSynonym">
+        <result property="name" column="name"/>
+   	    <result property="feature_id" column="feature_id"/>
+   	    <result property="synonym_id" column="synonym_id"/>
+   	    <result property="pub_id" column="pub_id"/>
+   	    <result property="is_current" column="is_current"/>
+   	    <result property="is_internal" column="is_internal"/>
+   	    <result property="synonym_sgml" column="synonym_sgml"/>
+  	    <result property="cvterm.name" column="cvterm_name" />
+     </resultMap>
+     
+     <resultMap id="select-alias-lazy" 
+               class="ChadoSynonym">
+        <result property="name" column="name"/>
+   	    <result property="feature_id" column="feature_id"/>
+   	    <result property="synonym_id" column="synonym_id"/>
+   	    <result property="pub_id" column="pub_id"/>
+   	    <result property="is_current" column="is_current"/>
+   	    <result property="is_internal" column="is_internal"/>
+   	    <result property="synonym_sgml" column="synonym_sgml"/>
+  	    <result property="cvterm" column="type_id" select="getCvterm"/>
+     </resultMap>
+     
+     
+    <select id="getAlias" resultMap="select-alias"
+            parameterClass="ChadoSynonym">
+      SELECT fs.*, s.name, s.synonym_sgml, cvterm.name AS cvterm_name 
       FROM $schema$.feature_synonym fs 
       LEFT JOIN $schema$.feature f ON f.feature_id=fs.feature_id 
       LEFT JOIN $schema$.synonym s ON fs.synonym_id=s.synonym_id 
@@ -19,20 +47,31 @@
       </isNotNull>
     </select>
     
+    <select id="getLazyAlias" resultMap="select-alias-lazy"
+            parameterClass="ChadoSynonym">
+      SELECT fs.*, s.name, s.synonym_sgml, s.type_id 
+      FROM $schema$.feature_synonym fs 
+      LEFT JOIN $schema$.feature f ON f.feature_id=fs.feature_id 
+      LEFT JOIN $schema$.synonym s ON fs.synonym_id=s.synonym_id 
+      <isNotNull property="uniquename">                        
+          WHERE uniquename=#uniquename#
+      </isNotNull>
+    </select>
+    
     <select id="getSynonymId" resultClass="java.lang.Integer"
-            parameterClass="uk.ac.sanger.artemis.chado.Alias">
+            parameterClass="ChadoSynonym">
       SELECT synonym_id FROM $schema$.synonym WHERE synonym.name=#name#
     </select>
    
     <select id="getFeatureSynonymId" resultClass="java.lang.Integer"
-            parameterClass="uk.ac.sanger.artemis.chado.Alias">
+            parameterClass="ChadoSynonym">
       SELECT synonym_id FROM $schema$.feature_synonym WHERE
              synonym_id=(SELECT synonym_id FROM $schema$.synonym WHERE 
              synonym.name=#name#)
     </select>
    
   <!-- WRITE BACK -->
-    <delete id="deleteFeatureAlias" parameterClass="uk.ac.sanger.artemis.chado.Alias">
+    <delete id="deleteFeatureAlias" parameterClass="ChadoSynonym">
       DELETE FROM $schema$.feature_synonym WHERE
          synonym_id=$synonym_id$ AND 
          feature_id=(SELECT feature_id FROM $schema$.feature WHERE  
@@ -46,11 +85,11 @@
               1)
     </insert>
   
-    <delete id="deleteAlias" parameterClass="uk.ac.sanger.artemis.chado.Alias">
+    <delete id="deleteAlias" parameterClass="ChadoSynonym">
       DELETE FROM $schema$.synonym WHERE synonym_id=$synonym_id$
     </delete>
   
-    <insert id="insertAlias" parameterClass="uk.ac.sanger.artemis.chado.Alias">
+    <insert id="insertAlias" parameterClass="ChadoSynonym">
       INSERT INTO $schema$.synonym ( name, type_id, synonym_sgml ) 
       VALUES ( #name#, $type_id$, #name# )
     </insert>

artemis_sqlmap/Cvterm.xml

@@ -29,5 +29,12 @@
             </dynamic>
 	    cv.cv_id = cvterm.cv_id
      </select> 
- 
+     
+      <!-- look up cvterms names and id -->
+     <select id="selectCvterm" 
+             resultClass="uk.ac.sanger.artemis.chado.ChadoCvterm"> 
+       SELECT cvterm_id AS id, name 
+       FROM cvterm
+       WHERE cvterm_id=#value# 
+     </select> 
 </sqlMap> 

artemis_sqlmap/Feature.xml

@@ -12,11 +12,6 @@
         
      <typeAlias alias="ChadoTransaction"
         type="uk.ac.sanger.artemis.chado.ChadoTransaction"/>
-        
-     <resultMap id="select-cvterm-names-result" class="uk.ac.sanger.artemis.chado.ChadoCvterm">
-        <result property="id" column="cvterm_id"/>
-  	    <result property="name" column="name"/>
-     </resultMap>
      
     <parameterMap id="schema-cvlist" 
                   class="uk.ac.sanger.artemis.chado.SchemaCVList">
@@ -76,19 +71,13 @@
         <result property="cvterm.id" column="type_id"/>
      </resultMap>
 
-     <resultMap id="select-product-result" class="uk.ac.sanger.artemis.chado.ChadoFeatureProp">
+     <resultMap id="select-product-result" 
+                class="uk.ac.sanger.artemis.chado.ChadoFeatureProp">
         <result property="value" column="value" />
         <result property="rank" column="rank" />
         <result property="cvterm" column="type_id" select="selectCvterm" />
      </resultMap>
      
-     <!-- look up cvterms names and id -->
-     <select id="selectCvterm" resultMap="select-cvterm-names-result"> 
-       SELECT cvterm_id, name 
-       FROM cvterm
-       WHERE cvterm_id=#value# 
-     </select> 
-     
      <select id="selectOrganism" resultClass="uk.ac.sanger.artemis.chado.ChadoOrganism"> 
        SELECT organism_id AS id, abbreviation, genus, species, common_name, comment 
        FROM organism

artemis_sqlmap/chado_iBatis_config.xml

@@ -46,12 +46,11 @@
   </transactionManager> 
  
   <!-- Identify all SQL Map XML files to be loaded by this SQL map.  Notice the paths  
-         are relative to the classpath.  For now, we only have one... --> 
+         are relative to the classpath.  --> 
  
   <!-- 
     <sqlMap resource="artemis_sqlmap/Organism.xml" /> 
   -->
-  
   <sqlMap resource="artemis_sqlmap/Cvterm.xml" />
   <sqlMap resource="artemis_sqlmap/Feature.xml" />
   <sqlMap resource="artemis_sqlmap/Dbxref.xml" />