Skip to content
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.

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

instead of upsert query, fallback to default on PSQL <= 9.4 #16572

Merged
merged 1 commit into from
Aug 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 22 additions & 1 deletion lib/private/DB/AdapterPgSql.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()');
}
Expand All @@ -40,12 +44,29 @@ public function fixupStatement($statement) {
* @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;
}
}
4 changes: 2 additions & 2 deletions lib/private/legacy/util.php
Original file line number Diff line number Diff line change
Expand Up @@ -978,9 +978,9 @@ public static function checkDatabaseVersion() {
$data = $result->fetchRow();
if (isset($data['server_version'])) {
$version = $data['server_version'];
if (version_compare($version, '9.5.0', '<')) {
if (version_compare($version, '9.0.0', '<')) {
$errors[] = array(
'error' => $l->t('PostgreSQL >= 9.5 required'),
'error' => $l->t('PostgreSQL >= 9 required'),
'hint' => $l->t('Please upgrade your database version')
);
}
Expand Down