-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[4.0] Combine update SQL scripts to reduce their number #34139
[4.0] Combine update SQL scripts to reduce their number #34139
Conversation
Great stuff - did a quick look at some obvious things like the date of files and they all look good. |
PR is ready except of testing instructions and real test by myself. I will continue after dinner and mark it as ready for review later today. |
Ready for review and tests. |
3b38a39
to
6eb11f0
Compare
Wait, I will maybe update this to recent commits which have added new small update SQL scripts. |
Updated. Ready for test again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a review
Ok let’s get this in so it can be tested. Thankyou! |
Thanks. |
Pull Request for Issue # .
Summary of Changes
This pull request (PR) combines update SQL scripts to a lower number of scripts according to the following scheme, not combining scripts between different Beta versions, with content of scripts which are removed (marked with
(-)
) being moved forward to existing scripts marked with an(+)
.The order of SQL statements hasn't been changed.
In the remaining scripts where content of removed scripts has been moved to, a comment before the moved content shows from which script it was moved.
The obsolete scripts have been added to the list of files to be deleted in
script.php
. There is an additional change in that file for correcting alphabetical order.Here comes the scheme for combining the SQL scripts:
Testing Instructions
Test 1: Code review
Review the changes made by this PR regarding following aspects:
-- From ...
comments in the files where code is moved to are correct.script.php
, none is forgotten.Test 2: Update from 3.10
administrator/logs/joomla_update.php
somewhere outside the Joomla installation.You can find the links to the update URL or update package when following the link for the downloads atb the bottom of this PR:
administrator/logs/joomla_update.php
somewhere outside the Joomla installation at a different place or with a different name compared to step 3.Result: There are no differences beside the expected ones like e.g. different super user ID.
Result: There are no differences beside the time stamps and the names of the SQL scripts reported with the SQL statements. The order of SQL statements is the same.
Test 3: Update from a previous 4.0 Beta version
Same procedure as test 2, except that here any 4.0 Beta version is used as starting point.
Attention: When updating from a 4.0 Beta1, 2 or 3, it requires an additional SQL step to be executed e.g. in phpMyAdmin, see https://docs.joomla.org/J4.x:Upgrade_to_4.0_Beta_4 .
Actual result BEFORE applying this Pull Request
84 scripts for mysql and 85 for postgresql.
Expected result AFTER applying this Pull Request
25 scripts for mysql and 26 for postgresql.
=> 59 scripts less than before for each database type.
Update from 3.10 or from previous 4.0 Beta versions works same as before (including the necessary additional SQL step for updating from 4.0 Beta 2, 2 or 3 described here https://docs.joomla.org/J4.x:Upgrade_to_4.0_Beta_4 ).
The result in database of an update with this PR is the same as without this PR.
The obsolete update scripts are deleted after an update.
Documentation Changes Required
None.