From 2f698d866959d16c5717616324a1b612296cf651 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 17 Sep 2009 14:18:10 +0000
Subject: [PATCH] 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
---
 .../avm-common-SqlMap.xml                     | 27 ++-----------------
 .../avm-insert-SqlMap.xml                     | 22 +++++++++++++++
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
index 7cef78dd61..35f7fa9e15 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
@@ -419,18 +419,7 @@
             (class_type = 'layereddirectory' or class_type = 'layeredfile') and
             store_new_id = ?
     </select>
-    
-    <select id="select_AVMNodes_layeredDirectories" resultMap="result_AVMNode">
-        select
-            *
-        from 
-            avm_nodes
-        where
-            class_type = 'layereddirectory' and
-            primary_indirection = true
-            
-    </select>
-    
+
     <select id="select_AVMNodes_layeredFiles" resultMap="result_AVMNode">
         select
             *
@@ -480,7 +469,6 @@
             class_type = #classType#,
             deletedType = #deletedType#,
             owner = #owner#,
-            lastModifier = #modifier#,
             modDate = #modifiedDate#,
             accessDate = #accessDate#,
             is_root = #isRoot#,
@@ -875,18 +863,7 @@
         where
             parent_id = ?
     </delete>
-    
-    <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>
-    
+
     <!--                          -->
     <!-- AVM MergeLink Statements -->
     <!--                          -->
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
index d70a735bbd..bba62bf43d 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
+++ b/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>
\ No newline at end of file