From 80e67120b95321550f34f36fe65587f61b2ad9c5 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 25 Jul 2019 18:39:28 +0200
Subject: [PATCH] FEAT #11296 TIME 0:10 Left join folders
---
src/app/folder/models/FolderModelAbstract.php | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/app/folder/models/FolderModelAbstract.php b/src/app/folder/models/FolderModelAbstract.php
index 1e08a64ac0c..a6c6bf40ef6 100755
--- a/src/app/folder/models/FolderModelAbstract.php
+++ b/src/app/folder/models/FolderModelAbstract.php
@@ -124,15 +124,11 @@ class FolderModelAbstract
{
ValidatorModel::arrayType($args, ['select', 'where', 'data']);
- $where = ['folders.id = entities_folders.folder_id', 'folders.id = resources_folders.folder_id'];
- if (!empty($args['where'])) {
- $where = array_merge($where, $args['where']);
- }
-
$folders = DatabaseModel::select([
'select' => empty($args['select']) ? ['*'] : $args['select'],
- 'table' => ['folders, entities_folders, resources_folders'],
- 'where' => $where,
+ 'table' => ['folders', 'entities_folders', 'resources_folders'],
+ 'left_join' => ['folders.id = entities_folders.folder_id', 'folders.id = resources_folders.folder_id'],
+ 'where' => empty($args['where']) ? [] : $args['where'],
'data' => empty($args['data']) ? [] : $args['data']
]);
--
GitLab