get SQL refs from session (bp sql-query-get)

Change-Id: I2200e33868d50bb69089f3108a5a4c061afccd6e

1 files changed, 4 insertions, 7 deletions

diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py
index fef3b81b..2e68bdc9 100644
--- a/keystone/token/backends/sql.py
+++ b/keystone/token/backends/sql.py
@@ -41,11 +41,9 @@ class Token(sql.Base, token.Driver):
         if token_id is None:
             raise exception.TokenNotFound(token_id=token_id)
         session = self.get_session()
-        query = session.query(TokenModel)
-        query = query.filter_by(id=token.unique_id(token_id), valid=True)
-        token_ref = query.first()
+        token_ref = session.query(TokenModel).get(token.unique_id(token_id))
         now = datetime.datetime.utcnow()
-        if not token_ref:
+        if not token_ref or not token_ref.valid:
             raise exception.TokenNotFound(token_id=token_id)
         if not token_ref.expires:
             raise exception.TokenNotFound(token_id=token_id)
@@ -73,9 +71,8 @@ class Token(sql.Base, token.Driver):
         session = self.get_session()
         key = token.unique_id(token_id)
         with session.begin():
-            token_ref = session.query(TokenModel).filter_by(id=key,
-                                                            valid=True).first()
-            if not token_ref:
+            token_ref = session.query(TokenModel).get(key)
+            if not token_ref or not token_ref.valid:
                 raise exception.TokenNotFound(token_id=token_id)
             token_ref.valid = False
             session.flush()