← Back to branch summary

~ubuntu-branches/ubuntu/quantal/keystone/quantal-proposed

« back to all changes in this revision

Viewing changes to keystone/backends/sqlalchemy/models.py

  • Committer: Package Import Robot
  • Author(s): Brian Thomason, Juan Negron, Brian Thomason
  • Date: 2011-09-28 15:30:19 UTC
  • Revision ID: package-import@ubuntu.com-20110928153019-j54jqkaiz5tv9vj2
Tags: 1.0~d4~20110909.1108-0ubuntu3
https://launchpad.net/bugs/861682
https://launchpad.net/bugs/861813
[Juan Negron]
* Added debian/patches/foreign_key.patch:  Fixed bug which attempted to to
  obtain a service_id by passing an Integer rather than a String to the
  Column function in models.py. (LP: #861682)

[Brian Thomason]
* Removed "|| true" from test execution in debian/rules as it was masking a
  failure.  After investigating the failure further, it was found that two
  files were missing from the contrib/extensions/service/raxkey dir that were
  a part of trunk at the time. (LP: #861813)
  - added keystone/contrib/extensions/service/raxkey/extension.xml
  - added keystone/contrib/extensions/service/raxkey/extension.json

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystone/backends/sqlalchemy/models.py
104
104
    __api__ = 'role'
105
105
    id = Column(String(255), primary_key=True, unique=True)
106
106
    desc = Column(String(255))
107
 
    service_id = Column(Integer, ForeignKey('services.id'))
 
107
    service_id = Column(String(255), ForeignKey('services.id'))
108
108
    __table_args__ = (
109
109
        UniqueConstraint("id", "service_id"), {})
110
110