- Still working on Update and Insert statements

src/EntityTrait.php

@@ -121,11 +121,21 @@ trait EntityTrait {
     
     public function entityGetDataset() : array
     {
-        $fields = array_keys($this->resolveEntity()->fieldList());
+        $dataset = [];
+        $entityResolver = $this->resolveEntity();
+        
+        foreach($entityResolver->fieldList() as $key => $field) {
+            $annotation = $entityResolver->searchFieldAnnotation($key, new Field() );
 
-        return array_combine($fields, array_map(function(string $key) {
-            return $this->$key; 
-        }, $fields));
+            if ( isset($this->$key) ) {                
+                $dataset[ $annotation->name ?? $key ] = $this->$key;
+            }
+            elseif ( $field['nullable'] ) {
+                $dataset[ $annotation->name ?? $key ] = null;
+            }
+        }
+        
+        return $dataset;
     }
     
     public function toArray() : array