Merged V2.1 to HEAD

6975: Fix for WCM-883 - ZIP files with non-ascii characters, now gives the user an option for the encoding of the ZIP filenames
   6978: Fixed test for 2.1 bean names.
   6981: Fixes test failure.
   6982: Integrity exception message carries full failure details.
   6983: Added upgrade script for SQL Server.
   6988: Replaced UserTransaction with RetryingTransactionHelper.
   6989: Added org.hibernate.ObjectNotFoundException RetryingTransactionHelper.
   6996: Added updated support for datetime tokens in the lucene index
   7001: FIx for AR-1806
   7015: Added missing post-create index script for QName columns on alf_child_assoc.
   7022: Merged V2.0 to V2.1:
      7013: Fixed primary child node status query


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml

@@ -254,20 +254,13 @@
       select
          status
       from
-         org.alfresco.repo.domain.hibernate.NodeStatusImpl as status
-         join status.node as node
+         org.alfresco.repo.domain.hibernate.NodeStatusImpl as status,
+         org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
+         join assoc.child as child
       where
-         node.id in
-         (
-            select
-               child.id
-            from
-               org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-               join assoc.child as child
-            where
-               assoc.parent.id = :parentId and
-               assoc.isPrimary = true
-         )
+         assoc.parent.id = :parentId and
+         assoc.isPrimary = true and
+         status.node.id = child.id
    </query>
    
    <query name="node.GetChildAssocsByAll">