vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #31523 from akhilnarang/set-mariadb-collation

Browse source 
fix(mariadb): set collation in connection
This commit is contained in:
Akhil Narang 2025-03-17 16:36:27 +05:30 • committed by GitHub
parent c83174d0bc
commit 4a04b0a17f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/database/mariadb/database.py
View file

@ -120,6 +120,7 @@ class MariaDBConnectionUtil:
"user": self.user,
"conv": self.CONVERSION_MAP,
"charset": "utf8mb4",
"collation": "utf8mb4_unicode_ci",
"use_unicode": True,
}
@ -319,7 +320,7 @@ class MariaDBDatabase(MariaDBConnectionUtil, MariaDBExceptionUtil, Database):
`doctype` VARCHAR(180) NOT NULL,
`data` TEXT,
UNIQUE(user, doctype)
) ENGINE=InnoDB DEFAULT CHARSET=utf8"""
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"""
)
@staticmethod

1
frappe/patches.txt
View file

@ -243,3 +243,4 @@ frappe.patches.v16_0.add_app_launcher_in_navbar_settings
frappe.desk.doctype.workspace.patches.update_app
frappe.patches.v16_0.move_role_desk_settings_to_user
frappe.printing.doctype.print_format.patches.sets_wkhtmltopdf_as_default_for_pdf_generator_field
frappe.patches.v14_0.fix_user_settings_collation

5
frappe/patches/v14_0/fix_user_settings_collation.py Normal file
View file

@ -0,0 +1,5 @@
import frappe
def execute():
frappe.db.sql("ALTER TABLE __UserSettings CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")