openstack
/
barbican
Code Issues Proposed changes

Fixed mismatch between tenantsecret table's FKs and the ids of the models;

This commit is contained in:
John Wood 2013-05-24 17:37:31 -05:00
parent 36ab152a94
commit 4f7e44b5f0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
barbican/model/models.py
View File

@ -17,6 +17,7 @@
Defines database models for Barbican
"""
import dateutil.parser
from sqlalchemy import Column, Integer, String, BigInteger
from sqlalchemy.ext.compiler import compiles
from sqlalchemy.ext.declarative import declarative_base
@ -146,8 +147,8 @@ class TenantSecret(BASE, ModelBase):
__tablename__ = 'tenant_secret'
tenant_id = Column(Integer, ForeignKey('tenants.id'), primary_key=True)
secret_id = Column(Integer, ForeignKey('secrets.id'), primary_key=True)
tenant_id = Column(String(36), ForeignKey('tenants.id'), primary_key=True)
secret_id = Column(String(36), ForeignKey('secrets.id'), primary_key=True)
role = Column(String(255))
secret = relationship("Secret", backref="tenant_assocs")