- Select now only query existing entity's fields on select() and withJoin() statements.

src/EntityTrait.php

@@ -40,8 +40,8 @@ trait EntityTrait {
         $entityResolver = $this->resolveEntity();
 
         foreach($dataset as $key => $value) {
-            $field = $entityResolver->field(strtolower($key), EntityResolver::KEY_COLUMN_NAME, false) ?? null;
 
+            $field = $entityResolver->field(strtolower($key), EntityResolver::KEY_COLUMN_NAME, false) ?? null;
             $field ??= $entityResolver->field(strtolower($key), EntityResolver::KEY_LC_ENTITY_NAME, false);
 
             if ( $field === null ) {
@@ -232,7 +232,12 @@ trait EntityTrait {
 
     public function __sleep()
     {
-        return array_keys($this->resolveEntity()->fieldList());
+        return array_merge(array_keys($this->resolveEntity()->fieldList()), [ 'entityLoadedDataset' ] );
+    }
+
+    public function __wakeup()
+    {
+        $this->resetVirtualProperties();
     }
 
     public function __clone()
@@ -248,7 +253,7 @@ trait EntityTrait {
         }
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize() : mixed
     {
         return $this->entityGetDataset();
     }