upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #45629 from nextcloud/enh/noid/remove-workaround-pqsql-94

Browse source 
feat(db): remove workaround for pqsql 9.4 and older
This commit is contained in:
Daniel 2024-06-03 22:51:00 +02:00 committed by GitHub
commit b4467bfa4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/private/DB/AdapterPgSql.php
View file

@ -8,7 +8,6 @@
namespace OC\DB;
class AdapterPgSql extends Adapter {
protected $compatModePre9_5 = null;
public function lastInsertId($table) {
$result = $this->conn->executeQuery('SELECT lastval()');
@ -25,10 +24,6 @@ class AdapterPgSql extends Adapter {
}
public function insertIgnoreConflict(string $table, array $values) : int {
if ($this->isPre9_5CompatMode() === true) {
return parent::insertIgnoreConflict($table, $values);
}
// "upsert" is only available since PgSQL 9.5, but the generic way
// would leave error logs in the DB.
$builder = $this->conn->getQueryBuilder();
@ -39,17 +34,4 @@ class AdapterPgSql extends Adapter {
$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
}
protected function isPre9_5CompatMode(): bool {
if ($this->compatModePre9_5 !== null) {
return $this->compatModePre9_5;
}
$result = $this->conn->executeQuery('SHOW SERVER_VERSION');
$version = $result->fetchOne();
$result->free();
$this->compatModePre9_5 = version_compare($version, '9.5', '<');
return $this->compatModePre9_5;
}
}