encode · aminalaee · Oct 3, 2021 · Oct 1, 2021 · Oct 1, 2021 · Oct 2, 2021
diff --git a/orm/models.py b/orm/models.py
@@ -382,7 +382,6 @@ async def first(self, **kwargs):
             return rows[0]
 
     async def create(self, **kwargs):
-        # Validate the keyword arguments.
         fields = self.model_cls.fields
         validator = typesystem.Schema(
             fields={key: value.validator for key, value in fields.items()}
@@ -393,13 +392,14 @@ async def create(self, **kwargs):
             if value.validator.read_only and value.validator.has_default():
                 kwargs[key] = value.validator.get_default_value()
 
-        # Build the insert expression.
-        expr = self.table.insert()
-        expr = expr.values(**kwargs)
-
-        # Execute the insert, and return a new model instance.
         instance = self.model_cls(**kwargs)
-        instance.pk = await self.database.execute(expr)
+        expr = self.table.insert().values(**kwargs)
+
+        if self.pkname not in kwargs:
+            instance.pk = await self.database.execute(expr)
+        else:
+            await self.database.execute(expr)
+
         return instance
 
     async def delete(self) -> None:

diff --git a/tests/test_columns.py b/tests/test_columns.py
@@ -64,9 +64,9 @@ async def rollback_transactions():
 
 
 async def test_model_crud():
-    await Product.objects.create()
+    product = await Product.objects.create()
 
-    product = await Product.objects.get()
+    product = await Product.objects.get(pk=product.pk)
     assert product.created.year == datetime.datetime.now().year
     assert product.created_day == datetime.date.today()
     assert product.data == {}
@@ -92,6 +92,6 @@ async def test_model_crud():
     assert product.price == decimal.Decimal("999.99")
     assert product.uuid == uuid.UUID("01175cde-c18f-4a13-a492-21bd9e1cb01b")
 
-    await User.objects.create(name="Chris")
-    user = await User.objects.get(name="Chris")
-    assert user.name == "Chris"
+    user = await User.objects.create(name="Chris")
+    assert isinstance(user.pk, uuid.UUID)
+    assert await User.objects.get(pk=user.pk) == user