Merge lp:~negronjl/keystone/861682 into lp:keystone/trunk

[Dustin Kirkland ]

Unmerged revisions

288. By Juan L. Negron on 2011-09-28

Fix for MySQL/InnoDB foreign key relations issue. LP:861682

=== modified file 'keystone/backends/sqlalchemy/models.py'
--- keystone/backends/sqlalchemy/models.py	2011-08-09 20:16:43 +0000
+++ keystone/backends/sqlalchemy/models.py	2011-09-28 19:31:17 +0000
@@ -104,7 +104,7 @@
     __api__ = 'role'
     id = Column(String(255), primary_key=True, unique=True)
     desc = Column(String(255))
-    service_id = Column(Integer, ForeignKey('services.id'))
+    service_id = Column(String(255), ForeignKey('services.id'))
     __table_args__ = (
         UniqueConstraint("id", "service_id"), {})