diff --git a/CHANGELOG.md b/CHANGELOG.md index 44b0526a0..e4f1079b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +### 0.18.1 + +- fixing issue during migration. + + ### 0.18.0 (nc18) - compat nc18 diff --git a/Makefile b/Makefile index 3e5296256..ef6eb6c4b 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud branch=master -version+=0.18.0 +version+=0.18.1 all: appstore diff --git a/appinfo/info.xml b/appinfo/info.xml index 8b1e83e9f..b9eae989c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,7 +23,7 @@ Users won't be able to find this Circle using Nextcloud search engine. ]]> - 0.18.0 + 0.18.1 agpl Maxence Lange diff --git a/composer.lock b/composer.lock index 2b3736402..7ba3f0455 100644 --- a/composer.lock +++ b/composer.lock @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/daita/my-small-php-tools.git", - "reference": "23d37b41c4d492604e545c05e0d6abe35eb38cc0" + "reference": "688a627c2eed08042a09b50cab7171edde91de27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/23d37b41c4d492604e545c05e0d6abe35eb38cc0", - "reference": "23d37b41c4d492604e545c05e0d6abe35eb38cc0", + "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/688a627c2eed08042a09b50cab7171edde91de27", + "reference": "688a627c2eed08042a09b50cab7171edde91de27", "shasum": "" }, "require": { @@ -40,7 +40,7 @@ } ], "description": "My small PHP Tools", - "time": "2020-01-08T12:11:53+00:00" + "time": "2020-01-29T12:34:08+00:00" } ], "packages-dev": [], diff --git a/lib/Migration/Version0017Date20191206144441.php b/lib/Migration/Version0017Date20191206144441.php index 2a51d6405..e6a0502a1 100644 --- a/lib/Migration/Version0017Date20191206144441.php +++ b/lib/Migration/Version0017Date20191206144441.php @@ -124,7 +124,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt 'length' => 127, ] ); - $table->dropPrimaryKey(); + if ($table->hasPrimaryKey()) { + $table->dropPrimaryKey(); + } $table->setPrimaryKey(['circle_id', 'user_id', 'contact_id']); }