inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
91933: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91860: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         91754: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91668: MNT-12809 : ORDER BY on custom metadata property without node with custom type
             Was corrected sql select query.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:42:21 +00:00
parent ff24f64c17
commit c61b0ccbf0
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
View File

@@ -105,6 +105,7 @@
</foreach> </foreach>
</if> </if>
<if test="hasOrderBy"> <if test="hasOrderBy">
<if test="hasPredicatePartsOrder">
order by order by
<foreach item="item" index="index" collection="predicateParts" open="" separator="," close=""> <foreach item="item" index="index" collection="predicateParts" open="" separator="," close="">
<choose> <choose>
@@ -115,6 +116,7 @@
</choose> </choose>
</foreach> </foreach>
</if> </if>
</if>
</sql> </sql>
</mapper> </mapper>

14
source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
View File

@@ -158,6 +158,20 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent
return predicatePartCommands; return predicatePartCommands;
} }
public boolean getHasPredicatePartsOrder()
{
boolean hasPredicatePartsOrder = false;
List<DBQueryBuilderPredicatePartCommand> predicateParts = getPredicateParts();
if (predicateParts != null)
{
for(DBQueryBuilderPredicatePartCommand item : predicateParts)
{
hasPredicatePartsOrder = hasPredicatePartsOrder || "ORDER".equals(item.getType());
}
}
return hasPredicatePartsOrder;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#isSupported() * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#isSupported()