update occ files:repair-tree command to also handle cases where the parent is -1 when it shouldn't be #39231
Conversation
…arent is -1 when it shouldn't be Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
requested review from
ArtificialOwl,
a team,
blizzz and
come-nc
and removed request for
a team
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| return 0; | ||
| } | ||
|
|
||
| private function repairParent(bool $fix, OutputInterface $output) { |
Check notice
Code scanning / Psalm
MissingReturnType Note
| 'fileid' => $row['fileid'], | ||
| 'parent' => $row['parent_id'], | ||
| ]); | ||
| $query->execute(); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| } | ||
| } | ||
|
|
||
| private function repairPaths(bool $fix, OutputInterface $output) { |
Check notice
Code scanning / Psalm
MissingReturnType Note
| )) | ||
| ->andWhere($query->expr()->neq('f.parent', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))); | ||
|
|
||
| return $query->execute()->fetchAll(); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| )) | ||
| ->andWhere($query->expr()->neq('f.parent', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))); | ||
|
|
||
| return $query->execute()->fetchAll(); |
Check notice
Code scanning / Psalm
PossiblyInvalidMethodCall Note
| return 0; | ||
| } | ||
|
|
||
| private function repairParent(bool $fix, OutputInterface $output) { |
There was a problem hiding this comment.
| private function repairParent(bool $fix, OutputInterface $output) { | |
| private function repairParent(bool $fix, OutputInterface $output): void { |
| 'fileid' => $row['fileid'], | ||
| 'parent' => $row['parent_id'], | ||
| ]); | ||
| $query->execute(); |
There was a problem hiding this comment.
| $query->execute(); | |
| $query->executeStatement(); |
| } | ||
|
|
||
| $query = $this->connection->getQueryBuilder(); | ||
| $query->update('filecache') | ||
| ->set('parent', $query->createParameter('parent')) | ||
| ->where($query->expr()->eq('fileid', $query->createParameter('fileid'))); |
There was a problem hiding this comment.
| } | |
| $query = $this->connection->getQueryBuilder(); | |
| $query->update('filecache') | |
| ->set('parent', $query->createParameter('parent')) | |
| ->where($query->expr()->eq('fileid', $query->createParameter('fileid'))); | |
| $query = $this->connection->getQueryBuilder(); | |
| $query->update('filecache') | |
| ->set('parent', $query->createParameter('parent')) | |
| ->where($query->expr()->eq('fileid', $query->createParameter('fileid'))); | |
| } |
The query is only used for fixing, no?
| } | ||
| } | ||
|
|
||
| private function repairPaths(bool $fix, OutputInterface $output) { |
There was a problem hiding this comment.
| private function repairPaths(bool $fix, OutputInterface $output) { | |
| private function repairPaths(bool $fix, OutputInterface $output): void { |
| )) | ||
| ->andWhere($query->expr()->neq('f.parent', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))); | ||
|
|
||
| return $query->execute()->fetchAll(); |
There was a problem hiding this comment.
| return $query->execute()->fetchAll(); | |
| return $query->executeQuery()->fetchAll(); |
| $query->expr()->eq('f.storage', 'p.storage') | ||
| )) | ||
| ->where($query->expr()->neq('f.path_hash', $query->createNamedParameter(md5('')))) | ||
| ->andWhere($query->expr()->eq('f.parent', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))); | ||
|
|
||
| return $query->execute()->fetchAll(); |
There was a problem hiding this comment.
| return $query->execute()->fetchAll(); | |
| return $query->executeQuery()->fetchAll(); |
skjnldsv
added
2. developing
items should only have a parent of
-1when the path is''. This adds some logic to determine the proper parent id to repair the invalid items.