WIP

src/Drivers/EloquentEntitySet.php

@@ -269,7 +269,18 @@ public function delete(PropertyValue $key): void
     public function query(): Generator
     {
         $builder = $this->getBuilder();
-        $builder->select('*');
+
+        $properties = $this->getSelectedProperties();
+
+        $key = $this->getType()->getKey();
+
+        if ($key && !$properties[$key]) {
+            $properties[] = $key;
+        }
+
+        $builder->select($properties->map(function (Property $property) {
+            return $this->getPropertySourceName($property);
+        }));
 
         if ($this->navigationSource) {
             /** @var Entity $sourceEntity */

src/Drivers/SQLEntitySet.php

@@ -407,19 +407,7 @@ public function getResultExpression(): SQLExpression
      */
     protected function getColumnsToQuery(): array
     {
-        $properties = $this->getType()->getDeclaredProperties();
-
-        $select = $this->getSelect();
-
-        if ($select->hasValue() && !$select->isStar()) {
-            $selectedProperties = $select->getCommaSeparatedValues();
-
-            foreach ($properties as $property) {
-                if (!in_array($property->getName(), $selectedProperties)) {
-                    $properties->drop($property);
-                }
-            }
-        }
+        $properties = $this->getSelectedProperties();
 
         $key = $this->getType()->getKey();
 

src/EntitySet.php

@@ -27,6 +27,7 @@
 use Flat3\Lodata\Helper\Gate;
 use Flat3\Lodata\Helper\JSON;
 use Flat3\Lodata\Helper\ObjectArray;
+use Flat3\Lodata\Helper\Properties;
 use Flat3\Lodata\Helper\PropertyValue;
 use Flat3\Lodata\Helper\PropertyValues;
 use Flat3\Lodata\Helper\Url;
@@ -1205,6 +1206,30 @@ protected function toEntity(array $record, $entityId = null): Entity
         return $entity;
     }
 
+    /**
+     * Get the properties generated using the $compute system query option
+     * @return Properties
+     */
+    public function getComputedProperties(): Properties
+    {
+        return $this->getCompute()->getProperties();
+    }
+
+    /**
+     * Get the properties requsted using the $select system query option
+     * @return Properties
+     */
+    public function getSelectedProperties(): Properties
+    {
+        if (!$this->getSelect()->hasValue() || $this->getSelect()->isStar()) {
+            return $this->getType()->getDeclaredProperties();
+        }
+
+        return $this->getType()->getDeclaredProperties()->filter(function (Property $property) {
+            return in_array($property, $this->getSelect()->getCommaSeparatedValues());
+        });
+    }
+
     /**
      * Recursively convert this complex value to a nested PHP array of key/value pairs
      * @return array Record