From 2ea828e416462c90d6a84bd6260e2dc88c3f523b Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Sun, 13 Feb 2011 22:48:01 +0000
Subject: [PATCH] Proper fix for r3307 (file-write on MySQL via UNION query
 tech)

---
 lib/core/agent.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/core/agent.py b/lib/core/agent.py
index 774e3cf3d..dae2c4226 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -434,11 +434,14 @@ class Agent:
         @rtype: C{str}
         """
 
-        if not unpack:
-            return query
-        else:
-            concatenatedQuery = query
+        if unpack:
+            concatenatedQuery = ""
+            query = query.replace(", ", ",")
             fieldsSelectFrom, fieldsSelect, fieldsNoSelect, fieldsSelectTop, fieldsSelectCase, _, fieldsToCastStr, fieldsExists = self.getFields(query)
+            castedFields = self.nullCastConcatFields(fieldsToCastStr)
+            concatenatedQuery = query.replace(fieldsToCastStr, castedFields, 1)
+        else:
+            return query
 
         if Backend.getIdentifiedDbms() == DBMS.MYSQL:
             if fieldsExists: