From df270adc945963a1e1498b2729d4c8633f8f10d1 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sat, 3 Jul 2021 15:45:48 -0700
Subject: [PATCH] Wrap call to dbapi.check_collection to prevent a forced API
 change.

---
 gramps/plugins/db/dbapi/dbapi.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/gramps/plugins/db/dbapi/dbapi.py b/gramps/plugins/db/dbapi/dbapi.py
index 007978b46..786562768 100644
--- a/gramps/plugins/db/dbapi/dbapi.py
+++ b/gramps/plugins/db/dbapi/dbapi.py
@@ -224,6 +224,16 @@ class DBAPI(DbGeneric):
         if self.transaction == None:
             self.dbapi.rollback()
 
+    def _collation(self, locale):
+        """
+        Get the adjusted collation if there is one, falling back on
+        the locale.collation.
+        """
+        collation = self.dbapi.check_collation(locale)
+        if collation == None:
+            return locale.collation
+        return collation
+
     def transaction_begin(self, transaction):
         """
         Transactions are handled automatically by the db layer.
@@ -366,7 +376,7 @@ class DBAPI(DbGeneric):
         if sort_handles:
             self.dbapi.execute('SELECT handle FROM person '
                                'ORDER BY surname '
-                               'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                               'COLLATE "%s"' % self._collation(locale))
         else:
             self.dbapi.execute("SELECT handle FROM person")
         rows = self.dbapi.fetchall()
@@ -397,7 +407,7 @@ class DBAPI(DbGeneric):
                    'THEN mother.given_name ' +
                    'ELSE father.given_name ' +
                    'END) ' +
-                   'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                   'COLLATE "%s"' % self._collation(locale))
             self.dbapi.execute(sql)
         else:
             self.dbapi.execute("SELECT handle FROM family")
@@ -426,7 +436,7 @@ class DBAPI(DbGeneric):
         if sort_handles:
             self.dbapi.execute('SELECT handle FROM citation '
                                'ORDER BY page '
-                               'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                               'COLLATE "%s"' % self._collation(locale))
         else:
             self.dbapi.execute("SELECT handle FROM citation")
         rows = self.dbapi.fetchall()
@@ -445,7 +455,7 @@ class DBAPI(DbGeneric):
         if sort_handles:
             self.dbapi.execute('SELECT handle FROM source '
                                'ORDER BY title '
-                               'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                               'COLLATE "%s"' % self._collation(locale))
         else:
             self.dbapi.execute("SELECT handle from source")
         rows = self.dbapi.fetchall()
@@ -464,7 +474,7 @@ class DBAPI(DbGeneric):
         if sort_handles:
             self.dbapi.execute('SELECT handle FROM place '
                                'ORDER BY title '
-                               'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                               'COLLATE "%s"' % self._collation(locale))
         else:
             self.dbapi.execute("SELECT handle FROM place")
         rows = self.dbapi.fetchall()
@@ -492,7 +502,7 @@ class DBAPI(DbGeneric):
         if sort_handles:
             self.dbapi.execute('SELECT handle FROM media '
                                'ORDER BY desc '
-                               'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                               'COLLATE "%s"' % self._collation(locale))
         else:
             self.dbapi.execute("SELECT handle FROM media")
         rows = self.dbapi.fetchall()
@@ -520,7 +530,7 @@ class DBAPI(DbGeneric):
         if sort_handles:
             self.dbapi.execute('SELECT handle FROM tag '
                                'ORDER BY name '
-                               'COLLATE "%s"' % self.dbapi.check_collation(locale))
+                               'COLLATE "%s"' % self._collation(locale))
         else:
             self.dbapi.execute("SELECT handle FROM tag")
         rows = self.dbapi.fetchall()