use get_object_vars to export all column properties

Fixes: #116
maghead · Aug 6, 2015 · b95d1fc · b95d1fc
1 parent fb7243c
commit b95d1fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/LazyRecord/Schema/ColumnDeclare.php b/src/LazyRecord/Schema/ColumnDeclare.php
@@ -202,27 +202,23 @@ public function validator() {
         $this->attributes['validator'] = $args[0];
     }
 
+
+    /**
+     * Export column attributes to an array
+     *
+     * @return array
+     */
     public function export()
     {
         return array(
             'name' => $this->name,
-            'attributes' => array(
-                'isa' => $this->isa,
-                'type' => $this->type,
-                'primary' => $this->primary,
-            ) + $this->attributes,
+            'attributes' => array_merge(get_object_vars($this), $this->attributes),
         );
     }
 
     public function toArray()
     {
-        $attrs = $this->attributes;
-        $attrs['name'] = $this->name;
-        $attrs['primary'] = $this->primary;
-        $attrs['unsigned'] = $this->unsigned;
-        $attrs['type'] = $this->type;
-        $attrs['notNull'] = $this->notNull;
-        return $attrs;
+        return array_merge(get_object_vars($this),$this->attributes);
     }
 
     public function dump()

diff --git a/src/LazyRecord/Schema/DeclareSchema.php b/src/LazyRecord/Schema/DeclareSchema.php
@@ -226,7 +226,7 @@ public function findPrimaryKey()
     public function export()
     {
         $columnArray = array();
-        foreach( $this->columns as $name => $column ) {
+        foreach ( $this->columns as $name => $column ) {
 
             // This idea is from:
             // http://search.cpan.org/~tsibley/Jifty-DBI-0.75/lib/Jifty/DBI/Schema.pm