Skip to content

Commit abfd5cb

Browse files
timgrahamtimgraham
committed
schema and migrations test edits
1 parent 4e34ee4 commit abfd5cb

File tree

9 files changed

+675
-450
lines changed

9 files changed

+675
-450
lines changed

‎tests/migrations/test_base.py

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
from contextlib import contextmanager
55
from importlib import import_module
66

7+
from django_mongodb.fields import ObjectIdAutoField
8+
79
from django.apps import apps
810
from django.db import connection, connections, migrations, models
911
from django.db.migrations.migration import Migration
@@ -43,14 +45,16 @@ def assertTableNotExists(self, table, using="default"):
4345
)
4446

4547
def assertColumnExists(self, table, column, using="default"):
46-
self.assertIn(
47-
column, [c.name for c in self.get_table_description(table, using=using)]
48-
)
48+
pass
49+
# self.assertIn(
50+
# column, [c.name for c in self.get_table_description(table, using=using)]
51+
# )
4952

5053
def assertColumnNotExists(self, table, column, using="default"):
51-
self.assertNotIn(
52-
column, [c.name for c in self.get_table_description(table, using=using)]
53-
)
54+
pass
55+
# self.assertNotIn(
56+
# column, [c.name for c in self.get_table_description(table, using=using)]
57+
# )
5458

5559
def _get_column_allows_null(self, table, column, using):
5660
return [
@@ -60,10 +64,12 @@ def _get_column_allows_null(self, table, column, using):
6064
][0]
6165

6266
def assertColumnNull(self, table, column, using="default"):
63-
self.assertTrue(self._get_column_allows_null(table, column, using))
67+
pass
68+
# self.assertTrue(self._get_column_allows_null(table, column, using))
6469

6570
def assertColumnNotNull(self, table, column, using="default"):
66-
self.assertFalse(self._get_column_allows_null(table, column, using))
71+
pass
72+
# self.assertFalse(self._get_column_allows_null(table, column, using))
6773

6874
def _get_column_collation(self, table, column, using):
6975
return next(
@@ -223,15 +229,15 @@ def cleanup_test_tables(self):
223229
frozenset(connection.introspection.table_names())
224230
- self._initial_table_names
225231
)
226-
with connection.schema_editor() as editor:
227-
with connection.constraint_checks_disabled():
228-
for table_name in table_names:
229-
editor.execute(
230-
editor.sql_delete_table
231-
% {
232-
"table": editor.quote_name(table_name),
233-
}
234-
)
232+
with connection.constraint_checks_disabled():
233+
for table_name in table_names:
234+
connection.database[table_name].drop()
235+
# editor.execute(
236+
# editor.sql_delete_table
237+
# % {
238+
# "table": editor.quote_name(table_name),
239+
# }
240+
# )
235241

236242
def apply_operations(self, app_label, project_state, operations, atomic=True):
237243
migration = Migration("name", app_label)
@@ -289,14 +295,14 @@ def set_up_test_model(
289295
migrations.CreateModel(
290296
"Pony",
291297
[
292-
("id", models.AutoField(primary_key=True)),
298+
("id", ObjectIdAutoField(primary_key=True)),
293299
("pink", models.IntegerField(default=3)),
294300
("weight", models.FloatField()),
295301
("green", models.IntegerField(null=True)),
296302
(
297303
"yellow",
298304
models.CharField(
299-
blank=True, null=True, db_default="Yellow", max_length=20
305+
blank=True, null=True, default="Yellow", max_length=20
300306
),
301307
),
302308
],
@@ -328,7 +334,7 @@ def set_up_test_model(
328334
migrations.CreateModel(
329335
"Stable",
330336
[
331-
("id", models.AutoField(primary_key=True)),
337+
("id", ObjectIdAutoField(primary_key=True)),
332338
],
333339
)
334340
)
@@ -337,7 +343,7 @@ def set_up_test_model(
337343
migrations.CreateModel(
338344
"Van",
339345
[
340-
("id", models.AutoField(primary_key=True)),
346+
("id", ObjectIdAutoField(primary_key=True)),
341347
],
342348
)
343349
)
@@ -346,7 +352,7 @@ def set_up_test_model(
346352
migrations.CreateModel(
347353
"Rider",
348354
[
349-
("id", models.AutoField(primary_key=True)),
355+
("id", ObjectIdAutoField(primary_key=True)),
350356
("pony", models.ForeignKey("Pony", models.CASCADE)),
351357
(
352358
"friend",
@@ -393,7 +399,7 @@ def set_up_test_model(
393399
migrations.CreateModel(
394400
"Food",
395401
fields=[
396-
("id", models.AutoField(primary_key=True)),
402+
("id", ObjectIdAutoField(primary_key=True)),
397403
],
398404
managers=[
399405
("food_qs", FoodQuerySet.as_manager()),

‎tests/migrations/test_commands.py

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -870,10 +870,7 @@ def test_sqlmigrate_forwards(self):
870870
"--",
871871
],
872872
)
873-
self.assertIn(
874-
"create table %s" % connection.ops.quote_name("migrations_author").lower(),
875-
lines[3].lower(),
876-
)
873+
self.assertIn("db.create_collection('migrations_author')", lines[3])
877874
pos = lines.index("--", 3)
878875
self.assertEqual(
879876
lines[pos : pos + 3],
@@ -883,10 +880,7 @@ def test_sqlmigrate_forwards(self):
883880
"--",
884881
],
885882
)
886-
self.assertIn(
887-
"create table %s" % connection.ops.quote_name("migrations_tribble").lower(),
888-
lines[pos + 3].lower(),
889-
)
883+
self.assertIn("db.create_collection('migrations_tribble')", lines[pos + 3])
890884
pos = lines.index("--", pos + 3)
891885
self.assertEqual(
892886
lines[pos : pos + 3],
@@ -896,6 +890,10 @@ def test_sqlmigrate_forwards(self):
896890
"--",
897891
],
898892
)
893+
self.assertEqual(
894+
"db.migrations_tribble.update_many({}, [{'$set': {'bool': False}}])",
895+
lines[pos + 3],
896+
)
899897
pos = lines.index("--", pos + 3)
900898
self.assertEqual(
901899
lines[pos : pos + 3],
@@ -905,6 +903,7 @@ def test_sqlmigrate_forwards(self):
905903
"--",
906904
],
907905
)
906+
self.assertIn("db.migrations_author.create_indexes([", lines[pos + 3])
908907

909908
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"})
910909
def test_sqlmigrate_backwards(self):
@@ -918,6 +917,7 @@ def test_sqlmigrate_backwards(self):
918917
call_command("sqlmigrate", "migrations", "0001", stdout=out, backwards=True)
919918

920919
lines = out.getvalue().splitlines()
920+
921921
try:
922922
if connection.features.can_rollback_ddl:
923923
self.assertEqual(lines[0], connection.ops.start_transaction_sql())
@@ -932,6 +932,11 @@ def test_sqlmigrate_backwards(self):
932932
"--",
933933
],
934934
)
935+
self.assertEqual(
936+
"db.migrations_author.drop_index"
937+
"('migrations_author_name_slug_0ef2ba54_uniq')",
938+
lines[3],
939+
)
935940
pos = lines.index("--", 3)
936941
self.assertEqual(
937942
lines[pos : pos + 3],
@@ -941,6 +946,10 @@ def test_sqlmigrate_backwards(self):
941946
"--",
942947
],
943948
)
949+
self.assertEqual(
950+
"db.migrations_tribble.update_many({}, {'$unset': {'bool': ''}})",
951+
lines[pos + 3],
952+
)
944953
pos = lines.index("--", pos + 3)
945954
self.assertEqual(
946955
lines[pos : pos + 3],
@@ -951,10 +960,7 @@ def test_sqlmigrate_backwards(self):
951960
],
952961
)
953962
next_pos = lines.index("--", pos + 3)
954-
drop_table_sql = (
955-
"drop table %s"
956-
% connection.ops.quote_name("migrations_tribble").lower()
957-
)
963+
drop_table_sql = "db.migrations_tribble.drop()"
958964
for line in lines[pos + 3 : next_pos]:
959965
if drop_table_sql in line.lower():
960966
break
@@ -969,9 +975,7 @@ def test_sqlmigrate_backwards(self):
969975
"--",
970976
],
971977
)
972-
drop_table_sql = (
973-
"drop table %s" % connection.ops.quote_name("migrations_author").lower()
974-
)
978+
drop_table_sql = "db.migrations_author.drop()"
975979
for line in lines[pos + 3 :]:
976980
if drop_table_sql in line.lower():
977981
break

‎tests/migrations/test_executor.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -466,16 +466,16 @@ def test_detect_soft_applied_add_field_manytomanyfield(self):
466466

467467
# Leave the tables for 0001 except the many-to-many table. That missing
468468
# table should cause detect_soft_applied() to return False.
469-
with connection.schema_editor() as editor:
470-
for table in tables[2:]:
471-
editor.execute(editor.sql_delete_table % {"table": table})
469+
for table in tables[2:]:
470+
connection.database[table].drop()
471+
# editor.execute(editor.sql_delete_table % {"table": table})
472472
migration = executor.loader.get_migration("migrations", "0001_initial")
473473
self.assertIs(executor.detect_soft_applied(None, migration)[0], False)
474474

475475
# Cleanup by removing the remaining tables.
476-
with connection.schema_editor() as editor:
477-
for table in tables[:2]:
478-
editor.execute(editor.sql_delete_table % {"table": table})
476+
for table in tables[:2]:
477+
connection.database[table].drop()
478+
# editor.execute(editor.sql_delete_table % {"table": table})
479479
for table in tables:
480480
self.assertTableNotExists(table)
481481

@@ -689,11 +689,13 @@ def test_alter_id_type_with_fk(self):
689689
# Rebuild the graph to reflect the new DB state
690690
executor.loader.build_graph()
691691
finally:
692+
connection.database["book_app_book"].drop()
693+
connection.database["author_app_author"].drop()
692694
# We can't simply unapply the migrations here because there is no
693695
# implicit cast from VARCHAR to INT on the database level.
694-
with connection.schema_editor() as editor:
695-
editor.execute(editor.sql_delete_table % {"table": "book_app_book"})
696-
editor.execute(editor.sql_delete_table % {"table": "author_app_author"})
696+
# with connection.schema_editor() as editor:
697+
# editor.execute(editor.sql_delete_table % {"table": "book_app_book"})
698+
# editor.execute(editor.sql_delete_table % {"table": "author_app_author"})
697699
self.assertTableNotExists("author_app_author")
698700
self.assertTableNotExists("book_app_book")
699701
executor.migrate([("author_app", None)], fake=True)

‎tests/migrations/test_migrations_no_changes/0001_initial.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from django_mongodb.fields import ObjectIdAutoField
2+
13
from django.db import migrations, models
24

35

@@ -6,7 +8,7 @@ class Migration(migrations.Migration):
68
migrations.CreateModel(
79
"Author",
810
[
9-
("id", models.AutoField(primary_key=True)),
11+
("id", ObjectIdAutoField(primary_key=True)),
1012
("name", models.CharField(max_length=255)),
1113
("slug", models.SlugField(null=True)),
1214
("age", models.IntegerField(default=0)),
@@ -16,7 +18,7 @@ class Migration(migrations.Migration):
1618
migrations.CreateModel(
1719
"Tribble",
1820
[
19-
("id", models.AutoField(primary_key=True)),
21+
("id", ObjectIdAutoField(primary_key=True)),
2022
("fluffy", models.BooleanField(default=True)),
2123
],
2224
),

‎tests/migrations/test_migrations_no_changes/0002_second.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from django_mongodb.fields import ObjectIdAutoField
2+
13
from django.db import migrations, models
24

35

@@ -13,7 +15,7 @@ class Migration(migrations.Migration):
1315
migrations.CreateModel(
1416
"Book",
1517
[
16-
("id", models.AutoField(primary_key=True)),
18+
("id", ObjectIdAutoField(primary_key=True)),
1719
(
1820
"author",
1921
models.ForeignKey("migrations.Author", models.SET_NULL, null=True),

‎tests/migrations/test_migrations_no_changes/0003_third.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from django_mongodb.fields import ObjectIdAutoField
2+
13
from django.db import migrations, models
24

35

@@ -12,7 +14,7 @@ class Migration(migrations.Migration):
1214
fields=[
1315
(
1416
"id",
15-
models.AutoField(
17+
ObjectIdAutoField(
1618
verbose_name="ID",
1719
serialize=False,
1820
auto_created=True,
@@ -28,7 +30,7 @@ class Migration(migrations.Migration):
2830
fields=[
2931
(
3032
"id",
31-
models.AutoField(
33+
ObjectIdAutoField(
3234
verbose_name="ID",
3335
serialize=False,
3436
auto_created=True,

‎tests/migrations/test_migrations_no_default/0001_initial.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from django_mongodb.fields import ObjectIdAutoField
2+
13
from django.db import migrations, models
24

35

@@ -10,7 +12,7 @@ class Migration(migrations.Migration):
1012
fields=[
1113
(
1214
"id",
13-
models.AutoField(
15+
ObjectIdAutoField(
1416
verbose_name="ID",
1517
serialize=False,
1618
auto_created=True,

0 commit comments

Comments
 (0)