Doctrine

Timestamp:

12/11/08 09:56:16 (7 months ago)

Author:

adrive

Message:

[1.1] Property max_identifier_length is now used as the length parameter for _generateUniqueName method. Oracle holds only 30 characters long identifiers.

Location:

branches/1.1/lib/Doctrine

Files:

• Connection.php (modified) (3 diffs)
• Connection/Oracle.php (modified) (1 diff)

branches/1.1/lib/Doctrine/Connection.php

@@ -154 +154 @@
                                   'varchar_max_length'  => 255,
                                   'sql_file_delimiter'  => ";\n",
+                                  'max_identifier_length' => 64,
                                   );
 
@@ -1606 +1607 @@
         $format = $this->getAttribute(Doctrine::ATTR_FKNAME_FORMAT);
 
-        return $this->_generateUniqueName('foreign_keys', $parts, $key, $format, 64);
+        return $this->_generateUniqueName('foreign_keys', $parts, $key, $format, $this->properties['max_identifier_length']);
     }
 
@@ -1624 +1625 @@
         $format = $this->getAttribute(Doctrine::ATTR_IDXNAME_FORMAT);
 
-        return $this->_generateUniqueName('indexes', $parts, $key, $format, 64);
+        return $this->_generateUniqueName('indexes', $parts, $key, $format, $this->properties['max_identifier_length']);
     }
 

branches/1.1/lib/Doctrine/Connection/Oracle.php

@@ -64 +64 @@
         $this->properties['varchar2_max_length']  = 4000;
         $this->properties['number_max_precision'] = 38;
+        $this->properties['max_identifier_length'] = 30;
         
         parent::__construct($manager, $adapter);