Doctrine

Timestamp:

10/21/08 20:35:42 (9 months ago)

Author:

adrive

Message:

[1.0, 1.1] Oracle DataDict? allowed to export VARCHAR2 and NUMBER bigger than allowed Oracle size. Max limit for VARCHAR2 is 4000 bytes and NUMBER precision 38. Clob used when string is bigger than 4000.

Location:

branches/1.0

Files:

• lib/Doctrine/Connection/Oracle.php (modified) (1 diff)
• lib/Doctrine/DataDict/Oracle.php (modified) (2 diffs)
• tests/DataDict/OracleTestCase.php (modified) (4 diffs)

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

@@ -60 +60 @@
                           'pattern_escaping'     => true,
                           );
-        $this->sql_file_delimiter = "\n/\n";
+        
+        $this->properties['sql_file_delimiter']   = "\n/\n";
+        $this->properties['varchar2_max_length']  = 4000;
+        $this->properties['number_max_precision'] = 38;
+        
         parent::__construct($manager, $adapter);
     }

branches/1.0/lib/Doctrine/DataDict/Oracle.php

@@ -67 +67 @@
             case 'char':
             case 'varchar':
-                $length = !empty($field['length'])
-                    ? $field['length'] : 16777215; // TODO: $this->conn->options['default_text_field_length'];
+                $length = !empty($field['length']) ? $field['length'] : false;
 
                 $fixed  = ((isset($field['fixed']) && $field['fixed']) || $field['type'] == 'char') ? true : false;
-
-                return $fixed ? 'CHAR('.$length.')' : 'VARCHAR2('.$length.')';
+                
+                if ($length && $length <= $this->conn->varchar2_max_length) {
+                    return $fixed ? 'CHAR('.$length.')' : 'VARCHAR2('.$length.')';
+                }
             case 'clob':
                 return 'CLOB';
@@ -79 +80 @@
             case 'integer':
             case 'int':
-                if ( ! empty($field['length'])) {
+                if ( ! empty($field['length']) && $field['length'] <= $this->conn->number_max_precision)  {
                     return 'NUMBER('.$field['length'].')';
                 }

branches/1.0/tests/DataDict/OracleTestCase.php

@@ -211 +211 @@
 
         $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(2)');
+        
+        unset($a['length']);
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INT');
     }
 
@@ -277 +281 @@
         $a = array('type' => 'string');
 
-        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(16777215)');
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
     }
     public function testGetNativeDefinitionSupportsArrayType2() 
@@ -283 +287 @@
         $a = array('type' => 'array');
 
-        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(16777215)');
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
     }
     public function testGetNativeDefinitionSupportsObjectType() 
@@ -289 +293 @@
         $a = array('type' => 'object');
 
-        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(16777215)');
-    }
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+    public function testGetNativeDefinitionSupportsLargerStrings()
+    {
+        $a = array('type' => 'string', 'length' => 4001);
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+    
 }