Update temp table handler to support utf8mb4 if that is the db collation #15992
Conversation
This file contains 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
|
(Standard links)
|
|
@eileenmcnaughton Can you please rebase? |
eileenmcnaughton
force-pushed
the
utf_temp
branch
from
e34c5cd to
b86601b
Compare
|
@mattwire done |
mattwire
reviewed
Jan 13, 2020
CRM/Utils/SQL/TempTable.php
Outdated
| } | ||
| $dbUTF = CRM_Core_BAO_SchemaHandler::getDBCollation(); | ||
| if (in_array($dbUTF, ['utf8_unicode_ci', 'utf8mb4_unicode_ci']) | ||
| &&in_array($dbUTF, ['utf8', 'utf8mb4'])) { |
There was a problem hiding this comment.
@eileenmcnaughton Please add a space after the &&
There was a problem hiding this comment.
@mattwire done
mattwire
added
the
merge ready
|
@eileenmcnaughton I've tested this and it's ok to merge once the very minor typo is addressed above. |
eileenmcnaughton
force-pushed
the
utf_temp
branch
from
b86601b to
25374ca
Compare
|
@mattwire so OK to merge now? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Overview
Update temp table handler to support utf8mb4 if that is the db collation
Before
When temp tables are created using utf8 - the default & always the case AFAIK it is always utf8
After
If the DB is set to a default of UTF8MB4 (e.g as a result of running #15969 ) then that is respected
Technical Details
This is an alternate approach to @mfb's approach of trying to move the hard-coding to utf8mb4. When I looked at @mfb's excellent conversion script I realised he was changing the DB default & I started to think the right way to handle charset was to ensure the DB defaults were being set and only override them when we need to. This will only override if the default is not set
Comments