From 7832ccccc298911dcabe37e823c67491df9bc052 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Fri, 28 May 2021 12:54:55 +1000
Subject: [PATCH] Check if database tables are ready

---
 InvenTree/InvenTree/tasks.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/InvenTree/InvenTree/tasks.py b/InvenTree/InvenTree/tasks.py
index 994a344cc9..d45df99152 100644
--- a/InvenTree/InvenTree/tasks.py
+++ b/InvenTree/InvenTree/tasks.py
@@ -168,7 +168,7 @@ def update_exchange_rates():
 
     try:
         from InvenTree.exchange import InvenTreeExchange
-        from djmoney.contrib.exchange.models import Rate
+        from djmoney.contrib.exchange.models import ExchangeBackend, Rate
         from django.conf import settings
     except AppRegistryNotReady:
         # Apps not yet loaded!
@@ -177,6 +177,16 @@ def update_exchange_rates():
         # Other error?
         return
 
+    # Test to see if the database is ready yet
+    try:
+        backend = ExchangeBackend.objects.get(name='InvenTreeExchange')
+    except ExchangeBackend.DoesNotExist:
+        pass
+    except:
+        # Some other error
+        print("Database not ready")
+        return
+
     backend = InvenTreeExchange()
     print(f"Updating exchange rates from {backend.url}")