Code formatting, doc updates, CI updates

Author: dcwatson

.github/workflows/ci.yml

@@ -27,14 +27,10 @@ jobs:
       fail-fast: false
       matrix:
         django-version: ["4.2", "5.0", "5.1"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         exclude:
-          - python-version: "3.8"
-            django-version: "5.0"
           - python-version: "3.9"
             django-version: "5.0"
-          - python-version: "3.8"
-            django-version: "5.1"
           - python-version: "3.9"
             django-version: "5.1"
     steps:

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 3.0.2
 
 * Added `Encrypt` and `Decrypt` Django functions (https://github.com/dcwatson/django-pgcrypto/pull/36)
+* Added `contains`, `icontains`, `startswith`, `istartswith`, `endswith`, and `iendswith` filter support (https://github.com/dcwatson/django-pgcrypto/pull/37)
 
 
 ## 3.0.1

README.md

@@ -32,7 +32,7 @@ You must also make sure the pgcrypto extension is installed in your database. Dj
 
 ## Querying
 
-It is possible to filter on encrypted fields as you would normal fields via `exact`, `gt`, `gte`, `lt`, and `lte` lookups. For example, querying the model above is possible like so:
+It is possible to filter on encrypted fields as you would normal fields via `exact`, `gt`, `gte`, `lt`, `lte`, `contains`, `icontains`, `startswith`, `istartswith`, `endswith`, and `iendswith` lookups. For example, querying the model above is possible like so:
 
 ```python
 Employee.objects.filter(date_hired__gt="1981-01-01", salary__lt=60000)

pgcrypto/fields.py

@@ -285,7 +285,8 @@ def as_postgresql(self, qn, connection):
             )
         field_internal_type = self.lhs.output_field.get_internal_type()
         field_sql = (
-            connection.ops.lookup_cast(self.lookup_name, field_internal_type) % field_sql
+            connection.ops.lookup_cast(self.lookup_name, field_internal_type)
+            % field_sql
         )
 
         if (
@@ -294,9 +295,9 @@ def as_postgresql(self, qn, connection):
             and rhs_params
             and not self.bilateral_transforms
         ):
-            rhs_params[0] = self.patterns[self.lookup_name] % connection.ops.prep_for_like_query(
-                rhs_params[0]
-            )
+            rhs_params[0] = self.patterns[
+                self.lookup_name
+            ] % connection.ops.prep_for_like_query(rhs_params[0])
 
         return (
             "%s%s %s"
@@ -317,7 +318,19 @@ class EncryptedInLookup(FieldGetDbPrepValueIterableMixin, EncryptedLookup):
     lookup_name = "in"
 
 
-for lookup_name in ("exact", "gt", "gte", "lt", "lte", 'contains', 'icontains', 'startswith', 'istartswith', 'endswith', 'iendswith'):
+for lookup_name in (
+    "exact",
+    "gt",
+    "gte",
+    "lt",
+    "lte",
+    "contains",
+    "icontains",
+    "startswith",
+    "istartswith",
+    "endswith",
+    "iendswith",
+):
     class_name = "EncryptedLookup_%s" % lookup_name
     lookup_class = type(class_name, (EncryptedLookup,), {"lookup_name": lookup_name})
     BaseEncryptedField.register_lookup(lookup_class)

testapp/tests.py

@@ -262,27 +262,26 @@ def test_concat_decrypt(self):
         ).get(ssn="999-05-6728")
         self.assertEqual(employee.value, "999-05-6728 - 42")
 
-
     def test_contains(self):
-        employee = Employee.objects.filter(email__contains='sal').get()
+        employee = Employee.objects.filter(email__contains="sal").get()
         self.assertEqual(employee.email, "[email protected]")
 
     def test_icontains(self):
-        employee = Employee.objects.filter(email__icontains='SAL').get()
+        employee = Employee.objects.filter(email__icontains="SAL").get()
         self.assertEqual(employee.email, "[email protected]")
 
     def test_startswith(self):
-        employee = Employee.objects.filter(email__startswith='john').get()
+        employee = Employee.objects.filter(email__startswith="john").get()
         self.assertEqual(employee.email, "[email protected]")
 
     def test_istartswith(self):
-        employee = Employee.objects.filter(email__istartswith='JOHN').get()
+        employee = Employee.objects.filter(email__istartswith="JOHN").get()
         self.assertEqual(employee.email, "[email protected]")
 
     def test_endswith(self):
-        employee = Employee.objects.filter(email__endswith='com').get()
+        employee = Employee.objects.filter(email__endswith="com").get()
         self.assertEqual(employee.email, "[email protected]")
 
     def test_iendswith(self):
-        employee = Employee.objects.filter(email__iendswith='COM').get()
+        employee = Employee.objects.filter(email__iendswith="COM").get()
         self.assertEqual(employee.email, "[email protected]")