Prevent column name conflict between tables

Signed-off-by: Louis Chemineau <louis@chmn.me>

Author: artonge

lib/private/Share20/DefaultShareProvider.php

@@ -643,7 +643,7 @@ public function move(\OCP\Share\IShare $share, $recipient) {
 
 	public function getSharesInFolder($userId, Folder $node, $reshares) {
 		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
+		$qb->select('*', 's.permissions as permissions')
 			->from('share', 's')
 			->andWhere($qb->expr()->orX(
 				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
@@ -675,7 +675,7 @@ public function getSharesInFolder($userId, Folder $node, $reshares) {
 
 		$qb->orderBy('id');
 
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$shares = [];
 		while ($data = $cursor->fetch()) {
 			$shares[$data['fileid']][] = $this->createShare($data);