From 32270189637eb00b239748340a2574a47007a20f Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Sun, 28 Nov 2021 18:53:34 +0000
Subject: [PATCH] [CORE][DB] Allow specifying the entites to be retrieved, as
 when using renaming, tables in join would attempt to be selected

---
 src/Core/DB/DB.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Core/DB/DB.php b/src/Core/DB/DB.php
index bce5513d8f..c71da70438 100644
--- a/src/Core/DB/DB.php
+++ b/src/Core/DB/DB.php
@@ -121,17 +121,19 @@ class DB
      * from table aliases to class names. Replaces '{select}' in
      * $query with the appropriate select list
      */
-    public static function sql(string $query, array $params = [])
+    public static function sql(string $query, array $params = [], ?array $entities = null)
     {
         if ($_ENV['APP_ENV'] === 'dev' && str_starts_with($query, 'select *')) {
             throw new Exception('Cannot use `select *`, use `select {select}` (see ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT)');
         }
-        $rsmb    = new ResultSetMappingBuilder(self::$em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT);
-        $matches = [];
-        preg_match_all(self::$table_entity_pattern, $query, $matches);
-        $entities = [];
-        foreach (F\zip($matches[1], $matches[2]) as [$table, $alias]) {
-            $entities[$alias] = self::$table_map[$table];
+        $rsmb = new ResultSetMappingBuilder(self::$em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT);
+        if (\is_null($entities)) {
+            $matches = [];
+            preg_match_all(self::$table_entity_pattern, $query, $matches);
+            $entities = [];
+            foreach (F\zip($matches[1], $matches[2]) as [$table, $alias]) {
+                $entities[$alias] = self::$table_map[$table];
+            }
         }
         foreach ($entities as $alias => $entity) {
             $rsmb->addRootEntityFromClassMetadata($entity, $alias);