diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-10-05 16:31:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-05 16:31:24 +0300 |
commit | 9c3bfc7166ef391b96ffc6a3b3daece6ca9ab72e (patch) | |
tree | e2e552e0885096f9a694d81027d315518715c3ba | |
parent | ba25fe84e09dc5a47125939c3fcad11601a573da (diff) | |
parent | f9fdc641f3d57e55f529c799845d7db1fab5176e (diff) |
Merge pull request #16814 from nextcloud/backport/16572/stable16
[stable16] instead of upsert query, fallback to default on PSQL <= 9.4
-rw-r--r-- | lib/private/DB/AdapterPgSql.php | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php index af1978d051c..42e57cd45f7 100644 --- a/lib/private/DB/AdapterPgSql.php +++ b/lib/private/DB/AdapterPgSql.php @@ -24,7 +24,11 @@ namespace OC\DB; +use Doctrine\DBAL\DBALException; + class AdapterPgSql extends Adapter { + protected $compatModePre9_5 = null; + public function lastInsertId($table) { return $this->conn->fetchColumn('SELECT lastval()'); } @@ -40,12 +44,29 @@ class AdapterPgSql extends Adapter { * @suppress SqlInjectionChecker */ 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->insert($table); - foreach($values as $key => $value) { + foreach ($values as $key => $value) { $builder->setValue($key, $builder->createNamedParameter($value)); } $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; + } + + $version = $this->conn->fetchColumn('SHOW SERVER_VERSION'); + $this->compatModePre9_5 = version_compare($version, '9.5', '<'); + + return $this->compatModePre9_5; + } } |