Merged DEV/BELARUS/HEAD to HEAD

16340: Oracle and iBatis mappings
   16346: Minor formatting
   Removed some dangling svn:mergeinfos
   TODO: iBatis boolean parameterization in AVM select queries
   TODO: Ensure ALL FK CONSTRAINTS ARE PRESENT as expected


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

config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml

@@ -34,4 +34,26 @@
         </selectKey>
     </insert>
     
+    <select id="select_AVMNodes_orphans" resultMap="result_AVMNode">
+        select
+            an.*
+        from
+            avm_child_entries ce
+            right outer join avm_nodes an on (an.id = ce.child_id)
+        where 
+            ce.parent_id is null and 
+            an.is_root = false
+    </select>
+    
+    <select id="select_AVMNodes_layeredDirectories" resultMap="result_AVMNode">
+        select
+            *
+        from 
+            avm_nodes
+        where
+            class_type = 'layereddirectory' and
+            primary_indirection = true
+            
+    </select>
+    
 </sqlMap>