From c09a23ef289cb1de7129c555f7fd1c4e2839bc84 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 15 Feb 2018 14:31:13 +0000
Subject: Fix up API key validation and database api location

---
 pysite/base_route.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pysite/base_route.py')

diff --git a/pysite/base_route.py b/pysite/base_route.py
index e1b9c6b2..fe8632de 100644
--- a/pysite/base_route.py
+++ b/pysite/base_route.py
@@ -2,6 +2,7 @@
 import os
 import random
 import string
+from _weakref import ref
 
 from flask import Blueprint, g, jsonify, render_template
 from flask.views import MethodView
@@ -153,6 +154,7 @@ class DBViewMixin:
         if not cls.table_name:
             raise RuntimeError("Routes using DBViewMixin must define `table_name`")
 
+        cls._db = ref(manager.db)
         manager.db.create_table(cls.table_name, primary_key=cls.table_primary_key)
 
     @property
@@ -161,7 +163,7 @@ class DBViewMixin:
 
     @property
     def db(self) -> RethinkDB:
-        return g.db
+        return self._db()
 
 
 class ErrorView(BaseView):
-- 
cgit v1.2.3