Skip to content

Rename DatabaseWrapper operator helpers #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −28
Open

Rename DatabaseWrapper operator helpers #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions django_mongodb_backend/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from .features import DatabaseFeatures
from .introspection import DatabaseIntrospection
from .operations import DatabaseOperations
from .query_utils import regex_match
from .schema import DatabaseSchemaEditor
from .utils import OperationDebugWrapper
from .validation import DatabaseValidation
Expand Down Expand Up @@ -97,44 +96,51 @@ class DatabaseWrapper(BaseDatabaseWrapper):
}
_connection_pools = {}

def _isnull_operator(a, b):
is_null = {
def _isnull_expr(field, is_null):
mql = {
"$or": [
# The path does not exist (i.e. is "missing")
{"$eq": [{"$type": a}, "missing"]},
{"$eq": [{"$type": field}, "missing"]},
# or the value is None.
{"$eq": [a, None]},
{"$eq": [field, None]},
]
}
return is_null if b else {"$not": is_null}
return mql if is_null else {"$not": mql}

def _regex_expr(field, regex_vals, insensitive=False):
regex = {"$concat": regex_vals} if isinstance(regex_vals, tuple) else regex_vals
options = "i" if insensitive else ""
return {"$regexMatch": {"input": field, "regex": regex, "options": options}}
Comment on lines +110 to +113
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this from a function to a method to match _isnull_expr() (and the added methods in #396).


mongo_operators = {
"exact": lambda a, b: {"$eq": [a, b]},
"gt": lambda a, b: {"$gt": [a, b]},
"gte": lambda a, b: {"$gte": [a, b]},
# MongoDB considers null less than zero. Exclude null values to match
# SQL behavior.
"lt": lambda a, b: {"$and": [{"$lt": [a, b]}, DatabaseWrapper._isnull_operator(a, False)]},
"lte": lambda a, b: {
"$and": [{"$lte": [a, b]}, DatabaseWrapper._isnull_operator(a, False)]
},
"lt": lambda a, b: {"$and": [{"$lt": [a, b]}, DatabaseWrapper._isnull_expr(a, False)]},
"lte": lambda a, b: {"$and": [{"$lte": [a, b]}, DatabaseWrapper._isnull_expr(a, False)]},
"in": lambda a, b: {"$in": [a, b]},
"isnull": _isnull_operator,
"isnull": _isnull_expr,
"range": lambda a, b: {
"$and": [
{"$or": [DatabaseWrapper._isnull_operator(b[0], True), {"$gte": [a, b[0]]}]},
{"$or": [DatabaseWrapper._isnull_operator(b[1], True), {"$lte": [a, b[1]]}]},
{"$or": [DatabaseWrapper._isnull_expr(b[0], True), {"$gte": [a, b[0]]}]},
{"$or": [DatabaseWrapper._isnull_expr(b[1], True), {"$lte": [a, b[1]]}]},
]
},
"iexact": lambda a, b: regex_match(a, ("^", b, {"$literal": "$"}), insensitive=True),
"startswith": lambda a, b: regex_match(a, ("^", b)),
"istartswith": lambda a, b: regex_match(a, ("^", b), insensitive=True),
"endswith": lambda a, b: regex_match(a, (b, {"$literal": "$"})),
"iendswith": lambda a, b: regex_match(a, (b, {"$literal": "$"}), insensitive=True),
"contains": lambda a, b: regex_match(a, b),
"icontains": lambda a, b: regex_match(a, b, insensitive=True),
"regex": lambda a, b: regex_match(a, b),
"iregex": lambda a, b: regex_match(a, b, insensitive=True),
"iexact": lambda a, b: DatabaseWrapper._regex_expr(
a, ("^", b, {"$literal": "$"}), insensitive=True
),
"startswith": lambda a, b: DatabaseWrapper._regex_expr(a, ("^", b)),
"istartswith": lambda a, b: DatabaseWrapper._regex_expr(a, ("^", b), insensitive=True),
"endswith": lambda a, b: DatabaseWrapper._regex_expr(a, (b, {"$literal": "$"})),
"iendswith": lambda a, b: DatabaseWrapper._regex_expr(
a, (b, {"$literal": "$"}), insensitive=True
),
"contains": lambda a, b: DatabaseWrapper._regex_expr(a, b),
"icontains": lambda a, b: DatabaseWrapper._regex_expr(a, b, insensitive=True),
"regex": lambda a, b: DatabaseWrapper._regex_expr(a, b),
"iregex": lambda a, b: DatabaseWrapper._regex_expr(a, b, insensitive=True),
}

display_name = "MongoDB"
Expand Down
6 changes: 0 additions & 6 deletions django_mongodb_backend/query_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,3 @@ def process_rhs(node, compiler, connection):
if hasattr(node, "prep_lookup_value_mongo"):
value = node.prep_lookup_value_mongo(value)
return value


def regex_match(field, regex_vals, insensitive=False):
regex = {"$concat": regex_vals} if isinstance(regex_vals, tuple) else regex_vals
options = "i" if insensitive else ""
return {"$regexMatch": {"input": field, "regex": regex, "options": options}}