Merge branch 'master' into flat-api

1 files changed, 2 insertions, 2 deletions

diff --git a/opendc/models/user.py b/opendc/models/user.py
index 9c716470..885170d0 100644
--- a/opendc/models/user.py
+++ b/opendc/models/user.py
@@ -22,7 +22,7 @@ class User(Model):
     def from_google_id(cls, google_id):
         """Initialize a User by fetching them by their google id."""
 
-        user = cls._from_database('SELECT * FROM users WHERE google_id = ?', (google_id,))
+        user = cls._from_database('SELECT * FROM users WHERE google_id = %s', (google_id,))
 
         if user is not None:
             return user
@@ -33,7 +33,7 @@ class User(Model):
     def from_email(cls, email):
         """Initialize a User by fetching them by their email."""
 
-        user = cls._from_database('SELECT * FROM users WHERE email = ?', (email,))
+        user = cls._from_database('SELECT * FROM users WHERE email = %s', (email,))
 
         if user is not None:
             return user