diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 17:14:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 17:14:24 +0000 |
| commit | d8b9d6534cdf546d34fd1b3f96614c6d2732e4fb (patch) | |
| tree | 9a00895ecbf4e80ebd568d6c86df491bb5b516e5 /nova/db/sqlalchemy/models.py | |
| parent | 169c61fa2ffdbb139fad34a76bbec80eebf1bdc7 (diff) | |
| parent | eb49f3eb04b798a531f3a0a773cee7c30289a62b (diff) | |
| download | nova-d8b9d6534cdf546d34fd1b3f96614c6d2732e4fb.tar.gz nova-d8b9d6534cdf546d34fd1b3f96614c6d2732e4fb.tar.xz nova-d8b9d6534cdf546d34fd1b3f96614c6d2732e4fb.zip | |
Merge "Fix db.models.Certificate description"
Diffstat (limited to 'nova/db/sqlalchemy/models.py')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 4e4cb101d..91407f3a5 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -129,11 +129,15 @@ class ComputeNodeStat(BASE, NovaBase): class Certificate(BASE, NovaBase): """Represents a x509 certificate.""" __tablename__ = 'certificates' + __table_args__ = ( + Index('certificates_project_id_deleted_idx', 'project_id', 'deleted'), + Index('certificates_user_id_deleted_idx', 'user_id', 'deleted') + ) id = Column(Integer, primary_key=True) - user_id = Column(String(255)) - project_id = Column(String(255)) - file_name = Column(String(255)) + user_id = Column(String(255), nullable=True) + project_id = Column(String(255), nullable=True) + file_name = Column(String(255), nullable=True) class Instance(BASE, NovaBase): |