Doctrine

Timestamp:

03/08/08 05:10:52 (16 months ago)

Author:

jwage

Message:

fixes #827

Files:

• branches/0.10/lib/Doctrine/Table.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Table.php

@@ -945 +945 @@
         
         // extract column name & field name
-        $parts = explode(' as ', $name);
-        if (count($parts) > 1) {
-            $fieldName = $parts[1];
+        if (stripos($name, ' as '))
+        {
+            if (strpos($name, ' as')) {
+                $parts = explode(' as ', $name);
+            } else {
+                $parts = explode(' AS ', $name);
+            }
+            
+            if (count($parts) > 1) {
+                $fieldName = $parts[1];
+            } else {
+                $fieldName = $parts[0];
+            }
+            
+            $name = strtolower($parts[0]);
         } else {
-            $fieldName = $parts[0];
-        }
-        $name = strtolower($parts[0]);
+            $fieldName = $name;
+            $name = strtolower($name);
+        }
+        
+        $name = trim($name);
+        $fieldName = trim($fieldName);
+        
         if ($prepend) {
             $this->_columnNames = array_merge(array($fieldName => $name), $this->_columnNames);