feat: change update and fix test

Author: long2ice

tests/fields/test_array.py

@@ -1,15 +1,22 @@
-from tests import testmodels
+from tests import testmodels_postgres as testmodels
 from tortoise.contrib import test
-from tortoise.exceptions import IntegrityError
+from tortoise.exceptions import IntegrityError, OperationalError
 
 
-class TestArrayFields(test.TestCase):
-    @test.requireCapability(dialect="postgres")
+@test.requireCapability(dialect="postgres")
+class TestArrayFields(test.IsolatedTestCase):
+    tortoise_test_modules = ["tests.testmodels_postgres"]
+
+    async def _setUpDB(self) -> None:
+        try:
+            await super()._setUpDB()
+        except OperationalError:
+            raise test.SkipTest("Works only with PostgreSQL")
+
     async def test_empty(self):
         with self.assertRaises(IntegrityError):
             await testmodels.ArrayFields.create()
 
-    @test.requireCapability(dialect="postgres")
     async def test_create(self):
         obj0 = await testmodels.ArrayFields.create(array=[0])
         obj = await testmodels.ArrayFields.get(id=obj0.id)
@@ -19,21 +26,18 @@ async def test_create(self):
         obj2 = await testmodels.ArrayFields.get(id=obj.id)
         self.assertEqual(obj, obj2)
 
-    @test.requireCapability(dialect="postgres")
     async def test_update(self):
         obj0 = await testmodels.ArrayFields.create(array=[0])
         await testmodels.ArrayFields.filter(id=obj0.id).update(array=[1])
         obj = await testmodels.ArrayFields.get(id=obj0.id)
         self.assertEqual(obj.array, [1])
         self.assertIs(obj.array_null, None)
 
-    @test.requireCapability(dialect="postgres")
     async def test_values(self):
         obj0 = await testmodels.ArrayFields.create(array=[0])
         values = await testmodels.ArrayFields.get(id=obj0.id).values("array")
         self.assertEqual(values["array"], [0])
 
-    @test.requireCapability(dialect="postgres")
     async def test_values_list(self):
         obj0 = await testmodels.ArrayFields.create(array=[0])
         values = await testmodels.ArrayFields.get(id=obj0.id).values_list("array", flat=True)

tests/schema/test_generate_schema.py

@@ -417,7 +417,7 @@ async def init_for(self, module: str, safe=False) -> None:
                 )
                 self.sqls = get_schema_sql(connections.get("default"), safe).split("; ")
         except ImportError:
-            raise test.SkipTest("aiomysql not installed")
+            raise test.SkipTest("asyncmy not installed")
 
     async def test_noid(self):
         await self.init_for("tests.testmodels")

tests/testmodels.py

@@ -13,7 +13,6 @@
 import pytz
 
 from tortoise import fields
-from tortoise.contrib.postgres.fields import ArrayField
 from tortoise.exceptions import NoValuesFetched, ValidationError
 from tortoise.manager import Manager
 from tortoise.models import Model
@@ -222,12 +221,6 @@ class BooleanFields(Model):
     boolean_null = fields.BooleanField(null=True)
 
 
-class ArrayFields(Model):
-    id = fields.IntField(pk=True)
-    array = ArrayField()
-    array_null = ArrayField(null=True)
-
-
 class BinaryFields(Model):
     id = fields.IntField(pk=True)
     binary = fields.BinaryField()

tests/testmodels_postgres.py

@@ -0,0 +1,8 @@
+from tortoise import Model, fields
+from tortoise.contrib.postgres.fields import ArrayField
+
+
+class ArrayFields(Model):
+    id = fields.IntField(pk=True)
+    array = ArrayField()
+    array_null = ArrayField(null=True)

tortoise/queryset.py

@@ -1029,6 +1029,7 @@ class UpdateQuery(AwaitableQuery):
         "custom_filters",
         "orderings",
         "limit",
+        "values",
     )
 
     def __init__(
@@ -1050,6 +1051,7 @@ def __init__(
         self._db = db
         self.limit = limit
         self.orderings = orderings
+        self.values: List[Any] = []
 
     def _make_query(self) -> None:
         table = self.model._meta.basetable
@@ -1066,7 +1068,7 @@ def _make_query(self) -> None:
         )
         # Need to get executor to get correct column_map
         executor = self._db.executor_class(model=self.model, db=self._db)
-
+        count = 0
         for key, value in self.update_kwargs.items():
             field_object = self.model._meta.fields_map.get(key)
             if not field_object:
@@ -1090,8 +1092,12 @@ def _make_query(self) -> None:
                     value = value.resolve(self.model, table)["field"]
                 else:
                     value = executor.column_map[key](value, None)
-
-            self.query = self.query.set(db_field, value)
+            if isinstance(value, Term):
+                self.query = self.query.set(db_field, value)
+            else:
+                self.query = self.query.set(db_field, executor.parameter(count))
+                self.values.append(value)
+                count += 1
 
     def __await__(self) -> Generator[Any, None, int]:
         if self._db is None:
@@ -1100,7 +1106,7 @@ def __await__(self) -> Generator[Any, None, int]:
         return self._execute().__await__()
 
     async def _execute(self) -> int:
-        return (await self._db.execute_query(str(self.query)))[0]
+        return (await self._db.execute_query(str(self.query), self.values))[0]
 
 
 class DeleteQuery(AwaitableQuery):