Doctrine

Timestamp:

04/30/08 16:05:28 (14 months ago)

Author:

jwage

Message:

Fix to allow aliases in schema files.

Location:

branches/0.11

Files:

• lib/Doctrine/Import/Builder.php (modified) (1 diff)
• lib/Doctrine/Import/Schema.php (modified) (2 diffs)
• tests/Import/SchemaTestCase.php (modified) (2 diffs)
• tests/schema.yml (modified) (1 diff)

branches/0.11/lib/Doctrine/Import/Builder.php

@@ -497 +497 @@
         $build = null;
         foreach ($columns as $name => $column) {
-            $build .= "    ".'$this->hasColumn(\'' . $name . '\', \'' . $column['type'] . '\'';
+            $columnName = isset($column['name']) ? $column['name']:$name;
+            $build .= "    ".'$this->hasColumn(\'' . $columnName . '\', \'' . $column['type'] . '\'';
     
             if ($column['length']) {

branches/0.11/lib/Doctrine/Import/Schema.php

@@ -361 +361 @@
 
                     $colDesc = array();
-                    $colDesc['name'] = $columnName;
+                    if (isset($field['name'])) {
+                        $colDesc['name'] = $field['name'];
+                    } else {
+                        $colDesc['name'] = $columnName;
+                    }
 
                     // Support short type(length) syntax: my_column: { type: integer(4) }
@@ -390 +394 @@
                     }
 
-                    $columns[(string) $colDesc['name']] = $colDesc;
+                    $columns[(string) $columnName] = $colDesc;
                 }
             }

branches/0.11/tests/Import/SchemaTestCase.php

@@ -51 +51 @@
         }
 
+        $this->assertEqual(Doctrine::getTable('AliasTest')->getFieldName('test_col'), 'test_col_alias');
+
         Doctrine_Lib::removeDirectories($path);
     }
@@ -75 +77 @@
         $this->assertTrue(array_key_exists('detect_relations', $model) && is_bool($model['detect_relations']));
         $this->assertTrue(array_key_exists('generate_accessors', $model) && is_bool($model['generate_accessors']));
+        $this->assertEqual($array['AliasTest']['columns']['test_col']['name'], 'test_col as test_col_alias');
     }
     

branches/0.11/tests/schema.yml

@@ -142 +142 @@
     title: string(255)
     description: string(255)
+
+AliasTest:
+  columns:
+    test_col:
+      name: test_col as test_col_alias
+      type: string(255)