diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-12-11 15:58:51 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-12-11 15:59:11 +0000 |
| commit | 52c914aa8a597c5803e349c250ee9461f32f42cd (patch) | |
| tree | 4be2b28b729be0dace8c614f1d02283dbdd24883 /community/nextcloud | |
| parent | 0da55331ad5804b09aecb8f0f4aba358c4dc48de (diff) | |
| download | aports-52c914aa8a597c5803e349c250ee9461f32f42cd.tar.bz2 aports-52c914aa8a597c5803e349c250ee9461f32f42cd.tar.xz | |
community/nextcloud: fix update on PGSQL10
GH#5930
Diffstat (limited to 'community/nextcloud')
| -rw-r--r-- | community/nextcloud/APKBUILD | 4 | ||||
| -rw-r--r-- | community/nextcloud/postgresql10.patch | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD index 0d0c87da91..dd0b19e4ed 100644 --- a/community/nextcloud/APKBUILD +++ b/community/nextcloud/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> pkgname=nextcloud pkgver=12.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="A safe home for all your data" url="http://nextcloud.com" arch="noarch" @@ -25,6 +25,7 @@ source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip app-encryption-info-add-mcrypt.patch iconv-ascii-translit-not-supported.patch use-external-docs-if-local-not-avail.patch + postgresql10.patch $pkgname-config.php $pkgname.logrotate @@ -228,6 +229,7 @@ ec3921d4d463ed82be0be073af8064048a20f638424d1d39ab46db4252036e87ef2614570be91a5c 8d3cb1436aa79f1ac0a7b4b3370fcfb5c50dbe811e631cabcb8170fb80da5967a88a15bc39cd04eaccffb3177bdf90fcba2a512e28e034e16d6bc9b445d2d137 app-encryption-info-add-mcrypt.patch 9bd1cdb73928d8e746286a8ededf79262835caee8fdb4a18e117535ed95784b5a0b04fad55c720084dd8ae1ed4fe123be55b41d3100c9bb0333af485084bc4b1 iconv-ascii-translit-not-supported.patch 478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430 use-external-docs-if-local-not-avail.patch +98cc88b4c6f24c1704be3fc4eed61d702ea8c126f4a73e5d72e50f04b46d1196b31b7ef218b7392ba334a5af6dd44de21564e05185fba654482f56b97bfa8510 postgresql10.patch 89c941e2719629ee633421c4c75b55026c1a0a6b255e7f1f2c14612c10325045051b16dc5f17975af4a2a34ec187008de2eb15a53ac4cd06d26a5cbbd79fb73a nextcloud-config.php f224d72799ee5819979089eb58978225454223bee597c938681a4f6279eb49297fe9250ac54ccf8bcb33ae262bce43d085affb77723492ee662263710d4008c9 nextcloud.logrotate 35cf156839215113b5d8fb8842b4c1e19a50be3c16be7048879fdd808674e4875dbacf3e2dd884fd182258595b7a137d7d3c2dc602a7ff5613c8b65fae0abe67 nextcloud.confd diff --git a/community/nextcloud/postgresql10.patch b/community/nextcloud/postgresql10.patch new file mode 100644 index 0000000000..7b1a6f40be --- /dev/null +++ b/community/nextcloud/postgresql10.patch @@ -0,0 +1,20 @@ +--- a/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php.orig 2017-11-05 15:37:27.538064270 +0100 ++++ b/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php 2017-11-05 15:38:54.014644323 +0100 +@@ -289,7 +289,16 @@ + $sequenceName = $sequence['relname']; + } + +- $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName)); ++ $version = floatval($this->_conn->getWrappedConnection()->getServerVersion()); ++ ++ if ($version >= 10) { ++ $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM pg_sequences WHERE schemaname = \'public\' AND sequencename = '.$this->_conn->quote($sequenceName)); ++ } ++ else ++ { ++ $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName)); ++ } ++// $data = $this->_conn->fetchAll('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName)); + + return new Sequence($sequenceName, $data[0]['increment_by'], $data[0]['min_value']); + } |