upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Prevent column name conflict between tables

Browse source 
Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Louis Chemineau 2022-03-31 11:38:26 +02:00 committed by Louis (Rebase PR Action)
parent 8ca910976d
commit ce7b6ffed2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Share20/DefaultShareProvider.php
View file

@ -643,7 +643,10 @@ class DefaultShareProvider implements IShareProvider {
public function getSharesInFolder($userId, Folder $node, $reshares) {
$qb = $this->dbConn->getQueryBuilder();
$qb->select('*')
$qb->select('s.*',
'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum')
->from('share', 's')
->andWhere($qb->expr()->orX(
$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),