1 files changed, 15 insertions, 12 deletions
diff --git a/keystone/assignment/backends/sql.py b/keystone/assignment/backends/sql.py
index 5ec435ff..cd2a0a5c 100644
--- a/keystone/assignment/backends/sql.py
+++ b/keystone/assignment/backends/sql.py
@@ -16,15 +16,14 @@
 
 from keystone import assignment
 from keystone import clean
+from keystone.common import dependency
 from keystone.common import sql
 from keystone.common.sql import migration
 from keystone import exception
 
 
+@dependency.requires('identity_api')
 class Assignment(sql.Base, assignment.Driver):
-    def __init__(self):
-        super(Assignment, self).__init__()
-        self.identity_api = None
 
     # Internal interface to manage the database
     def db_sync(self, version=None):
@@ -657,9 +656,10 @@ class Domain(sql.ModelBase, sql.DictBase):
     __tablename__ = 'domain'
     attributes = ['id', 'name', 'enabled']
     id = sql.Column(sql.String(64), primary_key=True)
-    name = sql.Column(sql.String(64), unique=True, nullable=False)
-    enabled = sql.Column(sql.Boolean, default=True)
+    name = sql.Column(sql.String(64), nullable=False)
+    enabled = sql.Column(sql.Boolean, default=True, nullable=False)
     extra = sql.Column(sql.JsonBlob())
+    __table_args__ = (sql.UniqueConstraint('name'), {})
 
 
 class Project(sql.ModelBase, sql.DictBase):
@@ -681,8 +681,9 @@ class Role(sql.ModelBase, sql.DictBase):
     __tablename__ = 'role'
     attributes = ['id', 'name']
     id = sql.Column(sql.String(64), primary_key=True)
-    name = sql.Column(sql.String(64), unique=True, nullable=False)
+    name = sql.Column(sql.String(255), nullable=False)
     extra = sql.Column(sql.JsonBlob())
+    __table_args__ = (sql.UniqueConstraint('name'), {})
 
 
 class BaseGrant(sql.DictBase):
@@ -720,9 +721,8 @@ class BaseGrant(sql.DictBase):
 
 class UserProjectGrant(sql.ModelBase, BaseGrant):
     __tablename__ = 'user_project_metadata'
-    user_id = sql.Column(sql.String(64),
-                         primary_key=True)
-    project_id = sql.Column(sql.String(64),
+    user_id = sql.Column(sql.String(64), primary_key=True)
+    project_id = sql.Column(sql.String(64), sql.ForeignKey('project.id'),
                             primary_key=True)
     data = sql.Column(sql.JsonBlob())
 
@@ -730,19 +730,22 @@ class UserProjectGrant(sql.ModelBase, BaseGrant):
 class UserDomainGrant(sql.ModelBase, BaseGrant):
     __tablename__ = 'user_domain_metadata'
     user_id = sql.Column(sql.String(64), primary_key=True)
-    domain_id = sql.Column(sql.String(64), primary_key=True)
+    domain_id = sql.Column(sql.String(64), sql.ForeignKey('domain.id'),
+                           primary_key=True)
     data = sql.Column(sql.JsonBlob())
 
 
 class GroupProjectGrant(sql.ModelBase, BaseGrant):
     __tablename__ = 'group_project_metadata'
     group_id = sql.Column(sql.String(64), primary_key=True)
-    project_id = sql.Column(sql.String(64), primary_key=True)
+    project_id = sql.Column(sql.String(64), sql.ForeignKey('project.id'),
+                            primary_key=True)
     data = sql.Column(sql.JsonBlob())
 
 
 class GroupDomainGrant(sql.ModelBase, BaseGrant):
     __tablename__ = 'group_domain_metadata'
     group_id = sql.Column(sql.String(64), primary_key=True)
-    domain_id = sql.Column(sql.String(64), primary_key=True)
+    domain_id = sql.Column(sql.String(64), sql.ForeignKey('domain.id'),
+                           primary_key=True)
     data = sql.Column(sql.JsonBlob())