Skip to content

Commit 1888162

Browse files
ArtificialOwlbackportbot[bot]
authored andcommitted
cleaner migration, fix sync --uninstall
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
1 parent 02521a4 commit 1888162

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Db/CoreRequestBuilder.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ public function uninstallAppTables() {
296296
public function uninstallFromMigrations() {
297297
$qb = $this->getQueryBuilder();
298298
$qb->delete('migrations');
299-
$qb->limitToDBField('app', 'circles');
299+
$qb->limit('app', 'circles');
300+
$qb->unlike('version', '001%');
300301

301302
$qb->execute();
302303
}

lib/Service/MigrationService.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ private function migrationTo22_Circles(): void {
227227
try {
228228
$data = new SimpleDataStore($row);
229229
$this->outputService->output(
230-
'Migrating Circle \'' . $data->g('name') . '\'',
230+
'Migrating Circle \'' . $data->g('name') . '\' (' . $data->g('unique_id') . ')',
231231
true
232232
);
233233

@@ -331,7 +331,8 @@ private function migrationTo22_Members(): void {
331331
try {
332332
$data = new SimpleDataStore($row);
333333
$this->outputService->output(
334-
'Migrating Member \'' . $data->g('user_id') . '\'',
334+
'Migrating Member \'' . $data->g('user_id') . '\' from \'' . $data->g('circle_id')
335+
. '\'',
335336
true
336337
);
337338

0 commit comments

Comments
 (0)