Merge branch 'master' of https://github.com/encode/orm into implement…

…-queryset-limit

orm/models.py

@@ -50,6 +50,8 @@ def __new__(
 
 class QuerySet:
     def __init__(self, model_cls=None, filter_clauses=None, select_related=None, limit_count=None):
+        ESCAPE_CHARACTERS = ['%', '_']
+
         self.model_cls = model_cls
         self.filter_clauses = [] if filter_clauses is None else filter_clauses
         self._select_related = [] if select_related is None else select_related
@@ -133,14 +135,22 @@ def filter(self, **kwargs):
             # Map the operation code onto SQLAlchemy's ColumnElement
             # https://docs.sqlalchemy.org/en/latest/core/sqlelement.html#sqlalchemy.sql.expression.ColumnElement
             op_attr = FILTER_OPERATORS[op]
+            has_escaped_character = False
 
             if op in ["contains", "icontains"]:
-                value = "%" + value + "%"
+                has_escaped_character = any(c for c in self.ESCAPE_CHARACTERS
+                                            if c in value)
+                if has_escaped_character:
+                    # enable escape modifier
+                    for char in self.ESCAPE_CHARACTERS:
+                        value = value.replace(char, f'\\{char}')
+                value = f"%{value}%"
 
             if isinstance(value, Model):
                 value = value.pk
 
             clause = getattr(column, op_attr)(value)
+            clause.modifiers['escape'] = '\\' if has_escaped_character else None
             filter_clauses.append(clause)
 
         return self.__class__(

tests/settings.py

@@ -0,0 +1 @@
+DATABASE_URL = "sqlite:///test.db"

tests/test_columns.py

@@ -8,7 +8,9 @@
 import databases
 import orm
 
-DATABASE_URL = "sqlite:///test.db"
+from tests.settings import DATABASE_URL
+
+
 database = databases.Database(DATABASE_URL, force_rollback=True)
 metadata = sqlalchemy.MetaData()
 

tests/test_foreignkey.py

@@ -7,7 +7,8 @@
 import databases
 import orm
 
-DATABASE_URL = "sqlite:///test.db"
+from tests.settings import DATABASE_URL
+
 database = databases.Database(DATABASE_URL, force_rollback=True)
 metadata = sqlalchemy.MetaData()
 

tests/test_models.py

@@ -7,7 +7,8 @@
 import databases
 import orm
 
-DATABASE_URL = "sqlite:///test.db"
+from tests.settings import DATABASE_URL
+
 database = databases.Database(DATABASE_URL, force_rollback=True)
 metadata = sqlalchemy.MetaData()
 
@@ -138,6 +139,19 @@ async def test_model_filter():
         products = await Product.objects.all(name__icontains="T")
         assert len(products) == 2
 
+        # Test escaping % character from icontains, contains, and iexact
+        await Product.objects.create(name="100%-Cotton", rating=3)
+        await Product.objects.create(name="Cotton-100%-Egyptian", rating=3)
+        await Product.objects.create(name="Cotton-100%", rating=3)
+        products = Product.objects.filter(name__iexact="100%-cotton")
+        assert await products.count() == 1
+
+        products = Product.objects.filter(name__contains="%")
+        assert await products.count() == 3
+
+        products = Product.objects.filter(name__icontains="%")
+        assert await products.count() == 3
+
 
 @async_adapter
 async def test_model_exists():