Doctrine

Timestamp:

02/14/08 12:49:20 (17 months ago)

Author:

adrive

Message:

convertBoolean method was not working correctly for Pgsql, when integer value 0|1 was used as value for boolean type columns instead of true|false. (e.g. sfGuardDoctrinePlugin will use it in schema.yml)

Added boolean columns to Export/PgsqlTestCase.php to check default attributes for columns.

Location:

branches/0.9

Files:

• lib/Doctrine/Connection/Pgsql.php (modified) (1 diff)
• lib/Doctrine/Export.php (modified) (1 diff)
• tests/Export/PgsqlTestCase.php (modified) (2 diffs)

branches/0.9/lib/Doctrine/Connection/Pgsql.php

@@ -107 +107 @@
         if (is_array($item)) {
             foreach ($item as $key => $value) {
-                if (is_bool($value)) {
+                if (is_bool($value) || is_numeric($item)) {
                     $item[$key] = ($value) ? 'true' : 'false';
                 }
             }
         } else {
-           if (is_bool($item)) {
+           if (is_bool($item) || is_numeric($item)) {
                $item = ($item) ? 'true' : 'false';
            }

branches/0.9/lib/Doctrine/Export.php

@@ -744 +744 @@
 
             if ($field['type'] === 'boolean') {
-                $fields['default'] = $this->conn->convertBooleans($field['default']);
+                $field['default'] = $this->conn->convertBooleans($field['default']);
             }
             $default = ' DEFAULT ' . $this->conn->quote($field['default'], $field['type']);

branches/0.9/tests/Export/PgsqlTestCase.php

@@ -105 +105 @@
         $name = 'mytable';
         $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
-                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12),
+                         'is_active' => array('type' => 'boolean', 'default'=>'0'),
+                         'is_admin'  => array('type' => 'boolean', 'default'=>'true'),
                          );
                          
@@ -111 +113 @@
         $this->export->createTable($name, $fields, $options);
 
-        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type INT DEFAULT 12, PRIMARY KEY(name, type))');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type INT DEFAULT 12, is_active BOOLEAN DEFAULT false, is_admin BOOLEAN DEFAULT true, PRIMARY KEY(name, type))');
     }
     public function testCreateTableSupportsMultiplePks()