@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string $wrongPath wrong path of the entry to fix |
98 | 98 | * @param int $correctStorageNumericId numeric idea of the correct storage |
99 | 99 | * @param string $correctPath value to which to set the path of the entry |
100 | - * @return bool true for success |
|
100 | + * @return boolean|null true for success |
|
101 | 101 | */ |
102 | 102 | private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorageNumericId, $correctPath) { |
103 | 103 | // delete target if exists |
@@ -122,6 +122,9 @@ discard block |
||
122 | 122 | $out->advance(1, $text); |
123 | 123 | } |
124 | 124 | |
125 | + /** |
|
126 | + * @param IQueryBuilder $qb |
|
127 | + */ |
|
125 | 128 | private function addQueryConditionsParentIdWrongPath($qb) { |
126 | 129 | // thanks, VicDeo! |
127 | 130 | if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) { |
@@ -161,6 +164,9 @@ discard block |
||
161 | 164 | } |
162 | 165 | } |
163 | 166 | |
167 | + /** |
|
168 | + * @param IQueryBuilder $qb |
|
169 | + */ |
|
164 | 170 | private function addQueryConditionsNonExistingParentIdEntry($qb, $storageNumericId = null) { |
165 | 171 | // Subquery for parent existence |
166 | 172 | $qbe = $this->connection->getQueryBuilder(); |
@@ -190,6 +196,9 @@ discard block |
||
190 | 196 | } |
191 | 197 | } |
192 | 198 | |
199 | + /** |
|
200 | + * @param integer $storageNumericId |
|
201 | + */ |
|
193 | 202 | private function countResultsToProcessParentIdWrongPath($storageNumericId = null) { |
194 | 203 | $qb = $this->connection->getQueryBuilder(); |
195 | 204 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -200,6 +209,9 @@ discard block |
||
200 | 209 | return $count; |
201 | 210 | } |
202 | 211 | |
212 | + /** |
|
213 | + * @param integer $storageNumericId |
|
214 | + */ |
|
203 | 215 | private function countResultsToProcessNonExistingParentIdEntry($storageNumericId = null) { |
204 | 216 | $qb = $this->connection->getQueryBuilder(); |
205 | 217 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -350,6 +362,7 @@ discard block |
||
350 | 362 | * |
351 | 363 | * @param int $storageId storage id |
352 | 364 | * @param string $path path for which to create the parent entry |
365 | + * @param integer $reuseFileId |
|
353 | 366 | * @return int file id of the newly created parent |
354 | 367 | */ |
355 | 368 | private function getOrCreateEntry($storageId, $path, $reuseFileId = null) { |
@@ -22,7 +22,6 @@ |
||
22 | 22 | namespace OC\Repair; |
23 | 23 | |
24 | 24 | use Doctrine\DBAL\Platforms\PostgreSqlPlatform; |
25 | -use OCP\DB\QueryBuilder\IQueryBuilder; |
|
26 | 25 | use OCP\Migration\IOutput; |
27 | 26 | use OCP\Migration\IRepairStep; |
28 | 27 | use Doctrine\DBAL\Platforms\MySqlPlatform; |