Save parent declare schema class in declare column property

maghead · Jun 18, 2016 · 61efd23 · 61efd23
1 parent 4fcf784
commit 61efd23
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/src/Schema/Column/AutoIncrementPrimaryKeyColumn.php b/src/Schema/Column/AutoIncrementPrimaryKeyColumn.php
@@ -3,12 +3,13 @@
 namespace LazyRecord\Schema\Column;
 
 use LazyRecord\Schema\DeclareColumn;
+use LazyRecord\Schema\DeclareSchema;
 
 class AutoIncrementPrimaryKeyColumn extends DeclareColumn
 {
-    public function __construct($name = 'id', $type = 'integer')
+    public function __construct(DeclareSchema $schema, $name = 'id', $type = 'integer')
     {
-        parent::__construct($name);
+        parent::__construct($schema, $name);
         $this->type($type)
             ->isa('int')
             ->notNull()

diff --git a/src/Schema/DeclareColumn.php b/src/Schema/DeclareColumn.php
@@ -31,10 +31,16 @@ class DeclareColumn extends Column implements ColumnAccessorInterface, IteratorA
      */
     protected $attributes = array();
 
+
+    /**
+     * the parent schema object
+     */
+    protected $schema;
+
     /**
      * @var string column name (id)
      */
-    public function __construct($name = null, $type = null)
+    public function __construct(DeclareSchema $schema = null, $name = null, $type = null)
     {
         $this->attributeTypes = $this->attributeTypes + array(
             /* primary key */
@@ -169,9 +175,12 @@ public function renderAs($renderAs, array $widgetAttributes = array())
      *
      * @param string $relationship relationship id
      */
-    public function refer($relationship)
+    public function refer($schemaClass)
     {
-        $this->attributes['refer'] = $relationship;
+        $this->attributes['refer'] = $schemaClass;
+        if (class_exists($schemaClass, true)) {
+            $schema = new $schemaClass;
+        }
         return $this;
     }
 

diff --git a/src/Schema/DeclareSchema.php b/src/Schema/DeclareSchema.php
@@ -198,7 +198,7 @@ public function insertColumn(DeclareColumn $column)
      */
     protected function insertAutoIdColumn($name = 'id', $columnType = 'integer')
     {
-        $column = new AutoIncrementPrimaryKeyColumn($name, $columnType);
+        $column = new AutoIncrementPrimaryKeyColumn($this, $name, $columnType);
         $this->primaryKey = $column->name;
         $this->insertColumn($column);
         return $column;
@@ -541,8 +541,7 @@ public function column($name, $class = 'LazyRecord\\Schema\\DeclareColumn')
             throw new Exception("column $name of ".get_class($this).' is already defined.');
         }
         $this->columnNames[] = $name;
-
-        return $this->columns[ $name ] = new $class($name);
+        return $this->columns[$name] = new $class($this, $name);
     }
 
     /**

diff --git a/tests/AuthorBooks/Model/AuthorBookSchema.php b/tests/AuthorBooks/Model/AuthorBookSchema.php
@@ -10,6 +10,7 @@ public function schema()
                 ->required()
                 ->integer()
                 ->unsigned()
+                ->refer('AuthorBooks\\Model\\AuthorSchema');
                 ;
 
         $this->column('book_id')

diff --git a/tests/LazyRecord/Schema/SchemaDeclare/ColumnTest.php b/tests/LazyRecord/Schema/SchemaDeclare/ColumnTest.php
@@ -1,14 +1,16 @@
 <?php
+use LazyRecord\Schema\DeclareSchema;
+use LazyRecord\Schema\DeclareColumn;
+
 class ColumnTest extends PHPUnit_Framework_TestCase
 {
-    function test()
+    public function test()
     {
-        $column = new LazyRecord\Schema\DeclareColumn('foo');
+        $column = new DeclareColumn(new DeclareSchema, 'foo');
         $column->primary()
             ->integer()
             ->autoIncrement()
             ->notNull();
-
         $this->assertEquals('foo',$column->name);
         $this->assertTrue($column->primary);
         $this->assertEquals('int',$column->type);