As discussed in IRC, the directories and files under /installer/data/mysql/ have become a bit confusing and should be ratified. Initially, we should move the globally required and untranslatable sql files to into the /mandatory subdirectory (rather than having a scattering between the top level directory and the /mandatory one. We could perhaps also use prefixes to ensure order rather than requiring developers add the filenames into the array in C4::Installer.
We could also remove the .txt files I guess.
*** Bug 23948 has been marked as a duplicate of this bug. ***
Created attachment 105903 [details] [review] Bug 23895: Move installer file into the mandatory directory Prior to this patch we had a confusing situation, mandatory files were in both installer/data/mysql and installer/data/mysql/mandatory To make things clearer this patch move them all into the mandatory subdir. However kohastructure.sql stay in the "root" directory. Test plan: 1. Drop and recreate your DB and use the installer to populate the DB 2. Use the merge request code from misc4dev to test the reset_all alias 3. Still with the merge request from misc4dev checkout master (you can also try 19.11 and/or 19.05) and reset_all again => All the data from the SQL mandatory files must have been correctly inserted into the DB https://gitlab.com/joubu/koha-misc4dev/-/tree/issue_46 Note that this patch also remove the x flag for subtag_registry.sql
Created attachment 105904 [details] [review] Bug 23895: Move installer file into the mandatory directory Prior to this patch we had a confusing situation, mandatory files were in both installer/data/mysql and installer/data/mysql/mandatory To make things clearer this patch move them all into the mandatory subdir. However kohastructure.sql stay in the "root" directory. Test plan: 1. Drop and recreate your DB and use the installer to populate the DB 2. Use the merge request code from misc4dev to test the reset_all alias 3. Still with the merge request from misc4dev checkout master (you can also try 19.11 and/or 19.05) and reset_all again => All the data from the SQL mandatory files must have been correctly inserted into the DB https://gitlab.com/koha-community/koha-misc4dev/-/issues/46 Note that this patch also remove the x flag for subtag_registry.sql
Created attachment 111079 [details] [review] Bug 23895: Move installer file into the mandatory directory Prior to this patch we had a confusing situation, mandatory files were in both installer/data/mysql and installer/data/mysql/mandatory To make things clearer this patch move them all into the mandatory subdir. However kohastructure.sql stay in the "root" directory. Test plan: 1. Drop and recreate your DB and use the installer to populate the DB 2. Use the merge request code from misc4dev to test the reset_all alias 3. Still with the merge request from misc4dev checkout master (you can also try 19.11 and/or 19.05) and reset_all again => All the data from the SQL mandatory files must have been correctly inserted into the DB https://gitlab.com/koha-community/koha-misc4dev/-/issues/46 Note that this patch also remove the x flag for subtag_registry.sql Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nice one.. all works as expected after a trivial rebase. Signing off. Minor note: I'm not 100 sure all the mandatory files are in the right place.. I get the feeling that those with translatable strings should move to en/mandatory and be converted to yaml.. account_credit_types.sql for example. That was perhaps my mistake.. do you agree those should move and be converted? (I can do that in a followup bug)
(In reply to Martin Renvoize from comment #6) > Nice one.. all works as expected after a trivial rebase. > > Signing off. > > Minor note: I'm not 100 sure all the mandatory files are in the right > place.. I get the feeling that those with translatable strings should move > to en/mandatory and be converted to yaml.. account_credit_types.sql for > example. That was perhaps my mistake.. do you agree those should move and > be converted? (I can do that in a followup bug) I think we came to the conclusion that the descriptions are dealt with on template level, so a possible follow-up for these could be to remove the descriptions from the files to avoid further confusion.
Created attachment 111541 [details] [review] Bug 23895: Move installer file into the mandatory directory Prior to this patch we had a confusing situation, mandatory files were in both installer/data/mysql and installer/data/mysql/mandatory To make things clearer this patch move them all into the mandatory subdir. However kohastructure.sql stay in the "root" directory. Test plan: 1. Drop and recreate your DB and use the installer to populate the DB 2. Use the merge request code from misc4dev to test the reset_all alias 3. Still with the merge request from misc4dev checkout master (you can also try 19.11 and/or 19.05) and reset_all again => All the data from the SQL mandatory files must have been correctly inserted into the DB https://gitlab.com/koha-community/koha-misc4dev/-/issues/46 Note that this patch also remove the x flag for subtag_registry.sql Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for 20.11, thanks to everybody involved!
Created attachment 111624 [details] [review] Bug 23895: Fix check_sysprefs.t Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(In reply to Jonathan Druart from comment #10) > Created attachment 111624 [details] [review] [review] > Bug 23895: Fix check_sysprefs.t > > Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Pushed to master for 20.11.
enhancement will not be backported to 20.05.x