summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2012-04-25 13:49:28 -0500
committerDolph Mathews <dolph.mathews@gmail.com>2012-04-25 14:28:46 -0500
commit3dd36e3e87b8dfe3e9468dbe0a413a34ce6f63df (patch)
tree740b3724363f1838c5a01142b3bfa9e9837d0532 /keystone
parentd65147bda724d6b38df934686647284932c3c46f (diff)
Non-nullable User, Tenant, Role names (bug 987121)
Change-Id: I100732e52fe0478280d647fc25ca82f9c14dc64c
Diffstat (limited to 'keystone')
-rw-r--r--keystone/identity/backends/sql.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index e4281a8d..dd35d70b 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -53,7 +53,7 @@ def handle_conflicts(type='object'):
class User(sql.ModelBase, sql.DictBase):
__tablename__ = 'user'
id = sql.Column(sql.String(64), primary_key=True)
- name = sql.Column(sql.String(64), unique=True)
+ name = sql.Column(sql.String(64), unique=True, nullable=False)
#password = sql.Column(sql.String(64))
extra = sql.Column(sql.JsonBlob())
@@ -79,7 +79,7 @@ class User(sql.ModelBase, sql.DictBase):
class Tenant(sql.ModelBase, sql.DictBase):
__tablename__ = 'tenant'
id = sql.Column(sql.String(64), primary_key=True)
- name = sql.Column(sql.String(64), unique=True)
+ name = sql.Column(sql.String(64), unique=True, nullable=False)
extra = sql.Column(sql.JsonBlob())
@classmethod
@@ -104,7 +104,7 @@ class Tenant(sql.ModelBase, sql.DictBase):
class Role(sql.ModelBase, sql.DictBase):
__tablename__ = 'role'
id = sql.Column(sql.String(64), primary_key=True)
- name = sql.Column(sql.String(64), unique=True)
+ name = sql.Column(sql.String(64), unique=True, nullable=False)
class Metadata(sql.ModelBase, sql.DictBase):