8000 fix(mariadb): set collation in connection (backport #31523) by mergify[bot] · Pull Request #31766 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(mariadb): set collation in connection (backport #31523) #31766

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

Merged
merged 2 commits into from
Mar 18, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Mar 17, 2025

Resolves #29882


This is an automatic backport of pull request #31523 done by [Mergify](https://mergify.com).

fix(mariadb): set collation in connection

(cherry picked from commit 4a04b0a)

# Conflicts:
#	frappe/patches.txt
Copy link
Contributor Author
mergify bot commented Mar 17, 2025

Cherry-pick of 4a04b0a has failed:

On branch mergify/bp/version-15-hotfix/pr-31523
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 4a04b0a17f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/database/mariadb/database.py
	new file:   frappe/patches/v14_0/fix_user_settings_collation.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@akhilnarang akhilnarang enabled auto-merge (squash) March 18, 2025 06:27
@akhilnarang akhilnarang merged commit e81b912 into version-15-hotfix Mar 18, 2025
17 checks passed
@akhilnarang akhilnarang deleted the mergify/bp/version-15-hotfix/pr-31523 branch March 18, 2025 06:42
akhilnarang added a commit that referenced this pull request Mar 18, 2025
…n-15

* upstream/version-15-hotfix: (41 commits)
  fix: Kanban view link draggable issue
  fix(mariadb): set collation in connection (backport #31523) (#31766)
  fix: sync translations from crowdin (#31659)
  refactor: hide sidebar (backport #29061) (#29865)
  ci: ignore "skip-release-notes" when generating release notes (#31656) (#31658)
  fix(UX): Show reason for read only form in headline
  refactor: fix conflicts
  refactor: change text of crm and links
  style: remove space
  refactor: remove not used condition
  feat: show helpdesk and crm banner on sidebar
  fix: return 1 or 0 instead of boolean for `is_fc_site` boot data (#31753) (#31754)
  fix: give prority to user setting on sorting
  fix(user): make attachments in email signature public (#31752)
  fix: resolve conflicts
  perf: `doc.permitted_fieldnames` is now a set
  perf: improve `get_permitted_fields` logic
  perf: remove repeated calls to `get_permitted_fieldnames`
  fix: Encode filters to handle special characters
  fix: confirm before removing attachment on clear button in attach control
  ...
frappe-pr-bot pushed a commit that referenced this pull request Mar 18, 2025
# [15.59.0](v15.58.1...v15.59.0) (2025-03-18)

### Bug Fixes

* always persist all indexes added via db.add_index ([#31177](#31177)) ([#31712](#31712)) ([243aedd](243aedd))
* avoid overriding saved list filters ([#31699](#31699)) ([#31702](#31702)) ([7a2d447](7a2d447))
* **awesomebar:** sanitise text when searching in list views ([11036f8](11036f8))
* confirm before removing attachment on clear button in attach control ([9ce73e3](9ce73e3))
* don't generate type information for virtual fields ([#31592](#31592)) ([72c7635](72c7635))
* Encode filters to handle special characters ([39d2d53](39d2d53))
* give prority to user setting on sorting ([fe4286d](fe4286d))
* increase length for value field in sms parameter (backport [#31692](#31692)) ([#31695](#31695)) ([93659d4](93659d4))
* Kanban view link draggable issue ([90d5e75](90d5e75))
* **mariadb:** set collation in connection (backport [#31523](#31523)) ([#31766](#31766)) ([e81b912](e81b912))
* Merge conflicts ([47a1a84](47a1a84))
* option to opt out of automatic filters (backport [#31678](#31678)) ([#31680](#31680)) ([1aded5e](1aded5e))
* report header not translated ([7cbd9c5](7cbd9c5))
* **report:** show add_total_row checkbox if report_type is not 'Report Builder' ([4b17a84](4b17a84))
* resolve conflicts ([85ed247](85ed247))
* return 1 or 0 instead of boolean for `is_fc_site` boot data ([#31753](#31753)) ([#31754](#31754)) ([3129e61](3129e61))
* Round of rate limit to seconds ([#31674](#31674)) ([#31686](#31686)) ([0d2ab34](0d2ab34))
* support "Timespan" in `evaluate_filters` ([#31190](#31190)) ([#31709](#31709)) ([0e50235](0e50235))
* sync translations from crowdin ([#31659](#31659)) ([17617fa](17617fa))
* Translate link fields in Webform ([c7dc6c0](c7dc6c0))
* Translate names if "Translate Link Fields" is enabled ([cd6b821](cd6b821))
* Use DOMParser in `is_html` + Handle unparsable html string with jquery ([a4bae9b](a4bae9b))
* Use jQuery.text() instead of  xss_sanitise ([603441a](603441a))
* **user:** make attachments in email signature public ([#31752](#31752)) ([8a94bbe](8a94bbe))
* **user:** stricter name validation (backport [#31679](#31679)) ([#31701](#31701)) ([a12de55](a12de55))
* **UX:** Show reason for read only form in headline ([6129eb7](6129eb7))

### Features

* show helpdesk and crm banner on sidebar ([7441dd6](7441dd6))

### Performance Improvements

* `doc.permitted_fieldnames` is now a set ([0af6946](0af6946))
* generate auto email reports in background ([f7798a0](f7798a0))
* improve `get_permitted_fields` logic ([e681195](e681195))
* remove repeated calls to `get_permitted_fieldnames` ([ad9aafa](ad9aafa))

### Reverts

* "fix(UX): Show reason for read only form in headline ([#31511](#31511))" (backport [#31669](#31669)) ([1a16a2b](1a16a2b))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.59.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0