Doctrine

Timestamp:

03/10/08 06:30:20 (16 months ago)

Author:

jwage

Message:

Added hack/fix to getColumnName() to fix situations where an array is passed to it

Files:

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

branches/0.10/lib/Doctrine/Table.php

@@ -877 +877 @@
     public function getColumnName($fieldName)
     {
+        // FIX ME: This is being used in places where an array is passed, but it should not be an array
+        // For example in places where Doctrine should support composite foreign/primary keys
+        $fieldName = is_array($fieldName) ? $fieldName[0]:$fieldName;
+
         if (isset($this->_columnNames[$fieldName])) {
             return $this->_columnNames[$fieldName];
         }
+
         return $fieldName;
     }
     
     /**
-     *
-     *
+     * getColumnDefinition
+     *
+     * @param string $columnName 
+     * @return void
      */
     public function getColumnDefinition($columnName)