Schema classes updated

Doctrine/Schema/Column.php

@@ -38,14 +38,13 @@ class Doctrine_Schema_Column extends Doctrine_Schema_Object implements IteratorA
      * column definitions
      * @var array $definition
      */
-    private $definition = array('name'    => '',
-                                'type'    => '',
-                                'unique'  => false,
-                                'primary' => false,
-                                'notnull' => false,
-                                'default' => null,
-                                );
-
+    protected $definition = array('name'    => '',
+                                  'type'    => '',
+                                  'unique'  => false,
+                                  'primary' => false,
+                                  'notnull' => false,
+                                  'default' => null,
+                                  );
 
     public function __construct(array $definition) {
         foreach($this->definition as $key => $val) {
@@ -71,5 +70,4 @@ class Doctrine_Schema_Column extends Doctrine_Schema_Object implements IteratorA
     public function isNotNull() {
         return $this->definition['notnull'];
     }
-} // end of Doctrine_Schema_Column
-
+}

Doctrine/Schema/Object.php

@@ -33,69 +33,35 @@
  * class Doctrine_Schema_Object
  * Catches any non-property call from child classes and throws an exception.
  */
-abstract class Doctrine_Schema_Object
-            implements IteratorAggregate, Countable
-{
-
-    /** Aggregations: */
-
-    /** Compositions: */
-
-     /*** Attributes: ***/
-
-
-    /**
-     *
-     * @param string _property      
-     * @param mixed _value      
-     * @return 
-     * @access public
-     */
-    public function __set( $_property,  $_value ) 
-    {
-        throw new Doctrine_Schema_Exception('Assignment of non-property');
-    } // end of member function __set
-
-    /**
-     *
-     * @param string _property      
-     * @return 
-     * @access public
-     */
-    public function __get( $_property ) 
-    {
-        throw new Doctrine_Schema_Exception('Access of non-property');        
-    } // end of member function __get
+abstract class Doctrine_Schema_Object implements IteratorAggregate, Countable {
 
+    protected $children   = array();
 
+    protected $definition = array();
 
     /**
      *
      * @return int
      * @access public
      */
-    public function count( )
-    {
-        if(!empty($this->childs))
-        {
+    public function count() {
+        if( ! empty($this->childs))
             return count($this->childs);
-        }
-        return 0;
+
+        return count($this->definition);
     }
 
     /**
+     * getIterator
      *
-     * @return 
+     * @return ArrayIterator
      * @access public
      */
-    public function getIterator( )
-    {
-        if(!empty($this->childs))
-        {
+    public function getIterator() {
+        if( ! empty($this->childs))
             return new ArrayIterator($this->childs);
-        }
-        return new ArrayIterator();       
-    }
 
-} // end of Doctrine_Schema_Object
+        return new ArrayIterator($this->definition);
+    }
+}
 

Doctrine/Schema/Table.php

@@ -37,14 +37,6 @@ class Doctrine_Schema_Table extends Doctrine_Schema_Object
             implements Countable, Countable, IteratorAggregate
 {
 
-    /** Aggregations: */
-
-    /** Compositions: */
-    var $m_Vector = array();
-    var $m_;
-
-     /*** Attributes: ***/
-
     /**
      * Unique key fields
      * @access public
@@ -85,53 +77,42 @@ class Doctrine_Schema_Table extends Doctrine_Schema_Object
      * @access public
      */
     public $description;
-
-    /**
-     * Columns of the table
-     * @access private
-     */
-    private $childs;
-
-
     /**
      *
-     * @return 
+     * @return bool
      * @access public
      */
-    public function __toString( ) {
+    public function isValid( ) {
         
-    } // end of member function __toString
-
+    }
     /**
+     * returns an array of Doctrine_Schema_Column objects
      *
-     * @return 
-     * @access public
+     * @return array
      */
-    public function __clone( ) {
-        
-    } // end of member function __clone
-
+    public function getColumns() {
+        return $this->children;
+    }
     /**
-     *
-     * @return bool
-     * @access public
+     * @return Doctrine_Schema_Column|false
      */
-    public function isValid( ) {
-        
-    } // end of member function isValid
-
+    public function getColumn($name) {
+        if( ! isset($this->children[$name]))
+            return false;
+            
+        return $this->children[$name];
+    }
     /**
      *
-     * @param Doctrine_Schema_Column column      * @return Doctrine_Schema_Column
+     * @param Doctrine_Schema_Column column
+     * @return Doctrine_Schema_Table
      * @access public
      */
-    public function addColumn( $column = null ) {
-        
-    } // end of member function addColumn
-
-
-
-
+    public function addColumn(Doctrine_Schema_Column $column) {
+        $name = $column->getName();
+        $this->children[$name] = $column;
 
-} // end of Doctrine_Schema_Table
+        return $this;
+    }
 
+}