Doctrine

Timestamp:

02/15/08 15:07:47 (17 months ago)

Author:

guilhermeblanco

Message:

Added NOT operator recognition in DQL (fixes #496)

Files:

• branches/0.10/lib/Doctrine/Query/Condition.php (modified) (1 diff)
• branches/0.9/lib/Doctrine/Query/Condition.php (modified) (1 diff)
• trunk/lib/Doctrine/Query/Condition.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Query/Condition.php

@@ -64 +64 @@
                 $r = implode(' OR ', $ret);
             } else {
+                // Fix for #710
                 if (substr($parts[0],0,1) == '(' && substr($parts[0], -1) == ')') {
                     return $this->parse(substr($parts[0], 1, -1));
                 } else {
-                    return $this->load($parts[0]);
+                    // Processing NOT here
+                    if (strtoupper(substr($parts[0], 0, 4)) === 'NOT ') {
+                        $r = 'NOT ('.$this->parse(substr($parts[0], 4)).')';
+                    } else {
+                        return $this->load($parts[0]);
+                    }
                 }
             }

branches/0.9/lib/Doctrine/Query/Condition.php

@@ -64 +64 @@
                 $r = implode(' OR ', $ret);
             } else {
+                // Fix for #710
                 if (substr($parts[0],0,1) == '(' && substr($parts[0], -1) == ')') {
                     return $this->parse(substr($parts[0], 1, -1));
                 } else {
-                    return $this->load($parts[0]);
+                    // Processing NOT here
+                    if (strtoupper(substr($parts[0], 0, 4)) === 'NOT ') {
+                        $r = 'NOT ('.$this->parse(substr($parts[0], 4)).')';
+                    } else {
+                        return $this->load($parts[0]);
+                    }
                 }
             }

trunk/lib/Doctrine/Query/Condition.php

@@ -64 +64 @@
                 $r = implode(' OR ', $ret);
             } else {
+                // Fix for #710
                 if (substr($parts[0],0,1) == '(' && substr($parts[0], -1) == ')') {
                     return $this->parse(substr($parts[0], 1, -1));
                 } else {
-                    return $this->load($parts[0]);
+                    // Processing NOT here
+                    if (strtoupper(substr($parts[0], 0, 4)) === 'NOT ') {
+                        $r = 'NOT ('.$this->parse(substr($parts[0], 4)).')';
+                    } else {
+                        return $this->load($parts[0]);
+                    }
                 }
             }