From e18d1961abd9cc64d10ac7277c1ef5fca140fed3 Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Tue, 13 Dec 2011 14:44:08 +0000
Subject: [PATCH] ALF-12013 All uses of SQL like need to be protected with
 <include refid="alfresco.util.escape"/> for SQL Server - fixes failing
 GetChildrenCannedQueryTest test for SQL Server

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org.hibernate.dialect.Dialect/node-common-SqlMap.xml      | 4 ++--
 .../org.hibernate.dialect.Dialect/patch-common-SqlMap.xml     | 2 +-
 .../query-test-common-SqlMap.xml                              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index 61e583bcdf..537338fd78 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -1056,7 +1056,7 @@
                 </foreach>
             </if>
             <if test="pattern != null">
-            and prop4.string_value like #{pattern}
+            and prop4.string_value like #{pattern} <include refid="alfresco.util.escape"/>
             </if>
         <if test="prop1qnameId == null and auditableProps == false">
             <include refid="alfresco.node.select_ChildAssoc_OrderBy"/>
@@ -1087,7 +1087,7 @@
                 </foreach>
             </if>
             <if test="pattern != null">
-            and prop4.string_value like #{pattern}
+            and prop4.string_value like #{pattern} <include refid="alfresco.util.escape"/>
             </if>
         <include refid="alfresco.node.select_ChildAssoc_OrderBy"/>
     </select>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
index d1276e16a3..55455ac780 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
@@ -133,7 +133,7 @@
             and id < #{idTwo}
             and class_type = 'plainfile'
             and content_url is not null
-            and content_url not like 'id:%'
+            and content_url not like 'id:%' <include refid="alfresco.util.escape"/>
         order by
             id ASC
         ]]>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-test-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-test-common-SqlMap.xml
index e52dbaac61..6c4569501f 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-test-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-test-common-SqlMap.xml
@@ -38,7 +38,7 @@
         <if test="mimetypeMatch != null">
         where
             <if test="exact == true">mimetype_str = #{mimetypeMatch}</if>
-            <if test="exact == false">mimetype_str like #{mimetypeMatch}</if>
+            <if test="exact == false">mimetype_str like #{mimetypeMatch} <include refid="alfresco.util.escape"/> </if>
         </if>
         <if test="forceFail == true">JUNKED</if>
     </select>
@@ -51,7 +51,7 @@
         <if test="mimetypeMatch != null">
             where
                 <if test="exact == true">mimetype_str = #{mimetypeMatch}</if>
-                <if test="exact == false">mimetype_str like #{mimetypeMatch}</if>
+                <if test="exact == false">mimetype_str like #{mimetypeMatch} <include refid="alfresco.util.escape"/></if>
         </if>
         <if test="forceFail == true">JUNKED</if>
     </select>