mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16814 from nextcloud/backport/16572/stable16 

[stable16] instead of upsert query, fallback to default on PSQL <= 9.4
This commit is contained in:
Roeland Jago Douma 2019-10-05 15:31:24 +02:00 committed by GitHub
parent ba25fe84e0 f9fdc641f3
commit 9c3bfc7166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/private/DB/AdapterPgSql.php
View File

@ -24,7 +24,11 @@
namespace OC\DB; namespace OC\DB;
use Doctrine\DBAL\DBALException;
class AdapterPgSql extends Adapter { class AdapterPgSql extends Adapter {
protected $compatModePre9_5 = null;
public function lastInsertId($table) { public function lastInsertId($table) {
return $this->conn->fetchColumn('SELECT lastval()'); return $this->conn->fetchColumn('SELECT lastval()');
} }
@ -40,12 +44,29 @@ class AdapterPgSql extends Adapter {
* @suppress SqlInjectionChecker * @suppress SqlInjectionChecker
*/ */
public function insertIgnoreConflict(string $table,array $values) : int { 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(); $builder = $this->conn->getQueryBuilder();
$builder->insert($table); $builder->insert($table);
foreach($values as $key => $value) { foreach ($values as $key => $value) {
$builder->setValue($key, $builder->createNamedParameter($value)); $builder->setValue($key, $builder->createNamedParameter($value));
} }
$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING'; $queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes()); return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
} }
protected function isPre9_5CompatMode(): bool {
if($this->compatModePre9_5 !== null) {
return $this->compatModePre9_5;
}
$version = $this->conn->fetchColumn('SHOW SERVER_VERSION');
$this->compatModePre9_5 = version_compare($version, '9.5', '<');
return $this->compatModePre9_5;
}
} }