Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protect SQLite3 locale from old-style Unicode locale characters.

Browse Source 
PySQLite3 requires that collation names have only ascii alphanumerics
and _. ICU locales use old-style Unicode specifiers and passing them to
create_locale will raise an exception. Translate those characters into
underscores.

Fixes #11639
This commit is contained in:
John Ralls 2020-04-01 08:24:39 -07:00
parent 51f2052cfe
commit eb1b4c1eb5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/plugins/db/dbapi/sqlite.py
View File

@ -101,6 +101,7 @@ class Connection:
self.__cursor = self.__connection.cursor()
self.__connection.create_function("regexp", 2, regexp)
self.__collations = []
self.__tmap = str.maketrans('-.@=;', '_____')
self.check_collation(glocale)
def check_collation(self, locale):
@ -110,7 +111,10 @@ class Connection:
:param locale: Locale to be checked.
:param type: A GrampsLocale object.
"""
collation = locale.get_collation()
#PySQlite3 permits only ascii alphanumerics and underscores in
#collation names so first translate any old-style Unicode locale
#delimiters to underscores.
collation = locale.get_collation().translate(self.__tmap)
if collation not in self.__collations:
self.__connection.create_collation(collation, locale.strcoll)