Skip to content

Fix NC 33.0.0 compatibility, deprecated execute() method was removed #282

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

Open
michael-dev wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

Fix NC 33.0.0 compatibility, deprecated execute() method was removed #282

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Read the [documentation](https://github.com/nextcloud/user_external#readme) to l
<bugs>https://github.com/nextcloud/user_external/issues</bugs>
<repository type="git">https://github.com/nextcloud/user_external.git</repository>
<dependencies>
<nextcloud min-version="25" max-version="30" />
<nextcloud min-version="25" max-version="33" />
</dependencies>
</info>
16 changes: 8 additions & 8 deletions lib/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function deleteUser($uid) {
$query->delete('users_external')
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$query->execute();
$query->executeStatement();
return true;
}

Expand All @@ -67,7 +67,7 @@ public function getDisplayName($uid) {
->from('users_external')
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$result = $query->execute();
$result = $query->executeQuery();
$user = $result->fetch();
$result->closeCursor();

Expand Down Expand Up @@ -98,7 +98,7 @@ public function getDisplayNames($search = '', $limit = null, $offset = null) {
if ($offset) {
$query->setFirstResult($offset);
}
$result = $query->execute();
$result = $query->executeQuery();

$displayNames = [];
while ($row = $result->fetch()) {
Expand Down Expand Up @@ -127,7 +127,7 @@ public function getUsers($search = '', $limit = null, $offset = null) {
if ($offset) {
$query->setFirstResult($offset);
}
$result = $query->execute();
$result = $query->executeQuery();

$users = [];
while ($row = $result->fetch()) {
Expand Down Expand Up @@ -165,7 +165,7 @@ public function setDisplayName($uid, $displayName) {
->set('displayname', $query->createNamedParameter($displayName))
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$query->execute();
$query->executeStatement();

return true;
}
Expand All @@ -186,7 +186,7 @@ protected function storeUser($uid, $groups = []) {
'uid' => $query->createNamedParameter($uid),
'backend' => $query->createNamedParameter($this->backend),
]);
$query->execute();
$query->executeStatement();

if ($groups) {
$createduser = \OC::$server->getUserManager()->get($uid);
Expand All @@ -211,7 +211,7 @@ public function userExists($uid) {
->from('users_external')
->where($query->expr()->iLike('uid', $query->createNamedParameter($connection->escapeLikeParameter($uid))))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$result = $query->execute();
$result = $query->executeQuery();
$users = $result->fetchColumn();
$result->closeCursor();

Expand All @@ -229,7 +229,7 @@ public function countUsers() {
$query->select($query->func()->count('*', 'num_users'))
->from('users_external')
->where($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$result = $query->execute();
$result = $query->executeQuery();
$users = $result->fetchColumn();
$result->closeCursor();

Expand Down