From 92a3aff7b082b3320dac9899c1942d97fcc51d10 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 26 Jul 2007 08:30:52 +0000
Subject: [PATCH] tidy
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@6256 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
artemis_sqlmap/Feature.xml | 5 +++--
artemis_sqlmap/FeatureRelationship.xml | 7 +++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/artemis_sqlmap/Feature.xml b/artemis_sqlmap/Feature.xml
index 11171ccaa..ef2818420 100644
--- a/artemis_sqlmap/Feature.xml
+++ b/artemis_sqlmap/Feature.xml
@@ -32,14 +32,14 @@
<resultMap id="map-feature" class="Feature"
groupBy="featureId" extends="map-basicfeature">
<result property="organism.organismId" column="organism_id"/>
+ <result property="featureProps" resultMap="FeatureProp.map-featureprop" />
<result property="featureRelationshipsForSubjectId"
- resultMap="FeatureRelationship.feature_relationship" />
+ resultMap="FeatureRelationship.map-feature-relationship" />
<result property="featureLoc.strand" column="strand" nullValue="0"/>
<result property="featureLoc.fmin" column="fmin" nullValue="-1"/>
<result property="featureLoc.fmax" column="fmax" nullValue="0"/>
<result property="featureLoc.phase" column="phase"/>
<result property="cvTerm.cvTermId" column="type_id"/>
- <result property="featureProps" resultMap="FeatureProp.map-featureprop" />
</resultMap>
<!-- mapping for feature table and lazy loading of feature_dbxref, feature_relationship,
@@ -117,6 +117,7 @@
timelastmodified,
f.feature_id AS id,
f.organism_id,
+ fr.feature_relationship_id,
fr.object_id,
fr.type_id AS relation_type_id,
fr.rank,
diff --git a/artemis_sqlmap/FeatureRelationship.xml b/artemis_sqlmap/FeatureRelationship.xml
index 1ca634693..b9043ab31 100644
--- a/artemis_sqlmap/FeatureRelationship.xml
+++ b/artemis_sqlmap/FeatureRelationship.xml
@@ -11,16 +11,15 @@
<typeAlias alias="FeatureRelationship"
type="org.gmod.schema.sequence.FeatureRelationship"/>
- <resultMap id="feature_relationship"
- class="FeatureRelationship">
+ <resultMap id="map-feature-relationship" class="FeatureRelationship">
+ <result property="featureRelationshipId" column="feature_relationship_id"/>
<result property="featureByObjectId.featureId" column="object_id"/>
<result property="cvTerm.cvTermId" column="relation_type_id"/>
<result property="rank" column="rank"/>
<result property="value" column="relation_value" />
</resultMap>
- <resultMap id="select-relationship"
- class="FeatureRelationship">
+ <resultMap id="select-relationship" class="FeatureRelationship">
<result property="featureBySubjectId.featureId" column="subject_id" />
<result property="featureByObjectId.featureId" column="object_id" />
<result property="value" column="value" />
--
GitLab