Skip to content

Commit 2b04427

Browse files
timgrahamWaVEV
authored andcommitted
remove path name checks in embedded model field since $ & . won't be supported in db_column
This reverts commit 8d6dd8e.
1 parent 3dfebee commit 2b04427

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

django_mongodb_backend/fields/embedded_model.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from django.utils.functional import cached_property
99

1010
from django_mongodb_backend import forms
11-
from django_mongodb_backend.query_utils import valid_path_key_name
1211

1312

1413
class EmbeddedModelField(models.Field):
@@ -176,8 +175,6 @@ def can_use_path(self):
176175
def is_simple_column(self):
177176
previous = self
178177
while isinstance(previous, EmbeddedModelTransform):
179-
if not valid_path_key_name(previous._field.column):
180-
return False
181178
previous = previous.lhs
182179
return previous.is_simple_column
183180

django_mongodb_backend/fields/embedded_model_array.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from django_mongodb_backend import forms
1111
from django_mongodb_backend.fields import EmbeddedModelField
1212
from django_mongodb_backend.fields.array import ArrayField, ArrayLenTransform
13-
from django_mongodb_backend.query_utils import process_lhs, process_rhs, valid_path_key_name
13+
from django_mongodb_backend.query_utils import process_lhs, process_rhs
1414

1515

1616
class EmbeddedModelArrayField(ArrayField):
@@ -253,8 +253,6 @@ def can_use_path(self):
253253
def is_simple_column(self):
254254
previous = self
255255
while isinstance(previous, EmbeddedModelArrayFieldTransform):
256-
if not valid_path_key_name(previous._field.column):
257-
return False
258256
previous = previous.lhs
259257
return previous.is_simple_column and self._lhs.is_simple_column
260258

tests/model_fields_/models.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ class Data(EmbeddedModel):
135135

136136
class NestedData(EmbeddedModel):
137137
decimal = models.DecimalField(max_digits=9, decimal_places="2", null=True, blank=True)
138-
price = models.DecimalField(
139-
max_digits=9, decimal_places="2", db_column="price$usd", null=True, blank=True
140-
)
141138

142139

143140
class Address(EmbeddedModel):

tests/model_fields_/test_embedded_model.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def setUpTestData(cls):
140140
data=Data(
141141
integer=x,
142142
decimal=f"{x}.5",
143-
nested_data=NestedData(decimal=f"{x}.5", price=f"{x}.50"),
143+
nested_data=NestedData(decimal=f"{x}.5"),
144144
)
145145
)
146146
for x in range(6)
@@ -509,11 +509,6 @@ def test_exact_decimal_nested(self):
509509
Holder.objects.filter(data__nested_data__decimal="3.5"), [self.objs[3]]
510510
)
511511

512-
def test_query_price_column(self):
513-
self.assertCountEqual(
514-
Holder.objects.filter(data__nested_data__price="5.50"), [self.objs[5]]
515-
)
516-
517512
def test_order_by_embedded_field(self):
518513
qs = Holder.objects.filter(data__integer__gt=3).order_by("-data__integer")
519514
self.assertSequenceEqual(qs, list(reversed(self.objs[4:])))

0 commit comments

Comments
 (0)