From 6e7d9a2e034ce50e3efc414d10d7e109d6bdf1c7 Mon Sep 17 00:00:00 2001
From: Donkie <daniel.cf.hultgren@gmail.com>
Date: Mon, 28 Aug 2023 20:31:25 +0200
Subject: [PATCH] Replaced db.flush with db.commit

To try fix some odd cases of greenlet whining
---
 spoolman/database/filament.py | 6 +++---
 spoolman/database/spool.py    | 8 ++++----
 spoolman/database/vendor.py   | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spoolman/database/filament.py b/spoolman/database/filament.py
index b591616..c29c479 100644
--- a/spoolman/database/filament.py
+++ b/spoolman/database/filament.py
@@ -49,7 +49,7 @@ async def create(
         color_hex=color_hex,
     )
     db.add(db_item)
-    await db.flush()
+    await db.commit()
     return db_item
 
 
@@ -111,7 +111,7 @@ async def update(
                 filament.vendor = await vendor.get_by_id(db, v)
         else:
             setattr(filament, k, v)
-    await db.flush()
+    await db.commit()
     return filament
 
 
@@ -120,7 +120,7 @@ async def delete(db: AsyncSession, filament_id: int) -> None:
     filament = await get_by_id(db, filament_id)
     await db.delete(filament)
     try:
-        await db.flush()  # Flush immediately so any errors are propagated in this request.
+        await db.commit()  # Flush immediately so any errors are propagated in this request.
     except IntegrityError as exc:
         await db.rollback()
         raise ItemDeleteError("Failed to delete filament.") from exc
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 029c336..7758671 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -59,7 +59,7 @@ async def create(
         archived=archived,
     )
     db.add(db_item)
-    await db.flush()
+    await db.commit()
     return db_item
 
 
@@ -140,7 +140,7 @@ async def update(
             setattr(spool, k, utc_timezone_naive(v))
         else:
             setattr(spool, k, v)
-    await db.flush()
+    await db.commit()
     return spool
 
 
@@ -192,7 +192,7 @@ async def use_weight(db: AsyncSession, spool_id: int, weight: float) -> models.S
         spool.first_used = datetime.utcnow()
     spool.last_used = datetime.utcnow()
 
-    await db.flush()
+    await db.commit()
     return spool
 
 
@@ -236,5 +236,5 @@ async def use_length(db: AsyncSession, spool_id: int, length: float) -> models.S
         spool.first_used = datetime.utcnow()
     spool.last_used = datetime.utcnow()
 
-    await db.flush()
+    await db.commit()
     return spool
diff --git a/spoolman/database/vendor.py b/spoolman/database/vendor.py
index 0829536..7f9459c 100644
--- a/spoolman/database/vendor.py
+++ b/spoolman/database/vendor.py
@@ -21,7 +21,7 @@ async def create(
         comment=comment,
     )
     db.add(db_item)
-    await db.flush()
+    await db.commit()
     return db_item
 
 
@@ -57,7 +57,7 @@ async def update(
     vendor = await get_by_id(db, vendor_id)
     for k, v in data.items():
         setattr(vendor, k, v)
-    await db.flush()
+    await db.commit()
     return vendor