From a57226b086aae584dd466446430c695e54f03e12 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 31 Jul 2007 20:22:10 +0000
Subject: [PATCH] fixes #338

---
 lib/Doctrine/Query/Set.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/Doctrine/Query/Set.php b/lib/Doctrine/Query/Set.php
index 5b981c226..f5b26902d 100644
--- a/lib/Doctrine/Query/Set.php
+++ b/lib/Doctrine/Query/Set.php
@@ -34,24 +34,23 @@ class Doctrine_Query_Set extends Doctrine_Query_Part
 {
     public function parse($dql)
     {
-        $parts = Doctrine_Tokenizer::sqlExplode($dql, ',');
+        preg_match_all("/[a-z0-9_]+\.[a-z0-9_]+[\.[a-z0-9]+]*/i", $dql, $m);
 
-        $result = array();
-        foreach ($parts as $part) {
-            $set = Doctrine_Tokenizer::sqlExplode($part, '=');
-
-            $e   = explode('.', trim($set[0]));
-            $field = array_pop($e);
-
-            $reference = implode('.', $e);
-
-            $alias     = $this->query->getTableAlias($reference);
-            $map       = $this->query->getAliasDeclaration($reference);
-
-            $result[]  = $map['table']->getColumnName($field) . ' = ' . $set[1];
+        if (isset($m[0])) {
+            foreach ($m[0] as $part) {
+                $e   = explode('.', trim($part));
+                $field = array_pop($e);
+    
+                $reference = implode('.', $e);
+    
+                $alias = $this->query->getTableAlias($reference);
+                $map   = $this->query->getAliasDeclaration($reference);
+    
+                $dql = str_replace($part, $map['table']->getColumnName($field), $dql);
+            }
         }
-        
-        return implode(', ', $result);
+
+        return $dql;
     }
 }