Merge pull request #5743 from iRedds/subquery-same-object

Checking if the subquery uses the same object as the main query
codeigniter4 · Feb 26, 2022 · 64b6f48 · 64b6f48
2 parents 196d759 + e5bc03d
commit 64b6f48
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -2763,6 +2763,10 @@ protected function buildSubquery($builder, bool $wrapped = false, string $alias
  $builder($builder = $this->db->newQuery());
  }
 
+ if ($builder === $this) {
+ throw new DatabaseException('The subquery cannot be the same object as the main query object.');
+ }
+
  $subquery = strtr($builder->getCompiledSelect(), "\n", ' ');
 
  if ($wrapped) {

diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Builder;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
@@ -53,4 +54,14 @@ public function testGetTableIgnoresFrom()
  $result = $builder->getTable();
  $this->assertSame('jobs', $result);
  }
+
+ public function testSubquerySameBaseBuilderObject()
+ {
+ $this->expectException(DatabaseException::class);
+ $this->expectExceptionMessage('The subquery cannot be the same object as the main query object.');
+
+ $builder = $this->db->table('users');
+
+ $builder->fromSubquery($builder, 'sub');
+ }
 }