fix(db): allow passing only relationship_ids to fetch relationships

ref #14332
Elgg · Jun 15, 2023 · ad06ace · ad06ace
1 parent 8bfe76e
commit ad06ace
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/engine/classes/Elgg/Traits/Database/LegacyQueryOptionsAdapter.php b/engine/classes/Elgg/Traits/Database/LegacyQueryOptionsAdapter.php
@@ -644,7 +644,7 @@ protected function normalizeRelationshipOptions(array $options = []) {
 				continue;
 			}
 
-			if (!$pair['relationship'] && !$pair['guid']) {
+			if (!$pair['relationship'] && !$pair['guid'] && !$pair['ids']) {
 				unset($options['relationship_pairs'][$key]);
 				continue;
 			}

diff --git a/engine/tests/phpunit/unit/Elgg/Database/QueryOptionsUnitTest.php b/engine/tests/phpunit/unit/Elgg/Database/QueryOptionsUnitTest.php
@@ -941,7 +941,7 @@ public function testNormalizesAnnotationSortingOptionsWithOrderBy() {
 		$this->assertEquals(null, $pair->sort_by_direction);
 	}
 
-	public function testNormalizeReltionshipOptions() {
+	public function testNormalizeRelationshipOptions() {
 		$after = (new \DateTime())->modify('-1 day');
 		$before = (new \DateTime());
 
@@ -970,7 +970,7 @@ public function testNormalizeReltionshipOptions() {
 		$this->assertEquals($before, $pair->created_before);
 	}
 
-	public function testNormalizeReltionshipOptionsForInverseRelationship() {
+	public function testNormalizeRelationshipOptionsForInverseRelationship() {
 		$after = (new \DateTime())->modify('-1 day');
 		$before = (new \DateTime());
 
@@ -999,7 +999,7 @@ public function testNormalizeReltionshipOptionsForInverseRelationship() {
 		$this->assertEquals($before, $pair->created_before);
 	}
 
-	public function testNormalizeReltionshipOnMultipleCalls() {
+	public function testNormalizeRelationshipOnMultipleCalls() {
 		$after = (new \DateTime())->modify('-1 day');
 		$before = (new \DateTime());
 
@@ -1015,6 +1015,20 @@ public function testNormalizeReltionshipOnMultipleCalls() {
 
 		$this->assertEquals($options, $this->options->normalizeOptions($options));
 	}
+
+	public function testIncompleteRelationshipPairOptions() {
+		$options = $this->options->normalizeOptions();
+		$this->assertEmpty($options['relationship_pairs']);
+
+		$options = $this->options->normalizeOptions([
+			'inverse_relationship' => false,
+			'relationship_join_on' => 'guid',
+			'relationship_created_after' => (new \DateTime())->modify('-1 day'),
+			'relationship_created_before' => (new \DateTime()),
+		]);
+
+		$this->assertEmpty($options['relationship_pairs']);
+	}
 
 	public function testNormalizeSelectClauses() {