From c61b0ccbf0648fdcf59a9ab9de53acd044d442e6 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 11:42:21 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    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
---
 .../metadata-query-common-SqlMap.xml               |  2 ++
 .../search/impl/querymodel/impl/db/DBQuery.java    | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
index a9d685211f..a4e8453a59 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
@@ -105,6 +105,7 @@
                 </foreach>
             </if>
         <if test="hasOrderBy">
+          <if test="hasPredicatePartsOrder">
             order by
             <foreach item="item" index="index" collection="predicateParts" open="" separator="," close="">
                  <choose>
@@ -114,6 +115,7 @@
                      </when>
                  </choose>
             </foreach>
+          </if>
         </if>    
     </sql>
 
diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
index 8cf5a6e3f2..e7cbabf062 100644
--- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
+++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
@@ -158,6 +158,20 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent
         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)
      * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#isSupported()