[#40372] - [5.0] Delete 4.x update SQL scripts from last upmerge and add them to deleted files list in script.php
- Fixed in Code Base
- 12 Apr 2023
- Medium
- Build: 5.0-dev
- # 40372
- Diff
- richard67:5.0-dev-deleted-files-and-folders_2023-04-12
- Pending continuous-integration/drone/pr Build is pending Details
User tests: Successful: Unsuccessful:
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
joomla-cms-bot
- | Category | ⇒ | Administration com_admin SQL Postgresql |
| Status | New | ⇒ | Pending |
Ping @HLeithner . Question: Would it help to add the patterns
administrator/components/com_admin/sql/updates/mysql/4.*.sqlandadministrator/components/com_admin/sql/updates/postgresql/4.*.sqlto 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.
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2023-04-12 12:28:46 |
| Closed_By | ⇒ | HLeithner | |
| Labels |
Added:
PR-5.0-dev
|
||
Ping @HLeithner . Question: Would it help to add the patterns
administrator/components/com_admin/sql/updates/mysql/4.*.sqlandadministrator/components/com_admin/sql/updates/postgresql/4.*.sqlto 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.