change id to model pk name

encode · Mng-dev-ai · Jan 11, 2022 · Jan 11, 2022 · Jan 11, 2022 · Jan 11, 2022
commit 7baf305d535a01141690234defdb3d4d1a68bcb6
diff --git a/orm/models.py b/orm/models.py
@@ -489,7 +489,7 @@ async def bulk_update(
         ]
         expr = (
             self.table.update()
-            .where(self.table.c.id == sqlalchemy.bindparam("id"))
+            .where(self.table.c.id == sqlalchemy.bindparam(self.pkname))
             .values(
                 {
                     field: sqlalchemy.bindparam(field)
@@ -498,7 +498,7 @@ async def bulk_update(
                 }
             )
         )
-        pk_list = [{"id": obj.pk} for obj in objs]
+        pk_list = [{self.pkname: obj.pk} for obj in objs]
         joined_list = [{**pk, **value} for pk, value in zip(pk_list, new_objs)]
         await self.database.execute_many(str(expr), joined_list)
 

diff --git a/tests/test_columns.py b/tests/test_columns.py
@@ -199,39 +199,3 @@ async def test_bulk_update():
     assert products[1].data == {"foo": 5678}
     assert products[0].value == 1234.567
     assert products[1].value == 5678.891
-
-
-async def test_bulk_update_with_relation():
-    class Album(orm.Model):
-        registry = models
-        fields = {
-            "id": orm.Integer(primary_key=True),
-            "name": orm.Text(),
-        }
-
-    class Track(orm.Model):
-        registry = models
-        fields = {
-            "id": orm.Integer(primary_key=True),
-            "name": orm.Text(),
-            "album": orm.ForeignKey(Album),
-        }
-
-    await models.create_all()
-
-    album = await Album.objects.create(name="foo")
-    album2 = await Album.objects.create(name="bar")
-
-    await Track.objects.bulk_create(
-        [
-            {"name": "foo", "album": album},
-            {"name": "bar", "album": album},
-        ]
-    )
-    tracks = await Track.objects.all()
-    for track in tracks:
-        track.album = album2
-    await Track.objects.bulk_update(tracks, fields=["album"])
-    tracks = await Track.objects.all()
-    assert tracks[0].album.pk == album2.pk
-    assert tracks[1].album.pk == album2.pk
diff --git a/tests/test_foreignkey.py b/tests/test_foreignkey.py
@@ -278,3 +278,22 @@ async def test_nullable_foreign_key():
 
     assert member.email == "dev@encode.io"
     assert member.team.pk is None
+
+
+async def test_bulk_update_with_relation():
+    album = await Album.objects.create(name="foo")
+    album2 = await Album.objects.create(name="bar")
+
+    await Track.objects.bulk_create(
+        [
+            {"name": "foo", "album": album, "position": 1, "title": "foo"},
+            {"name": "bar", "album": album, "position": 2, "title": "bar"},
+        ]
+    )
+    tracks = await Track.objects.all()
+    for track in tracks:
+        track.album = album2
+    await Track.objects.bulk_update(tracks, fields=["album"])
+    tracks = await Track.objects.all()
+    assert tracks[0].album.pk == album2.pk
+    assert tracks[1].album.pk == album2.pk