Conflicts:

	lib/Doctrine/Table.php

Author: jwage

lib/Doctrine/Table.php

@@ -2735,10 +2735,10 @@ public function buildFindByWhere($fieldName)
         $fieldsFound = $matches[1];
         $operatorFound = array_map('strtoupper', $matches[2]);
 
-        // Check if $fieldName has unidentified parts left
+        // Check if $fieldName has unidentified parts left 
         if (strlen(implode('', $fieldsFound) . implode('', $operatorFound)) !== strlen($fieldName)) {
             $expression = preg_replace('/(' . implode('|', $fields) . ')(Or|And)?/', '($1)$2', $fieldName);
-            throw new Doctrine_Table_Exception('Invalid expression found: ' . $expression);
+            throw new Doctrine_Table_Exception('Invalid expression found: ' . $expression);    
         }
 
         // Build result
@@ -2763,7 +2763,7 @@ public function buildFindByWhere($fieldName)
             }
 
             $where .= ' ' . strtoupper($operatorFound[$index]) . ' ';
-
+            
             $lastOperator = $operatorFound[$index];
         }
 

tests/DoctrineTest/doctrine_tests/245a059205f76f5a8987565e88413227

@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Ticket_1527_User
+ * 
+ * This class has been auto-generated by the Doctrine ORM Framework
+ * 
+ * @package    ##PACKAGE##
+ * @subpackage ##SUBPACKAGE##
+ * @author     ##NAME## <##EMAIL##>
+ * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
+ */
+class Ticket_1527_User extends BaseTicket_1527_User
+{
+
+}

tests/DoctrineTest/doctrine_tests/c2362f023111b1a1b4aa7275dce0d3f8

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * BaseTicket_1527_User
+ * 
+ * This class has been auto-generated by the Doctrine ORM Framework
+ * 
+ * @property string $username
+ * @property string $password
+ * 
+ * @package    ##PACKAGE##
+ * @subpackage ##SUBPACKAGE##
+ * @author     ##NAME## <##EMAIL##>
+ * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
+ */
+abstract class BaseTicket_1527_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('ticket_1527__user');
+        $this->hasColumn('username', 'string', 255, array(
+             'type' => 'string',
+             'extra' => 
+             array(
+              'test' => 123,
+             ),
+             'length' => '255',
+             ));
+        $this->hasColumn('password', 'string', 255, array(
+             'type' => 'string',
+             'length' => '255',
+             ));
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        
+    }
+}