Skip to content

Fix testing app for oracle #23

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
PVince81 merged 1 commit into from
Sep 10, 2018
Merged

Fix testing app for oracle #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions lib/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,11 @@ public function __construct(array $urlParams = []) {
$userManager->clearBackends();
$userManager->registerBackend($c->query(AlternativeHomeUserBackend::class));

$userManager->listen('\OC\User', 'postCreateUser', function ($user, $password) use ($c) {

@PVince81 PVince81 Sep 7, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this is only for fixing Oracle, I don't see why the code has been moved outside of the "postCreateUser" hook instead of just changing the literal

@patrickjahns patrickjahns Sep 7, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was from TM patch

What's the intention of this postCreateUser here?

@PVince81 PVince81 Sep 10, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I added this back then to delay updating the accounts table to after the admin user got created, because in some cases it would happen too early. Not sure if this time we got lucky or other core changes would remove the need for this.

If this doesn't break acceptance tests on core then I'm fine keeping it this way.

@patrickjahns patrickjahns Sep 10, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://drone.owncloud.com/owncloud/core/10273 - acceptance tests are all green

$q = $c->getServer()->getDatabaseConnection()->getQueryBuilder();
$q->update('*PREFIX*accounts')
->set('backend', $q->expr()->literal(AlternativeHomeUserBackend::class))
->where($q->expr()->eq('user_id', $q->createNamedParameter($user->getUID())))
->execute();
});

// first call must adjust all existing backends
if ($config->getAppValue($appName, 'updated_all', 'no') === 'no') {
$q = $c->getServer()->getDatabaseConnection()->getQueryBuilder();
$q->update('*PREFIX*accounts')
->set('backend', $q->expr()->literal(AlternativeHomeUserBackend::class))
->set('backend', $q->createNamedParameter(AlternativeHomeUserBackend::class))
->where($q->expr()->eq('backend', $q->createNamedParameter(\OC\User\Database::class)))
->execute();

Expand Down