diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-12 19:08:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-12 19:08:13 +0000 |
commit | 708ccf086a6a4de28b271931a7890b642c9ec1bc (patch) | |
tree | 382b3e0128634b91a49cf549324f13744d69a968 /keystone/token/backends/sql.py | |
parent | 4829de4d06dd0056b4e1a5ff9b3c8636d22839bf (diff) | |
parent | 21389a30011bda8233b1f5f2b4469a453246d4ef (diff) | |
download | keystone-708ccf086a6a4de28b271931a7890b642c9ec1bc.tar.gz keystone-708ccf086a6a4de28b271931a7890b642c9ec1bc.tar.xz keystone-708ccf086a6a4de28b271931a7890b642c9ec1bc.zip |
Merge "Sync models with migrations"
Diffstat (limited to 'keystone/token/backends/sql.py')
-rw-r--r-- | keystone/token/backends/sql.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py index 0e8a916d..82eab651 100644 --- a/keystone/token/backends/sql.py +++ b/keystone/token/backends/sql.py @@ -17,7 +17,6 @@ import copy import datetime - from keystone.common import sql from keystone import exception from keystone.openstack.common import timeutils @@ -30,9 +29,13 @@ class TokenModel(sql.ModelBase, sql.DictBase): id = sql.Column(sql.String(64), primary_key=True) expires = sql.Column(sql.DateTime(), default=None) extra = sql.Column(sql.JsonBlob()) - valid = sql.Column(sql.Boolean(), default=True) + valid = sql.Column(sql.Boolean(), default=True, nullable=False) user_id = sql.Column(sql.String(64)) - trust_id = sql.Column(sql.String(64), nullable=True) + trust_id = sql.Column(sql.String(64)) + __table_args__ = ( + sql.Index('ix_token_expires', 'expires'), + sql.Index('ix_token_valid', 'valid') + ) class Token(sql.Base, token.Driver): |