You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
With the last upmerge from 4.4-dev there have been again added new 4.x update SQL scripts to the 5.0-dev branch.
These files should not be merged up.
This PR here fixes that by deleting the files and adding them to the list of deleted files in script.php so they are deleted when updating from 4.x like it is done with the other 4.x update SQL scripts.
Currently there are no other changes to be done on the deleted files and folders lists in script.php in the 5.0-dev branch.
Testing Instructions
Code review.
Or if you want to make a real test, update the last 4.4 nightly build to the last 5.0 nightly build to get the actual result, and update the last 4.4 nightly build to the update package built by Drone for this PR to get the expected result.
Actual result BEFORE applying this Pull Request
There are two 4.3.0 update SQL scripts present for each kind of database after updating from the last 4.4 nightly build.
Expected result AFTER applying this Pull Request
There are no 4.x update SQL scripts present after updating from the last 4.4 nightly build.
Link to documentations
Please select:
No documentation changes for docs.joomla.org needed
No documentation changes for manual.joomla.org needed
Ping @HLeithner . Question: Would it help to add the patterns administrator/components/com_admin/sql/updates/mysql/4.*.sql and administrator/components/com_admin/sql/updates/postgresql/4.*.sql to the .gitignore file so that any 4.x update SQL script would be ignored and also not included in builds? If yes and we add that, it would mean we have to change the .gitignore file with every new major version.
Ping @HLeithner . Question: Would it help to add the patterns administrator/components/com_admin/sql/updates/mysql/4.*.sql and administrator/components/com_admin/sql/updates/postgresql/4.*.sql to the .gitignore file so that any 4.x update SQL script would be ignored and also not included in builds? If yes and we add that, it would mean we have to change the .gitignore file with every new major version.
I think it's better to keep it as it is, because we need to delete the files in this script file anyway. Maybe a notice/warning/error in the build script could make sense.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request for Issue # .
Summary of Changes
With the last upmerge from 4.4-dev there have been again added new 4.x update SQL scripts to the 5.0-dev branch.
These files should not be merged up.
This PR here fixes that by deleting the files and adding them to the list of deleted files in script.php so they are deleted when updating from 4.x like it is done with the other 4.x update SQL scripts.
Currently there are no other changes to be done on the deleted files and folders lists in script.php in the 5.0-dev branch.
Testing Instructions
Code review.
Or if you want to make a real test, update the last 4.4 nightly build to the last 5.0 nightly build to get the actual result, and update the last 4.4 nightly build to the update package built by Drone for this PR to get the expected result.
Actual result BEFORE applying this Pull Request
There are two 4.3.0 update SQL scripts present for each kind of database after updating from the last 4.4 nightly build.
Expected result AFTER applying this Pull Request
There are no 4.x update SQL scripts present after updating from the last 4.4 nightly build.
Link to documentations
Please select:
No documentation changes for docs.joomla.org needed
No documentation changes for manual.joomla.org needed