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

instead of upsert, fallback to default query on PgSQL <= 9.4 

because there is no upsert yet

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2019-07-31 00:53:20 +02:00 committed by Roeland Jago Douma
parent d60bd93641
commit d0409548c6
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 24 additions and 3 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;
}
} }

4
lib/private/legacy/util.php
View File

@ -978,9 +978,9 @@ class OC_Util {
$data = $result->fetchRow(); $data = $result->fetchRow();
if (isset($data['server_version'])) { if (isset($data['server_version'])) {
$version = $data['server_version']; $version = $data['server_version'];
if (version_compare($version, '9.5.0', '<')) { if (version_compare($version, '9.0.0', '<')) {
$errors[] = array( $errors[] = array(
'error' => $l->t('PostgreSQL >= 9.5 required'), 'error' => $l->t('PostgreSQL >= 9 required'),
'hint' => $l->t('Please upgrade your database version') 'hint' => $l->t('Please upgrade your database version')
); );
} }