Changeset 3263 for branches/1.0/models

Timestamp:

11/28/07 17:48:19 (14 months ago)

Author:

jwage

Message:

Merged all pending revisions in trunk to 1.0 branch to bring it up-to-date

Location:

branches/1.0/models

Files:

• ColumnAliasTest.php (modified) (1 diff)
• SymfonyRecord.php (modified) (1 diff)

branches/1.0/models/ColumnAliasTest.php

@@ -5 +5 @@
     {
         $this->hasColumn('column1 as alias1', 'string', 200);
-        $this->hasColumn('column2 as alias2', 'integer', 11);
+        $this->hasColumn('column2 as alias2', 'integer', 4);
+        $this->hasColumn('another_column as anotherField', 'string', 50);
+        $this->hasColumn('book_id as bookId', 'integer', 4);
     }
-    public function setUp() 
+    public function setUp()
     {
+        $this->hasOne('Book as book', array('local' => 'book_id', 'foreign' => 'id'));
     }
 }

branches/1.0/models/SymfonyRecord.php

@@ -1 +1 @@
 <?php
+require_once('PluginSymfonyRecord.php');
+
 class SymfonyRecord extends PluginSymfonyRecord
 {