Skip to content

Backport/15129/stable14 #15140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 3 commits into from
Apr 30, 2019
Merged

Backport/15129/stable14 #15140

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23c4226
Repair step for link shares
rullzer Apr 15, 2019
a99a92b
Allow to use Subqueries in from
nickvergessen Apr 16, 2019
0784369
Use the querybuilder for the queries
nickvergessen Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use the querybuilder for the queries 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @rullzer
nickvergessen authored and rullzer committed Apr 17, 2019
commit 0784369790d8cedafd37a1d97c11ffbaeddb3672
83 changes: 49 additions & 34 deletions lib/private/Repair/RemoveLinkShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

use Doctrine\DBAL\Driver\Statement;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IGroupManager;
Expand Down Expand Up @@ -98,27 +99,35 @@ private function deleteShare($id) {
* @return int
*/
private function getTotal() {
$sql = 'SELECT COUNT(*) AS `total`
FROM `*PREFIX*share`
WHERE `id` IN (
SELECT `s1`.`id`
FROM (
SELECT *
FROM `*PREFIX*share`
WHERE `parent` IS NOT NULL
AND `share_type` = 3
) AS s1
JOIN `*PREFIX*share` AS s2
ON `s1`.`parent` = `s2`.`id`
WHERE (`s2`.`share_type` = 1 OR `s2`.`share_type` = 2)
AND `s1`.`item_source` = `s2`.`item_source`
)';
$cursor = $this->connection->executeQuery($sql);
$data = $cursor->fetchAll();
$total = (int)$data[0]['total'];
$cursor->closeCursor();

return $total;
$subSubQuery = $this->connection->getQueryBuilder();
$subSubQuery->select('*')
->from('share')
->where($subSubQuery->expr()->isNotNull('parent'))
->andWhere($subSubQuery->expr()->eq('share_type', $subSubQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));

$subQuery = $this->connection->getQueryBuilder();
$subQuery->select('s1.id')
->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
->join(
's1', 'share', 's2',
$subQuery->expr()->eq('s1.parent', 's2.id')
)
->where($subQuery->expr()->orX(
$subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(1, IQueryBuilder::PARAM_INT)),
$subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(2, IQueryBuilder::PARAM_INT))
))
->andWhere($subQuery->expr()->eq('s1.item_source', 's2.item_source'));

$query = $this->connection->getQueryBuilder();
$query->select($query->func()->count('*', 'total'))
->from('share')
->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));

$result = $query->execute();
$data = $result->fetch();
$result->closeCursor();

return (int) $data['total'];
}

/**
Expand All @@ -127,19 +136,25 @@ private function getTotal() {
* @return \Doctrine\DBAL\Driver\Statement
*/
private function getShares() {
$sql = 'SELECT `s1`.`id`, `s1`.`uid_owner`, `s1`.`uid_initiator`
FROM (
SELECT *
FROM `*PREFIX*share`
WHERE `parent` IS NOT NULL
AND `share_type` = 3
) AS s1
JOIN `*PREFIX*share` AS s2
ON `s1`.`parent` = `s2`.`id`
WHERE (`s2`.`share_type` = 1 OR `s2`.`share_type` = 2)
AND `s1`.`item_source` = `s2`.`item_source`';
$cursor = $this->connection->executeQuery($sql);
return $cursor;
$subQuery = $this->connection->getQueryBuilder();
$subQuery->select('*')
->from('share')
->where($subQuery->expr()->isNotNull('parent'))
->andWhere($subQuery->expr()->eq('share_type', $subQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));

$query = $this->connection->getQueryBuilder();
$query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
->join(
's1', 'share', 's2',
$query->expr()->eq('s1.parent', 's2.id')
)
->where($query->expr()->orX(
$query->expr()->eq('s2.share_type', $query->expr()->literal(1, IQueryBuilder::PARAM_INT)),
$query->expr()->eq('s2.share_type', $query->expr()->literal(2, IQueryBuilder::PARAM_INT))
))
->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
return $query->execute();
}

/**
Expand Down