Fixes some upgrader issues #7077
Conversation
Fixes SimpleMachines#7075 by adding the needed variable into the headers Fixes SimpleMachines#7070 by using the select method instead. If this introduces issues because we no longer check the client we can reintroduce that. This will conflict with SimpleMachines#7072 if it merges first. I changed the eval call to a closure instead. Easier to read and Syntax highlighting works in editors. I also added a sanity check to ensure the function exists.
There was a problem hiding this comment.
Good point made over on #7078 - we should apply the same version check changes to the installer.
Code looks good, though I could not test #7070 without a MariaDB.
I was able to confirm #7066 and #7075 are both addressed. I was able to run a variety of upgrades, via CLI & via browser, with & without backups, from 1.1 & 2.0, on small DBs and a larger forum (a copy of my prod forum). All went perfectly.
I needed to test this alongside #7076 since some of my test DBs have no PMs. So they work well together.
| @@ -2541,7 +2548,7 @@ function checkChange(&$change) | |||
| // Attempt to find a database_version. | |||
| if (empty($database_version)) | |||
| { | |||
| $database_version = $databases[$db_type]['version_check']; | |||
| $database_version = $databases[$db_type]['version_check'](); | |||
|
@sbulen Per #7078 i've synced up the installer. I don't have a working PG instance to test on right now to confirm I didn't break it. |
|
FYI, I have MariaDB so I can confirm the MariaDB specific changes are working as expected. |
|
I hope to do another set of tests tonight. I'd like to get this & #7076 in sooner rather than later. I have a pg test environment & will do a 2.0=>2.1 upgrade test there, also. |
|
this does fix the MariaDB issue, but i dont know if related to this or something else i am getting this error when running upgrade.php Notice: Undefined index: normalize in C:\wamp64\www\github2.1new\Sources\Subs.php on line 7598 Fatal error: Uncaught Error: Function name must be a string in C:\wamp64\www\github2.1new\Sources\Subs.php:7598 |
|
As it relates to normalize and the iri_to_url, I would say that would be @Sesquipedalian who recently merged a fix for that. |
Correct. Just do a quick merge of the latest from release-2.1 into this PR, @jdarwood007, and that error will go away. |
|
i had done an upgrade of my files to latest before i applied the changes here to upgrade.php, i still think there is an issue that needs to be fixed. anyone else able to duplicate the error i got? |
|
I've been testing this alongside #7076 for the last couple of days and it looks good. Lots of variants, including migrations from yabbse, smf 1.0, 1.1, 2.0 & 2.1. Some CLI, some browser. Some php7.4, some php8. I've even done PG installs & a PG 2.0=>2.1 upgrade. All good. I had a couple random quirky issues that I don't think were related to this PR, so they were logged separately. I did not encounter the issues Illori encountered above. Not sure why, but I haven't... I think this looks good & that #7076 & #7077 should go in asap so folks can test upgrades. |
|
i ran my test via cli on windows if that makes any difference. |
|
@Sesquipedalian Can you merge this? Its confirmed working, but I do try to avoid merging my own PRs. |
Fixes #7075 and #7066 by adding the needed variable into the headers
Fixes #7070 by using the select method instead. If this introduces issues because we no longer check the client we can reintroduce that.
Fixes #7060 by addressing that we need to use the function rather than string for the db version.
Fixes #7078 by making the changes the same in the installer
This will conflict with #7072 if it merges first. I changed the eval call to a closure instead. Easier to read and Syntax highlighting works in editors.
I also added a sanity check to ensure the function exists.