diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-11-05 10:50:53 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-11-09 12:28:17 +0100 |
| commit | 8027dcbc6f6b1653f5ebcf04b1862ac1e1f51d32 (patch) | |
| tree | 1bf182f477bfbead7b75ae14a8cd0fce5bb38ada /lib/private/legacy | |
| parent | 72545ffd07a07f142c9c18b3e4afc9ae1b5c8da2 (diff) | |
| download | nextcloud-server-8027dcbc6f6b1653f5ebcf04b1862ac1e1f51d32.tar.gz nextcloud-server-8027dcbc6f6b1653f5ebcf04b1862ac1e1f51d32.zip | |
Don't leave cursors open when tests fail
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/OC_DB_StatementWrapper.php | 9 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/private/legacy/OC_DB_StatementWrapper.php b/lib/private/legacy/OC_DB_StatementWrapper.php index 668e97c5650..64806cd205d 100644 --- a/lib/private/legacy/OC_DB_StatementWrapper.php +++ b/lib/private/legacy/OC_DB_StatementWrapper.php @@ -105,6 +105,15 @@ class OC_DB_StatementWrapper { } /** + * Closes the cursor, enabling the statement to be executed again. + * + * @deprecated Use Result::free() instead. + */ + public function closeCursor(): void { + $this->statement->closeCursor(); + } + + /** * Binds a PHP variable to a corresponding named or question mark placeholder in the * SQL statement that was use to prepare the statement. * diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 80e43a0514a..66d8d95b52d 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -983,6 +983,7 @@ class OC_Util { try { $result = \OC_DB::executeAudited('SHOW SERVER_VERSION'); $data = $result->fetchRow(); + $result->closeCursor(); if (isset($data['server_version'])) { $version = $data['server_version']; if (version_compare($version, '9.0.0', '<')) { |