Add support for Django 3.2

.travis.yml

@@ -30,6 +30,11 @@ matrix:
       env: TOXENV=py37-django31
     - python: "3.8"
       env: TOXENV=py38-django31
+    - python: "3.7"
+      env: TOXENV=py37-django32
+    - python: "3.8"
+      env: TOXENV=py38-django32
+
 
     # Linting
     - python: "3.8"

ldapdb/backends/ldap/compiler.py

@@ -15,7 +15,8 @@
 from ldapdb.models.fields import ListField
 
 _ORDER_BY_LIMIT_OFFSET_RE = re.compile(
-    r'(?:\bORDER BY\b\s+(.+?))?\s*(?:\bLIMIT\b\s+(-?\d+))?\s*(?:\bOFFSET\b\s+(\d+))?$')
+    r"(?:\bORDER BY\b\s+([\w\.]+)\s(?P<order>\bASC\b)|(\bDESC\b))\s{1,2}(?:\bLIMIT\b\s+(?P<limit>-?\d+))?[\)\s]?(?:\bOFFSET\b\s+(?P<offset>(\d+)))?"  # noqa: E501
+)
 
 
 class LdapDBError(Exception):
@@ -146,12 +147,13 @@ def execute_sql(self, result_type=compiler.SINGLE, chunked_fetch=False,
                 if hasattr(self.query, 'subquery') and self.query.subquery:
                     sql = self.query.subquery
                 m = _ORDER_BY_LIMIT_OFFSET_RE.search(sql)
-                limit = m.group(2)
-                offset = m.group(3)
-                if limit and int(limit) >= 0:
-                    output.append(int(limit))
-                elif offset:
-                    output.append(len(vals) - int(offset))
+                if m:
+                    limit = m.group('limit')
+                    offset = m.group('offset')
+                    if limit and int(limit) >= 0:
+                        output.append(int(limit))
+                    elif offset:
+                        output.append(len(vals) - int(offset))
                 else:
                     output.append(len(vals))
             else:
@@ -231,7 +233,7 @@ def get_key(obj):
                 if isinstance(e[0], aggregates.Count):
                     value = 0
                     input_field = e[0].get_source_expressions()[0].field
-                    if input_field.attname == 'dn':
+                    if input_field.get_attname() == 'dn':
                         value = 1
                     elif hasattr(input_field, 'from_ldap'):
                         result = input_field.from_ldap(
@@ -243,7 +245,7 @@ def get_key(obj):
                                 value = len(result)
                     row.append(value)
                 else:
-                    if e[0].field.attname == 'dn':
+                    if e[0].field.get_attname() == 'dn':
                         row.append(dn)
                     elif hasattr(e[0].field, 'from_ldap'):
                         row.append(e[0].field.from_ldap(

ldapdb/models/base.py

@@ -83,7 +83,7 @@ def _save_table(self, raw=False, cls=None, force_insert=None, force_update=None,
             ]
 
         def get_field_value(field, instance):
-            python_value = getattr(instance, field.attname)
+            python_value = getattr(instance, field.get_attname())
             return field.get_db_prep_save(python_value, connection=connection)
 
         if create:

ldapdb/tests.py

@@ -82,6 +82,7 @@ class WhereTestCase(TestCase):
     def _build_lookup(self, field_name, lookup, value, field=fields.CharField):
         fake_field = field()
         fake_field.set_attributes_from_name(field_name)
+        fake_field.contribute_to_class(FakeModel, "fake")
         lhs = expressions.Col('faketable', fake_field, fake_field)
         lookup = lhs.get_lookup(lookup)
         return lookup(lhs, value)
@@ -245,3 +246,32 @@ def test_or(self):
         where.add(self._build_lookup("cn", 'exact', "foo", field=fields.CharField), AND)
         where.add(self._build_lookup("givenName", 'exact', "bar", field=fields.CharField), OR)
         self.assertEqual(self._where_as_ldap(where), "(|(cn=foo)(givenName=bar))")
+
+
+class CompilerRegexTestCase(TestCase):
+
+    def _run_regex(self, sql):
+        match = ldapdb_compiler._ORDER_BY_LIMIT_OFFSET_RE.search(sql)
+        self.assertIsNotNone(match)
+        return match
+
+    def test_regex(self):
+        sql = "SELECT examples_ldapgroup.cn AS Col1 FROM examples_ldapgroup ORDER BY examples_ldapgroup.gidNumber ASC LIMIT 2"  # noqa: E501
+        match = self._run_regex(sql)
+        self.assertEqual(match.group('limit'), '2')
+        self.assertEqual(match.group('offset'), None)
+
+        sql = "SELECT COUNT(*) FROM (SELECT examples_ldapgroup.cn AS Col1 FROM examples_ldapgroup ORDER BY examples_ldapgroup.gidNumber ASC LIMIT 2) subquery"  # noqa: E501
+        match = self._run_regex(sql)
+        self.assertEqual(match.group('limit'), '2')
+
+        sql = "SELECT COUNT(*) FROM (SELECT examples_ldapgroup.cn AS Col1 FROM examples_ldapgroup ORDER BY examples_ldapgroup.gidNumber ASC LIMIT -1 OFFSET 1) subquery"  # noqa: E501
+        match = self._run_regex(sql)
+        self.assertEqual(match.group('limit'), '-1')
+        self.assertEqual(match.group('offset'), '1')
+
+    def test_regex_django22(self):
+        sql = "SELECT examples_ldapgroup.cn AS Col1 FROM examples_ldapgroup ORDER BY examples_ldapgroup.gidNumber ASC  LIMIT 2"  # noqa: E501
+        match = self._run_regex(sql)
+        self.assertEqual(match.group('limit'), '2')
+        self.assertEqual(match.group('offset'), None)

tox.ini

@@ -1,12 +1,13 @@
 [tox]
-envlist = py{36,37,38}-django{22,30,31}, lint
+envlist = py{36,37,38}-django{22,30,31,32}, lint
 
 [testenv]
 extras = dev
 deps =
     django22: Django>=2.2,<2.3
     django30: Django>=3.0,<3.1
     django31: Django>=3.1,<3.2
+    django32: Django>=3.2,<3.3
 
 whitelist_externals = make
 commands = make test