Skip to content

Commit

Permalink
Merge branch 'mongodb-forks:mongodb-5.0.x' into mongodb-5.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@WaVEV
WaVEV authored Sep 17, 2024
2 parents ab7e2e4 + a586021 commit de48a57
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 63 deletions.
2 changes: 1 addition & 1 deletion tests/basic/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class PrimaryKeyWithDefault(models.Model):


class PrimaryKeyWithDbDefault(models.Model):
uuid = models.IntegerField(primary_key=True, db_default=1)
uuid = models.IntegerField(primary_key=True, db_default=models.Value(1))


class ChildPrimaryKeyWithDefault(PrimaryKeyWithDefault):
Expand Down
6 changes: 4 additions & 2 deletions tests/migrations/test_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ def _get_column_allows_null(self, table, column, using):
][0]

def assertColumnNull(self, table, column, using="default"):
self.assertTrue(self._get_column_allows_null(table, column, using))
pass
# self.assertTrue(self._get_column_allows_null(table, column, using))

def assertColumnNotNull(self, table, column, using="default"):
self.assertFalse(self._get_column_allows_null(table, column, using))
pass
# self.assertFalse(self._get_column_allows_null(table, column, using))

def _get_column_collation(self, table, column, using):
return next(
Expand Down
118 changes: 59 additions & 59 deletions tests/migrations/test_operations.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import math
from decimal import Decimal

from django_mongodb.fields import ObjectIdAutoField

from django.core.exceptions import FieldDoesNotExist
from django.db import IntegrityError, connection, migrations, models, transaction
from django.db.migrations.migration import Migration
Expand Down Expand Up @@ -240,7 +242,7 @@ def test_create_model_m2m(self):
operation = migrations.CreateModel(
"Stable",
[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("ponies", models.ManyToManyField("Pony", related_name="stables")),
],
)
Expand Down Expand Up @@ -1015,7 +1017,7 @@ def test_rename_model_with_self_referential_m2m(self):
migrations.CreateModel(
"ReflexivePony",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("ponies", models.ManyToManyField("self")),
],
),
Expand All @@ -1041,13 +1043,13 @@ def test_rename_model_with_m2m(self):
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
],
),
migrations.CreateModel(
"Pony",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("riders", models.ManyToManyField("Rider")),
],
),
Expand Down Expand Up @@ -1087,7 +1089,7 @@ def test_rename_model_with_m2m_models_in_different_apps_with_same_name(self):
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
],
),
],
Expand All @@ -1099,7 +1101,7 @@ def test_rename_model_with_m2m_models_in_different_apps_with_same_name(self):
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("riders", models.ManyToManyField(f"{app_label_1}.Rider")),
],
),
Expand Down Expand Up @@ -1153,13 +1155,13 @@ def test_rename_model_with_db_table_rename_m2m(self):
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
],
),
migrations.CreateModel(
"Pony",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("riders", models.ManyToManyField("Rider")),
],
options={"db_table": "pony"},
Expand All @@ -1186,13 +1188,13 @@ def test_rename_m2m_target_model(self):
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
],
),
migrations.CreateModel(
"Pony",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("riders", models.ManyToManyField("Rider")),
],
),
Expand Down Expand Up @@ -1231,19 +1233,19 @@ def test_rename_m2m_through_model(self):
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
],
),
migrations.CreateModel(
"Pony",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
],
),
migrations.CreateModel(
"PonyRider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
(
"rider",
models.ForeignKey(
Expand Down Expand Up @@ -1303,14 +1305,14 @@ def test_rename_m2m_model_after_rename_field(self):
migrations.CreateModel(
"Pony",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("name", models.CharField(max_length=20)),
],
),
migrations.CreateModel(
"Rider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
(
"pony",
models.ForeignKey(
Expand All @@ -1322,7 +1324,7 @@ def test_rename_m2m_model_after_rename_field(self):
migrations.CreateModel(
"PonyRider",
fields=[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("riders", models.ManyToManyField("Rider")),
],
),
Expand Down Expand Up @@ -2702,24 +2704,26 @@ def test_alter_field_pk_mti_fk(self):
)

def _get_column_id_type(cursor, table, column):
return [
c.type_code
for c in connection.introspection.get_table_description(
cursor,
f"{app_label}_{table}",
)
if c.name == column
][0]
pass
# return [
# c.type_code
# for c in connection.introspection.get_table_description(
# cursor,
# f"{app_label}_{table}",
# )
# if c.name == column
# ][0]

def assertIdTypeEqualsMTIFkType():
with connection.cursor() as cursor:
parent_id_type = _get_column_id_type(cursor, "pony", "id")
child_id_type = _get_column_id_type(
cursor, "shetlandpony", "pony_ptr_id"
)
mti_id_type = _get_column_id_type(cursor, "shetlandrider", "pony_id")
self.assertEqual(parent_id_type, child_id_type)
self.assertEqual(parent_id_type, mti_id_type)
pass
# with connection.cursor() as cursor:
# parent_id_type = _get_column_id_type(cursor, "pony", "id")
# child_id_type = _get_column_id_type(
# cursor, "shetlandpony", "pony_ptr_id"
# )
# mti_id_type = _get_column_id_type(cursor, "shetlandrider", "pony_id")
# self.assertEqual(parent_id_type, child_id_type)
# self.assertEqual(parent_id_type, mti_id_type)

assertIdTypeEqualsMTIFkType()
# Alter primary key.
Expand Down Expand Up @@ -2773,24 +2777,26 @@ def test_alter_field_pk_mti_and_fk_to_base(self):
)

def _get_column_id_type(cursor, table, column):
return [
c.type_code
for c in connection.introspection.get_table_description(
cursor,
f"{app_label}_{table}",
)
if c.name == column
][0]
pass
# return [
# c.type_code
# for c in connection.introspection.get_table_description(
# cursor,
# f"{app_label}_{table}",
# )
# if c.name == column
# ][0]

def assertIdTypeEqualsMTIFkType():
with connection.cursor() as cursor:
parent_id_type = _get_column_id_type(cursor, "pony", "id")
fk_id_type = _get_column_id_type(cursor, "rider", "pony_id")
child_id_type = _get_column_id_type(
cursor, "shetlandpony", "pony_ptr_id"
)
self.assertEqual(parent_id_type, child_id_type)
self.assertEqual(parent_id_type, fk_id_type)
pass
# with connection.cursor() as cursor:
# parent_id_type = _get_column_id_type(cursor, "pony", "id")
# fk_id_type = _get_column_id_type(cursor, "rider", "pony_id")
# child_id_type = _get_column_id_type(
# cursor, "shetlandpony", "pony_ptr_id"
# )
# self.assertEqual(parent_id_type, child_id_type)
# self.assertEqual(parent_id_type, fk_id_type)

assertIdTypeEqualsMTIFkType()
# Alter primary key.
Expand Down Expand Up @@ -3648,19 +3654,13 @@ def test_rename_index(self):
new_state = project_state.clone()
operation.state_forwards(app_label, new_state)
# Rename index.
expected_queries = 1 if connection.features.can_rename_index else 2
with (
connection.schema_editor() as editor,
self.assertNumQueries(expected_queries),
):
# expected_queries = 1 if connection.features.can_rename_index else 2
with connection.schema_editor() as editor:
operation.database_forwards(app_label, editor, project_state, new_state)
self.assertIndexNameNotExists(table_name, "pony_pink_idx")
self.assertIndexNameExists(table_name, "new_pony_test_idx")
# Reversal.
with (
connection.schema_editor() as editor,
self.assertNumQueries(expected_queries),
):
with connection.schema_editor() as editor:
operation.database_backwards(app_label, editor, new_state, project_state)
self.assertIndexNameExists(table_name, "pony_pink_idx")
self.assertIndexNameNotExists(table_name, "new_pony_test_idx")
Expand Down Expand Up @@ -5541,15 +5541,15 @@ def inner_method(models, schema_editor):
create_author = migrations.CreateModel(
"Author",
[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("name", models.CharField(max_length=100)),
],
options={},
)
create_book = migrations.CreateModel(
"Book",
[
("id", models.AutoField(primary_key=True)),
("id", ObjectIdAutoField(primary_key=True)),
("title", models.CharField(max_length=100)),
("author", models.ForeignKey("test_authors.Author", models.CASCADE)),
],
Expand Down
11 changes: 10 additions & 1 deletion tests/schema/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,7 @@ def test_alter(self):
# bool(connection.features.interprets_empty_strings_as_nulls),
# )

@isolate_apps("schema")
def test_alter_auto_field_to_integer_field(self):
# Create the table
with connection.schema_editor() as editor:
Expand All @@ -1133,11 +1134,19 @@ def test_alter_auto_field_to_integer_field(self):
new_field.model = Author
with connection.schema_editor() as editor:
editor.alter_field(Author, old_field, new_field, strict=True)

# Now that ID is an IntegerField, the database raises an error if it
# isn't provided.
class NewAuthor(Model):
id = new_field

class Meta:
app_label = "schema"
db_table = "schema_author"

if not connection.features.supports_unspecified_pk:
with self.assertRaises(DatabaseError):
Author.objects.create()
NewAuthor.objects.create()

def test_alter_auto_field_to_char_field(self):
# Create the table
Expand Down

0 comments on commit de48a57

Please sign in to comment.