Merge branch 'develop'

Author: 27pchrisl

src/Drivers/EloquentEntitySet.php

@@ -195,16 +195,6 @@ public function query(): array
         }
 
         $this->resetParameters();
-
-        $select = $this->transaction->getSelect();
-        if ($select->hasValue()) {
-            $properties = $select->getSelectedProperties($this)->sliceByClass(DeclaredProperty::class);
-            /** @var DeclaredProperty $property */
-            foreach ($properties as $property) {
-                $builder->addSelect($property->getName());
-            }
-        }
-
         $this->generateWhere();
 
         if ($this->where) {

tests/Unit/Eloquent/EloquentTest.php

@@ -510,4 +510,16 @@ public function test_compound_filter()
                 ->filter("startswith(code, 'l') and is_big eq true")
         );
     }
+
+    public function test_read_with_select_and_metadata()
+    {
+        $this->withFlightData();
+
+        $this->assertJsonResponse(
+            Request::factory()
+                ->path('/Flights')
+                ->metadata(Metadata\Full::name)
+                ->query('$select', 'destination')
+        );
+    }
 }

tests/Unit/Eloquent/__snapshots__/EloquentTest__test_read_with_select_and_metadata__1.json

@@ -0,0 +1,24 @@
+{
+    "@context": "http://localhost/odata/$metadata#Flights(destination)",
+    "@readLink": "http://localhost/odata/Flights",
+    "value": [
+        {
+            "@type": "#com.example.odata.Flight",
+            "@id": "http://localhost/odata/Flights(1)",
+            "@readLink": "http://localhost/odata/Flights(1)",
+            "destination": "lax"
+        },
+        {
+            "@type": "#com.example.odata.Flight",
+            "@id": "http://localhost/odata/Flights(2)",
+            "@readLink": "http://localhost/odata/Flights(2)",
+            "destination": "rgr"
+        },
+        {
+            "@type": "#com.example.odata.Flight",
+            "@id": "http://localhost/odata/Flights(3)",
+            "@readLink": "http://localhost/odata/Flights(3)",
+            "destination": "lax"
+        }
+    ]
+}

tests/Unit/Queries/EntitySet/EntitySetTest.php

@@ -39,4 +39,14 @@ public function test_read_an_entity_with_no_metadata()
                 ->path('/flights')
         );
     }
+
+    public function test_read_with_select_and_metadata()
+    {
+        $this->assertJsonResponse(
+            Request::factory()
+                ->path('/flights')
+                ->metadata(Metadata\Full::name)
+                ->query('$select', 'destination')
+        );
+    }
 }

tests/Unit/Queries/EntitySet/__snapshots__/EntitySetTest__test_read_with_select_and_metadata__1.json

@@ -0,0 +1,24 @@
+{
+    "@context": "http://localhost/odata/$metadata#flights(destination)",
+    "@readLink": "http://localhost/odata/flights",
+    "value": [
+        {
+            "@type": "#com.example.odata.flight",
+            "@id": "http://localhost/odata/flights(1)",
+            "@readLink": "http://localhost/odata/flights(1)",
+            "destination": "lax"
+        },
+        {
+            "@type": "#com.example.odata.flight",
+            "@id": "http://localhost/odata/flights(2)",
+            "@readLink": "http://localhost/odata/flights(2)",
+            "destination": "rgr"
+        },
+        {
+            "@type": "#com.example.odata.flight",
+            "@id": "http://localhost/odata/flights(3)",
+            "@readLink": "http://localhost/odata/flights(3)",
+            "destination": "lax"
+        }
+    ]
+}