This is a mix of Nick's patch and Jonathan's comment on it. I tested it
with KTD using MySQL 8 and it works correctly.
To test:
1. Launch KTD with bells and whistles:
$ docker compose -f docker-compose.yml \
-f docker-compose.mysql8.0.yml \
up -d
2. Inside of it, do:
$ koha-mysql kohadev
> update systempreferences set value="21.1200015" where variable="version";
> \q
$ restart_all
$ updatedatabase
=> SUCCESS: All good :-D
3. Run:
$ koha-mysql kohadev
> update systempreferences set value="21.1200015" where variable="version";
> ALTER TABLE user_permissions DROP PRIMARY KEY;
> \q
$ updatedatabase
=> FAIL: You get:
Upgrade to 21.12.00.016 [12:47:09]: Bug 30060 - Update user_permissions to add primary key and remove null option from code column
ERROR - {UNKNOWN}: DBI Exception: DBD::mysql::db do failed: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IF EXISTS `PRIMARY`' at line 1 at /kohadevbox/koha/C4/Installer.pm line 739
4. Apply this patch
5. Run:
$ updatedatabase
=> SUCCESS: Update goes well
6. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Replace DROP CONSTRAINT by DROP FOREIGN KEY.
Note: It seems that we do not need a new dbrev for master. A developer
could follow test plan below to correct if really needed.
Test plan:
NOTE: When you check show create table, verify that you see an index for category_code and a foreign key called borrower_attribute_types_ibfk_1.
[1] cp installer/data/mysql/db_revs/211200041.pl installer/data/mysql/atomicupdate/
[2] run updatedatabase; check show create table
[3] alter table borrower_attribute_types drop foreign key borrower_attribute_types_ibfk_1; alter table borrower_attribute_types drop index category_code; RUN updatedatabase again; check show create table
[4] alter table borrower_attribute_types drop foreign key borrower_attribute_types_ibfk_1; ALTER TABLE borrower_attribute_types ADD CONSTRAINT category_code_fk FOREIGN KEY (category_code) REFERENCES categories(categorycode); RUN updatedatabase again; check show create table
[5] rm installer/data/atomicupdate/211200041.pl
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
The road of excess
leads to the palace of wisdom;
for we never know what is enough
until we know what is more than enough.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
When a recall triggers a branch transfer, the reason for the transfer is
'Recall'.
When a transfer is cancelled that was triggered by a recall, depending
on where it is cancelled, will use the 'Manual' or 'CancelRecall'
cancellation reasons.
This patch ensures branchtransfers.cancellation_reason adds 'CancelRecall',
and branchtransfers.reason adds 'Recall' as options.
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
